diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java index 5fb0d880b..31e16d761 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java @@ -260,6 +260,9 @@ public class MonitorParam { @NotBlank(message = "监测点对象类型不可为空") private String objType; + @ApiModelProperty(name = "objType",value = "是否开启重新上送") + private Boolean fiy=false; + @ApiModelProperty(name = "ids",value = "id集合") private List ids; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java index 32cf01acf..244ea5c92 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java @@ -50,6 +50,7 @@ public class TractionStationDTO extends Unit { /*创建时间 是否必填:否*/ @ExcelProperty(value = "创建时间") + @JSONField(format = "yyyy-MM-dd") private LocalDateTime createTime; /*是否专线供电 是否必填:否*/ @ExcelProperty(value = "是否专线供电") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java index 2d7f8e7a7..9022489d2 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendTaskRunner.java @@ -24,18 +24,22 @@ public class MonitorSendTaskRunner implements TimerTaskRunner { //风电场 MonitorParam.Info param = new MonitorParam.Info(); param.setObjType(sysDicTreePOService.queryByCode("1401").getId()); + param.setFiy(true); monitorSendClient.windSend(param); //光伏电站 MonitorParam.Info param1 = new MonitorParam.Info(); param1.setObjType(sysDicTreePOService.queryByCode("1402").getId()); + param1.setFiy(true); monitorSendClient.windSend(param1); //牵引站 MonitorParam.Info param3 = new MonitorParam.Info(); param3.setObjType(sysDicTreePOService.queryByCode("1300").getId()); + param3.setFiy(true); monitorSendClient.windSend(param3); //干扰用户 MonitorParam.Info param4 = new MonitorParam.Info(); param4.setObjType(sysDicTreePOService.queryByCode("2300").getId()); + param4.setFiy(true); monitorSendClient.windSend(param4); } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java index 659445225..1f7d84b97 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorUserSendTaskRunner.java @@ -24,6 +24,7 @@ public class MonitorUserSendTaskRunner implements TimerTaskRunner { //重要或敏感用户 MonitorParam.Info param2 = new MonitorParam.Info(); param2.setObjType(sysDicTreePOService.queryByCode("2400").getId()); + param2.setFiy(true); monitorSendClient.windSend(param2); } }