大屏报警数据和报警页面跳转调整

tzipc-server/tzipc-system/src/main/java/com/inspur/ipc/service/impl/IpcDataShowServiceImpl.java

@@ -1,6 +1,8 @@
 package com.inspur.ipc.service.impl;
 
+import com.inspur.ipc.domain.IpcAlarmRecord;
 import com.inspur.ipc.domain.IpcQueryParams;
+import com.inspur.ipc.service.IIpcAlarmRecordService;
 import com.inspur.ipc.service.IIpcDataShowService;
 import com.inspur.ipc.utils.IpcConstant;
 import com.inspur.system.service.influx.InfluxDBService;
@@ -15,6 +17,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * 数据展示界面Service业务层处理
@@ -26,7 +29,8 @@ public class IpcDataShowServiceImpl implements IIpcDataShowService {
 
     @Autowired
     private InfluxDBService influxDBService;
-
+    @Autowired
+    private IIpcAlarmRecordService ipcAlarmRecordService;
     /**
      * 展示数据获取
      */
@@ -110,6 +114,15 @@ public class IpcDataShowServiceImpl implements IIpcDataShowService {
                     map.put("oip", oip.get(plcIndex));
                     map.put("od", od.get(plcIndex));
                 }
+                // 查询报警数据
+                IpcAlarmRecord ipcAlarmRecord = new IpcAlarmRecord();
+                ipcAlarmRecord.setPartKey(part);
+                ipcAlarmRecord.setAlarmStatus("0");
+                List<IpcAlarmRecord> list = ipcAlarmRecordService.selectIpcAlarmRecordList(ipcAlarmRecord);
+                // 颗粒度报警
+                map.put("pzAlarmStr", String.join(IpcConstant.DATA_SEPARATOR,list.stream().filter(ipcAlarmRecord1 -> ipcAlarmRecord1.getNameKey().startsWith("pz")).map(IpcAlarmRecord::getAlarmDetail).collect(Collectors.toList())));
+                // 其他报警
+                map.put("otherAlarmStr",  String.join(IpcConstant.DATA_SEPARATOR,list.stream().filter(ipcAlarmRecord1 -> !ipcAlarmRecord1.getNameKey().startsWith("pz")).map(IpcAlarmRecord::getAlarmDetail).collect(Collectors.toList())));
                 // 根据位置处理
                 if (part.endsWith(IpcConstant.OPERATION_PROFILE)) {
                     // 操作侧

tzipc-ui/src/views/ipc/alarmRecord/index.vue

@@ -517,9 +517,12 @@ export default {
     };
   },
   created() {
+    if (this.$route.query.partKey) {
+      this.queryParams.partKey = this.$route.query.partKey;
+    }
     this.getMonitorPartList();
     this.getPlcMonitorParamsList();
-    this.getSensorMonitorParamsList();
+    // this.getSensorMonitorParamsList();
     this.getList();
   },
   methods: {

tzipc-ui/src/views/zf/bigscreen/index.vue

@@ -55,9 +55,9 @@
           <div
             class="scroll-text-wrapper"
             style="height: 1.7rem;"
-            @click="$router.push('/alarm/alarmRecord')"
+            @click="jumpAlarmRecord(queryParams[0])"
           >
-            <div class="scroll-inner"></div>
+            <div class="scroll-inner">{{ ltAlarmStr }}</div>
           </div>
         </div>
       </div>
@@ -75,9 +75,9 @@
           <div
             class="scroll-text-wrapper"
             style="height: 1.7rem;"
-            @click="$router.push('/alarm/alarmRecord')"
+            @click="jumpAlarmRecord(queryParams[1])"
           >
-            <div class="scroll-inner"></div>
+            <div class="scroll-inner">{{ rtAlarmStr }}</div>
           </div>
         </div>
       </div>
@@ -169,9 +169,9 @@
           <div
             class="scroll-text-wrapper"
             style="height: 1.7rem;"
-            @click="$router.push('/alarm/alarmRecord')"
+            @click="jumpAlarmRecord(queryParams[0])"
           >
-            <div class="scroll-inner"></div>
+            <div class="scroll-inner">{{ lbAlarmStr }}</div>
           </div>
         </div>
       </div>
@@ -263,9 +263,9 @@
           <div
             class="scroll-text-wrapper"
             style="height: 1.7rem;"
-            @click="$router.push('/alarm/alarmRecord')"
+            @click="jumpAlarmRecord(queryParams[1])"
           >
-            <div class="scroll-inner"></div>
+            <div class="scroll-inner">{{ rbAlarmStr }}</div>
           </div>
         </div>
       </div>
@@ -372,6 +372,11 @@ export default {
       title1: "",
       title2: "",
 
+      ltAlarmStr: "",
+      lbAlarmStr: "",
+      rtAlarmStr: "",
+      rbAlarmStr: "",
+
       timer: null,
       queryParams: ["rtd", "rto"],
       total: 0,
@@ -622,7 +627,7 @@ export default {
           const { xPlcData, pz4, pz6, pz14, pz21 } = drive;
           this.initChart4(xPlcData, pz4, pz6, pz14, pz21);
 
-          const { ssat, rot, oip, ov, owc } = drive;
+          const { pzAlarmStr, otherAlarmStr, ssat, rot, oip, ov, owc } = drive;
 
           this.initBottomR1(oip);
           this.initBottomR2(ov);
@@ -630,6 +635,9 @@ export default {
 
           this.r1 = ssat;
           this.r2 = rot;
+
+          this.rtAlarmStr = pzAlarmStr;
+          this.rbAlarmStr = otherAlarmStr;
         }
         // 处理操作侧数据
         if (operation) {
@@ -639,13 +647,16 @@ export default {
           const { xPlcData, pz4, pz6, pz14, pz21 } = operation;
           this.initChart3(xPlcData, pz4, pz6, pz14, pz21);
 
-          const { owc, ov, oip, rot, ssat } = operation;
+          const { pzAlarmStr, otherAlarmStr, owc, ov, oip, rot, ssat } =
+            operation;
           this.initBottomL1(owc);
           this.initBottomL2(ov);
           this.initBottomL3(oip);
 
           this.l1 = rot;
           this.l2 = ssat;
+          this.ltAlarmStr = pzAlarmStr;
+          this.lbAlarmStr = otherAlarmStr;
         }
       });
     },
@@ -1193,6 +1204,13 @@ export default {
     jumpSensorDataLog() {
       this.$router.push("/dataLog/sensor");
     },
+    // 跳转报警记录页面
+    jumpAlarmRecord(param) {
+      this.$router.push({
+        path: "/alarm/alarmRecord",
+        query: { partKey: param },
+      });
+    },
   },
 };
 </script>