1.国网上送典型台账——干扰用户监测调整

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

@@ -156,7 +156,8 @@ public class MonitorSendServiceImpl implements MonitorSendService {
                     str.append("第"+(i+1)+"次循环："+ returnInformation(1, trIds, trMap)+";</br>");
                 }
                 break;
-            case "2300":
+//            case "2300":
+            default:
                 List<OtherUserDto> other = this.otherUserSend(monitorList);
                 sendSize(other);
                 List<List<OtherUserDto>> otSplit = ListUtil.split(other, 100);
@@ -168,8 +169,6 @@ public class MonitorSendServiceImpl implements MonitorSendService {
                     str.append("第"+(i++)+"循环："+ returnInformation(1, otIds, otMap)+";</br>");
                 }
                 break;
-            default:
-                throw new BusinessException("请选择国网上送的监测点标签上送");
         }
         return str.toString();
     }

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java

@@ -3,11 +3,14 @@ package com.njcn.system.timer.tasks;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.api.MonitorSendClient;
 import com.njcn.device.pms.pojo.param.MonitorParam;
+import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.system.service.SysDicTreePOService;
 import com.njcn.system.timer.TimerTaskRunner;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 
 /**
  *
@@ -22,13 +25,23 @@ public class MonitorSendOtherUserTaskRunner implements TimerTaskRunner {
 
     @Override
     public void action() {
+        List<DictTreeVO> dictTreeVOS = sysDicTreePOService.queryByPid("0");
+        for (DictTreeVO dictTreeVO : dictTreeVOS) {
+            if(dictTreeVO.getCode().equals("1401")||
+                    dictTreeVO.getCode().equals("1402")||
+                    dictTreeVO.getCode().equals("2400")||
+                    dictTreeVO.getCode().equals("1300")||
+                    dictTreeVO.getCode().equals("Device_Unit")){
+                continue;
+            }
             //干扰用户
-        MonitorParam.Info param4 = new MonitorParam.Info();
-        param4.setObjType(sysDicTreePOService.queryByCode("2300").getId());
-        param4.setFiy(true);
-        String code = monitorSendClient.windSend(param4).getCode();
+            MonitorParam.Info param = new MonitorParam.Info();
+            param.setObjType(dictTreeVO.getId());
+            param.setFiy(true);
+            String code = monitorSendClient.windSend(param).getCode();
             if(code.equals("A0002")){
                 throw new BusinessException("失败");
             }
         }
     }
+}