change - 温度阵列图像数据查询优化

ruoyi-admin/src/main/resources/templates/system/ArrayTemperatureData/ArrayTemperatureData.html

@@ -141,6 +141,15 @@
     queryDeptTree()
 
 
+
+    const getData = () => {
+      postData()
+    }
+    getData()
+    setInterval(getData, 1000 * 10)
+  })
+
+  function postData() {
     function getGradientColor(level, sum) {
       // 确保级别在1到50之间
       level = Math.max(1, Math.min(sum, level));
@@ -193,8 +202,6 @@
       // 返回格式化的CSS颜色字符串
       return `rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`;
     }
-
-    const getData = () => {
     $.post(prefix + '/newDataStreak', {monitorId}, (e) => {
       $(".centerDiv").css({'display': 'none'})
       for (let index = 1; index <= e.data.length; index++) {
@@ -271,9 +278,6 @@
 
     })
   }
-    getData()
-    setInterval(getData, 1000 * 4)
-  })
 
   function queryDeptTree() {
     var url = ctx + "system/Monitor/treeData?monitorType=" + 30;
@@ -286,7 +290,8 @@
 
     function zOnClick(event, treeId, treeNode) {
       monitorId = treeNode.id;
-      console.log(111, monitorId)
+      console.log('zOnClick：', monitorId)
+      postData()
     }
   }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/TArraytemperaturedata.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 
 import com.ruoyi.common.annotation.Excel;
@@ -4677,6 +4678,16 @@ public class TArraytemperaturedata extends BaseEntity {
     @Excel(name = "位置768")
     private BigDecimal Site768;
 
+    private List<String> monitorList;
+
+    public List<String> getMonitorList() {
+        return monitorList;
+    }
+
+    public void setMonitorList(List<String> monitorList) {
+        this.monitorList = monitorList;
+    }
+
     public String getMonitorName() {
         return monitorName;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TArraytemperaturedataServiceImpl.java

@@ -2,6 +2,11 @@ package com.ruoyi.system.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.T_Monitor;
+import com.ruoyi.system.mapper.T_MonitorMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.TArraytemperaturedataMapper;
@@ -21,6 +26,9 @@ public class TArraytemperaturedataServiceImpl implements ITArraytemperaturedataS
     @Autowired
     private TArraytemperaturedataMapper tArraytemperaturedataMapper;
 
+    @Autowired
+    private T_MonitorMapper t_MonitorMapper;
+
     /**
      * 查询温度传感器阵列报
      * 
@@ -100,6 +108,18 @@ public class TArraytemperaturedataServiceImpl implements ITArraytemperaturedataS
      */
     @Override
     public List<TArraytemperaturedata> selectNewDataStreak(TArraytemperaturedata tArraytemperaturedata) {
+        String monitorId = tArraytemperaturedata.getMonitorId();
+        if (StringUtils.isEmpty(monitorId)){
+            return null;
+        }
+        T_Monitor monitor = new T_Monitor();
+        monitor.setpMonitorid(monitorId);
+        List<T_Monitor> tMonitors = t_MonitorMapper.selectT_MonitorList(monitor);
+        if (tMonitors.size() == 0){
+            return null;
+        }
+        List<String> monitorList = tMonitors.stream().map(T_Monitor::getMonitorId).collect(Collectors.toList());
+        tArraytemperaturedata.setMonitorList(monitorList);
         return tArraytemperaturedataMapper.selectNewDataStreak(tArraytemperaturedata);
     }
 

ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml

@@ -1592,7 +1592,13 @@
         ROW_NUMBER() OVER (PARTITION BY monitorId ORDER BY collectTime DESC) AS rn
         FROM T_ArrayTemperatureData
         WHERE collectTime > (GETDATE() - 1)
-        <if test="monitorId != null and monitorId != ''">and monitorId like concat(#{monitorId}, '%')</if>
+<!--        <if test="monitorId != null and monitorId != ''">and monitorId like concat(#{monitorId}, '%')</if>-->
+        <if test="monitorList != null  and monitorList.size > 0">
+            and monitorId IN
+            <foreach item="monitorId" collection="monitorList" open="(" separator="," close=")">
+                #{monitorId}
+            </foreach>
+        </if>
         )
         SELECT m.monitorName,t.*
         FROM RankedData t

ruoyi-system/src/main/resources/mapper/system/T_MonitorMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectT_MonitorVo"/>
         <where>
             <if test="monitorId != null "> and monitorId = #{monitorId}</if>
+            <if test="pMonitorid != null "> and (p_monitorId = #{pMonitorid} OR monitorId = #{pMonitorid})</if>
             <if test="monitorType != null "> and monitorType = #{monitorType}</if>
             <if test="isKeyMonitor != null "> and isKeyMonitor = #{isKeyMonitor}</if>
             <if test="monitorStatus != null "> and monitorStatus = #{monitorStatus}</if>