1.添加pms微调

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TractionStationParam.java

@@ -39,7 +39,6 @@ public class TractionStationParam {
     private String voltageLevel;
 
     @ApiModelProperty(name = "railwayLineId", value = "铁路线路编号")
-    @NotBlank(message = "铁路线路编号不可为空")
     private String railwayLineId;
 
     @ApiModelProperty(name = "railwayLineName", value = "铁路线路名称")
@@ -76,7 +75,6 @@ public class TractionStationParam {
     private String createdDate;
 
     @ApiModelProperty(name = "userTag", value = "用户标签")
-    @NotBlank(message = "用户标签不可为空")
     private String userTag;
 
     @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是")

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java

@@ -166,14 +166,16 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
             //对象类型
            SysDicTreePO sysDicTreePO = dictTreeFeignClient.queryById(item.getObjType()).getData();
             if(sysDicTreePO.getPid().equals("0")){
-                pushMonitorDTO.setObjTypePrePre(sysDicTreePO.getCode());
+                pushMonitorDTO.setObjectType(sysDicTreePO.getCode());
-                pushMonitorDTO.setObjTypePre("0");
-            }else {
                 pushMonitorDTO.setObjTypePre(sysDicTreePO.getCode());
+            }else {
+                pushMonitorDTO.setObjectType(sysDicTreePO.getCode());
                 SysDicTreePO sysDicTreeParent = dictTreeFeignClient.queryById(sysDicTreePO.getPid()).getData();
-                pushMonitorDTO.setObjTypePrePre(sysDicTreeParent.getCode());
+                pushMonitorDTO.setObjTypePre(sysDicTreeParent.getCode());
             }
-            pushMonitorDTO.setObjectType(item.getPowerFlag());
+
+            pushMonitorDTO.setObjTypePrePre(item.getPowerFlag());
+
 
             if (statusMap.containsKey(item.getMonitorState())) {
                 pushMonitorDTO.setStatus(statusMap.get(item.getMonitorState()).getValue());
@@ -218,7 +220,6 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
                 pushMonitorDTO.setStatisticalInterval(item.getStatisticalInterval().toString());
             }
 
-            pushMonitorDTO.setBusId(item.getLineId());
             pushMonitorDTO.setMonitorTag(objTagMap.get(item.getMonitorTag()).getValue());
 
             if (StrUtil.isNotBlank(item.getMonitorObjectId())) {
@@ -319,6 +320,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
                 monitorLimitDTO.setOcDate(new Date());
                 monitorLimitDTO.setMonitorId(monitor.getId());
 
+                monitorLimitDTO.setPt((int) (monitor.getPt1() /monitor.getPt2()));
+                monitorLimitDTO.setCt((int) (monitor.getCt1() /monitor.getCt2()));
+
                 if (voltageMap.containsKey(monitor.getVoltageLevel())) {
                     monitorLimitDTO.setVoltage(String.format("%02d", voltageMap.get(monitor.getVoltageLevel()).getAlgoDescribe()));
                 }
@@ -482,6 +486,9 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
                 monitorLimitDTO.setOrgId(monitor.getOrgId());
                 monitorLimitDTO.setOrgName(monitor.getOrgName());
                 //monitorLimitDTO.setOcDate(new Date());
+
+                monitorLimitDTO.setPt((int) (monitor.getPt1() /monitor.getPt2()));
+                monitorLimitDTO.setCt((int) (monitor.getCt1() /monitor.getCt2()));
                 monitorLimitDTO.setMonitorId(monitor.getMonitorId());
 
                 monitorLimitDTO.setVoltage(monitor.getVoltageLevel());