From 1192b8708342f9e378948fca69494270e0a15326 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 13 Mar 2024 15:05:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=9B=BD=E7=BD=91=E4=B8=8A?=
 =?UTF-8?q?=E9=80=81=E6=A0=87=E8=AF=86=202.=E4=BF=AE=E6=94=B9=E5=9B=BD?=
 =?UTF-8?q?=E7=BD=91=E4=B8=8A=E9=80=81=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/pojo/param/TerminalQueryParam.java    |  4 +++
 .../majornetwork/impl/MonitorServiceImpl.java |  2 ++
 .../tasks/MonitorSendOtherUserTaskRunner.java | 26 +++++--------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java
index abe9cdcf3..07becb423 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java
@@ -33,5 +33,9 @@ public class TerminalQueryParam extends BaseParam {
     @ApiModelProperty(value = "是否上送国网监测点")
     private Integer isUpToGrid;
 
+    @ApiModelProperty(value = "典型上送标识")
+    private Integer isUploadHead;
 
+    @ApiModelProperty(value = "主网上送标识")
+    private Integer monitorUploadStatus;
 }
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
index 26de6e8d8..1dc5b63a2 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
@@ -222,6 +222,8 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
                 .eq(StrUtil.isNotBlank(baseParam.getMonitorState()), Monitor::getMonitorState, baseParam.getMonitorState())
                 .eq(StrUtil.isNotBlank(baseParam.getMonitorTag()), Monitor::getMonitorTag, baseParam.getMonitorTag())
                 .eq(Objects.nonNull(baseParam.getIsUpToGrid()), Monitor::getIsUpToGrid, baseParam.getIsUpToGrid())
+                .eq(Objects.nonNull(baseParam.getIsUploadHead()), Monitor::getIsUploadHead, baseParam.getIsUploadHead())
+                .eq(Objects.nonNull(baseParam.getMonitorUploadStatus()), Monitor::getMonitorUploadStatus, baseParam.getMonitorUploadStatus())
 
                 .and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(Monitor::getName, baseParam.getSearchValue())
                         .or()
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java
index b14a461e9..64cd86d91 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java
@@ -20,28 +20,16 @@ import java.util.List;
 public class MonitorSendOtherUserTaskRunner implements TimerTaskRunner {
 
     private final MonitorSendClient monitorSendClient;
-    private final SysDicTreePOService sysDicTreePOService;
-
 
     @Override
     public void action(String date) {
-        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 param = new MonitorParam.Info();
-            param.setObjType(dictTreeVO.getId());
-            param.setFiy(true);
-            String code = monitorSendClient.windSend(param).getCode();
-            if(code.equals("A0002")){
-                throw new BusinessException("失败");
-            }
+        //干扰用户
+        MonitorParam.Info param = new MonitorParam.Info();
+        param.setObjType("987654321");
+        param.setFiy(true);
+        String code = monitorSendClient.windSend(param).getCode();
+        if(code.equals("A0002")){
+            throw new BusinessException("失败");
         }
     }
 }