问题修改

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java

@@ -616,13 +616,13 @@ public class BigScreenAnalyseController extends BaseController {
             if (100.0 == equipmentHealthScore) {
                 item.put("warningName", "安全");
             } else {
-                LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
-                query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "设备");
-                query.eq(IdxBizFanHealthLevel::getStatus, stationBasic.getStationName());
-                query.lt(IdxBizFanHealthLevel::getGroupLowerLimit, equipmentHealthScore);
-                query.ge(IdxBizFanHealthLevel::getGroupUpperLimit, equipmentHealthScore);
-                IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
-                item.put("warningName", idxBizFanHealthLevel.getHealthLevel());
+                LambdaQueryWrapper<IdxBizPvHealthLevel> query = new LambdaQueryWrapper<>();
+                query.eq(IdxBizPvHealthLevel::getAnalysisObjType, "设备");
+                query.eq(IdxBizPvHealthLevel::getStatus, item.get("station").toString());
+                query.lt(IdxBizPvHealthLevel::getGroupLowerLimit, equipmentHealthScore);
+                query.ge(IdxBizPvHealthLevel::getGroupUpperLimit, equipmentHealthScore);
+                IdxBizPvHealthLevel idxBizPvHealthLevel = idxBizPvHealthLevelMapper.selectOne(query);
+                item.put("warningName", idxBizPvHealthLevel.getHealthLevel());
             }
             item.put("healthIndex", equipmentHealthScore);
         });

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -621,7 +621,8 @@
 <select id="getPvPointNameListBySumSystem" resultType="java.util.Map">
     SELECT
     POINT_NAME as pointName,
-    INDEX_ADDRESS as indexAddress
+    INDEX_ADDRESS as indexAddress,
+    STATION AS station
     FROM
     idx_biz_pv_point_process_variable_classification
     <where>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml

@@ -58,7 +58,7 @@
             AND a.recDate >= concat(#{startDate}, ' 00:00:00')
         </if>
         <if test="endDate != '' and endDate != null">
-            AND concat(#{startDate}, ' 23:59:59') >= a.recDate
+            AND concat(#{endDate}, ' 23:59:59') >= a.recDate
         </if>
     </where>
     order by warningName DESC, recDate DESC
@@ -119,7 +119,7 @@
             AND a.recDate >= concat(#{startDate}, ' 00:00:00')
         </if>
         <if test="endDate != '' and endDate != null">
-            AND concat(#{startDate}, ' 23:59:59') >= a.recDate
+            AND concat(#{endDate}, ' 23:59:59') >= a.recDate
         </if>
     </where>) b
     </select>