修改 td

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

@@ -369,7 +369,7 @@ public class TDBigScreenAnalyseController extends BaseController {
             stationCode = stationBasic.getFanGatewayId();
         }
         List<Map<String, Object>> list = fanHealthIndexMapper.equipWarningRadarMapByTd(stationCode);
-        Map<String, Integer> warningNumMap = list.stream().collect(Collectors.toMap(t -> t.get("warningName").toString(), t -> Integer.parseInt(t.get("num").toString())));
+        Map<String, Integer> warningNumMap = list.stream().collect(Collectors.toMap(t -> t.get("warningname").toString(), t -> Integer.parseInt(t.get("num").toString())));
         List<String> warningList = Arrays.asList("危险", "注意", "警告");
         List<Integer> data = new ArrayList<>();
 
@@ -529,7 +529,7 @@ public class TDBigScreenAnalyseController extends BaseController {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
 //        List<Map<String, Object>> healthListInfo = idxBizFanHealthIndexMapper.getHealthInfoBySubSystem(subSystem, stationBasic.getFanGatewayId());
         List<Map<String, Object>> healthListInfo = fanHealthIndexMapper.getWarningInfoBySubSystemTd(subSystem, stationBasic.getFanGatewayId());
-        Map<Object, String> equipmentHealthIndexMap = healthListInfo.stream().collect(Collectors.toMap(t -> t.get("pointName"), t -> t.get("warningName").toString()));
+        Map<Object, String> equipmentHealthIndexMap = healthListInfo.stream().collect(Collectors.toMap(t -> t.get("pointname"), t -> t.get("warningname").toString()));
         List<Map<String, Object>> pointNameList = idxBizFanHealthIndexMapper.getPointNameListBySumSystem(stationBasic.getFanGatewayId(), subSystem);
         pointNameList.forEach(item -> {
             String warningName = equipmentHealthIndexMap.getOrDefault(item.get("pointName"), "安全");
@@ -682,11 +682,11 @@ public class TDBigScreenAnalyseController extends BaseController {
         resultListData.forEach(item -> {
             String date = "";
             try {
-                date = DateUtils.convertDateToString(DateUtils.dateParse(item.get("rec_date").toString(), DateUtils.DATE_TIME_PATTERN), "MM-dd HH:mm:ss");
+                date = DateUtils.convertDateToString(DateUtils.dateParse(item.get("recdate").toString(), DateUtils.DATE_TIME_PATTERN), "MM-dd HH:mm:ss");
             } catch (ParseException e) {
             }
             time.add(date);
-            String value = CharSequenceUtil.isEmpty(item.get("healthIndex").toString().replace(".0", "")) ? "100" : item.get("healthIndex").toString().replace(".0", "");
+            String value = CharSequenceUtil.isEmpty(item.get("healthindex").toString().replace(".0", "")) ? "100" : item.get("healthindex").toString().replace(".0", "");
             valueList.add(value);
         });
         List<Map<String, Object>> arrayList = new ArrayList<>();

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

@@ -471,6 +471,7 @@
                 AND GATEWAY_ID = #{gatewayId}
             </if>
         </where>
+        group by subSystem
 
     </select>
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml

@@ -303,7 +303,7 @@
 
     <select id="getInfoListByTableNameTs" resultType="java.util.Map">
         SELECT
-            *,
+            rec_date as recDate,
             CEIL(health_index) as healthIndex
         FROM
             ${tableName}