luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补充流量计设备数据上报时间，灌溉记录开关阀门时间格式精确到时分秒

Browse Source
This commit is contained in:
蒾酒 2025-01-01 18:51:08 +08:00
parent 7c8ee46d1b
commit 84ed8dc31f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysDeptController.java
View File

@ -81,7 +81,7 @@ public class SysDeptController extends BaseController
* 获取机构列表 * 获取机构列表
*/ */
@ApiOperation("获取机构列表") @ApiOperation("获取机构列表")
@PreAuthorize("@ss.hasPermi('system:dept:list')") // @PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysDept dept) public AjaxResult list(SysDept dept)
{ {

4
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java
View File

@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L;
private String deviceNumber; private String deviceNumber;
/** 实时时间 */ /** 实时时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("实时时间") @ApiModelProperty("实时时间")
private Date realTime; private Date realTime;
@ -53,7 +53,7 @@ private static final long serialVersionUID = 1L;
private Long status; private Long status;
/** 保存时间 */ /** 保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("保存时间") @ApiModelProperty("保存时间")
private Date saveTime; private Date saveTime;

4
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserIrrigationRecord.java
View File

@ -74,13 +74,13 @@ public class UserIrrigationRecord extends BaseEntity
private BigDecimal balance; private BigDecimal balance;
/** 开泵时间 */ /** 开泵时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("开泵时间") @ApiModelProperty("开泵时间")
private Date startTime; private Date startTime;
/** 关泵时间 */ /** 关泵时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("关泵时间") @ApiModelProperty("关泵时间")
private Date endTime; private Date endTime;