对应周期的趋势图和健康图的展示中横轴时间应按照以上格式对应

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

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -788,7 +790,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly()));
 				}
-				axisData.add(obj.getAnalysisTime());
+				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+				String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
+				axisData.add(format);
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);
@@ -810,7 +814,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly()));
 				}
-				axisData.add(obj.getAnalysisTime());
+				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+				String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
+				axisData.add(format);
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);

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

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -455,7 +457,9 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
 				}
-				axisData.add(obj.getAnalysisTime());
+				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+				String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
+				axisData.add(format);
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);
@@ -480,12 +484,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
 				}
-				Date format = null;
-				try {
-					format = formatterNYRSF.parse(obj.getAnalysisTime());
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
+				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+				String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
 				axisData.add(format);
 			}
 			result.put("seriesData",seriesData);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IdxBizFanHealthIndexServiceImpl.java

@@ -122,7 +122,7 @@ public class IdxBizFanHealthIndexServiceImpl extends BaseService<IdxBizFanHealth
         List<String> axisData = new ArrayList<>();
         List<String> activePowers = new ArrayList<>();
         for (int i = 0; i < indicatorDataListActivePowers.size(); i++) {
-            activePowers.add(dfSS.format(indicatorDataListActivePowers.get(i).getValue()));
+            activePowers.add(dfSS.format(indicatorDataListActivePowers.get(i).getValueF()));
             axisData.add(DateUtil.format(indicatorDataListActivePowers.get(i).getCreatedTime(), "yyyy-MM-dd HH:mm:ss"));
         }
        // List<Map<String, Object>> seriesData = new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdmapper/IndicatorDataMapper.java

@@ -48,7 +48,7 @@ public interface IndicatorDataMapper extends BaseMapper<IndicatorData> {
     List<IndicatorData> selectByIndexNameAndDate(@Param("equipmentIndexName") String equipmentIndexName, @Param("gatewayId") String gatewayId, @Param("date") String date, @Param("limitNum") Integer limitNum);
 
 
-    @Select("select `value`, created_time from iot_data.indicator_data where id =#{id}  and  ts >= #{startTime} and ts <= #{endTime} ")
+    @Select("select `value_f` as valueF, created_time from iot_data.indicator_data where id =#{id}  and  ts >= #{startTime} and ts <= #{endTime} ")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeAndEquipmentNumber(@Param("id") String id, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     @Select("select `value`,`value_f`, address, gateway_id from iot_data.indicator_data where ts > NOW()-10m and gateway_id = #{gatewayId}")