解决冲突

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

@@ -139,16 +139,18 @@ public class AnalyseController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取influxdb数据", notes = "获取influxdb数据")
     @GetMapping(value = "/getInfluxdbDataByConditon")
     public ResponseModel<Map<String, Object>> getInfluxdbDataByConditon(@RequestParam String stationType, @RequestParam String pointId, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
-        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
-            Date currentDayStartTime = null;
+        if (StringUtils.isEmpty(startTime)) {
+            Date sevenAgoDayStartTime = null;
             try {
-                currentDayStartTime = DateUtils.minDateOfMonth(new Date());
+                sevenAgoDayStartTime = DateUtils.dateAddDays(new Date(), -7);
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            Date currentDayEndTime = DateUtils.getCurrentMonthEndTime(new Date());
-            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
-            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+            startTime = DateUtils.convertDateToString(DateUtils.dateAddHours(sevenAgoDayStartTime, -8), DateUtils.DATE_TIME_PATTERN);
+        }
+        DateUtils.dateAddHours(DateUtils.getCurrentDayStartTime(new Date()), -8);
+        if (StringUtils.isEmpty(endTime)) {
+            endTime = DateUtils.convertDateToString(DateUtils.dateAddHours(new Date(), -8), DateUtils.DATE_TIME_PATTERN);
         }
         return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType,pointId,startTime, endTime)) ;
     }
@@ -180,16 +182,18 @@ public class AnalyseController extends BaseController {
         }
 
 
-        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
-            Date currentDayStartTime = null;
+        if (StringUtils.isEmpty(startTime)) {
+            Date sevenAgoDayStartTime = null;
             try {
-                currentDayStartTime = DateUtils.minDateOfMonth(new Date());
+                sevenAgoDayStartTime = DateUtils.dateAddDays(new Date(), -7);
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            Date currentDayEndTime = DateUtils.getCurrentMonthEndTime(new Date());
-            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
-            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+            startTime = DateUtils.convertDateToString(DateUtils.dateAddHours(sevenAgoDayStartTime, -8), DateUtils.DATE_TIME_PATTERN);
+        }
+        DateUtils.dateAddHours(DateUtils.getCurrentDayStartTime(new Date()), -8);
+        if (StringUtils.isEmpty(endTime)) {
+            endTime = DateUtils.convertDateToString(DateUtils.dateAddHours(new Date(), -8), DateUtils.DATE_TIME_PATTERN);
         }
         return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType,pointId,startTime, endTime)) ;
     }

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

@@ -1002,7 +1002,7 @@
         HEALTH_INDEX,
         HEALTH_INDEX as value,
         HEALTH_LEVEL,
-        ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '告警' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
+        ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
         SUB_SYSTEM,
         REC_DATE,
         EQUIPMENT_NAME,
@@ -1048,7 +1048,7 @@
         CAST(HEALTH_INDEX AS UNSIGNED) as HEALTH_INDEX,
         CAST(HEALTH_INDEX AS UNSIGNED) as value,
         HEALTH_LEVEL,
-        ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '告警' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
+        ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status,
         SUB_SYSTEM,
         REC_DATE,
         EQUIPMENT_NAME,