解决冲突

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TdengineTimeServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.FanHealthIndexMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
@@ -55,53 +56,56 @@ public class TestController extends BaseController {
     @Autowired
     FanHealthIndexMapper fanHealthIndexMapper;
 
+    @Autowired
+    TdengineTimeServiceImpl tdengineTimeService;
+
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "POST", value = "saveTest", notes = "saveTest")
     @PostMapping("/saveTest")
     public void saveTest () {
 
-
-        QueryWrapper<FanHealthIndex> fanHealthIndexQueryWrapper = new QueryWrapper<>();
-        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectList(fanHealthIndexQueryWrapper);
-
-        List<IdxBizFanHealthIndex> list = new ArrayList<>();
-        IdxBizFanHealthIndex fanHealthIndex = new IdxBizFanHealthIndex();
-        fanHealthIndex.setHealthIndex(2.0);
-//        fanHealthIndex.setTs(System.currentTimeMillis());
-        fanHealthIndex.setArae("区域");
-        fanHealthIndex.setAnalysisEndTime(DateUtil.date());
-        fanHealthIndex.setAnalysisObjSeq("2");
-        fanHealthIndex.setHealthLevel("2321");
-        fanHealthIndex.setHealthIndex(25.0);
-        fanHealthIndex.setAnalysisStartTime(DateUtil.date());
-        fanHealthIndex.setAnalysisObjType("21");
-        fanHealthIndex.setANALYSISTIME("21");
-        fanHealthIndex.setANOMALY(2.0);
-        fanHealthIndex.setEquipmentName("21");
-        fanHealthIndex.setGatewayId("213412");
-        fanHealthIndex.setPointName("21312");
-        fanHealthIndex.setNumber("213");
-        fanHealthIndex.setKks("213");
-        fanHealthIndex.setRecDate(DateUtil.date());
-        fanHealthIndex.setSubSystem("213421");
-        fanHealthIndex.setWeigth(2.2);
-        fanHealthIndex.setAnalysisType("按时刻");
-        fanHealthIndex.setStation("rwwrrw");
-        fanHealthIndex.setIndexAddress("2321");
-        FanHealthIndex fanHealthIndex1 = new FanHealthIndex();
-        BeanUtil.copyProperties(fanHealthIndex, fanHealthIndex1);
-        fanHealthIndex1.setWeight(fanHealthIndex.getWeigth());
-        fanHealthIndex1.setAnomaly(fanHealthIndex.getANOMALY());
-        fanHealthIndex1.setRecDate(DateUtil.now());
-        fanHealthIndex1.setArea(fanHealthIndex.getArae());
-        fanHealthIndex1.setAnalysisTime(DateUtil.now());
-        fanHealthIndex1.setHealthLevel(fanHealthIndex.getHealthLevel());
-        fanHealthIndex1.setKks("123456");
-        ArrayList<FanHealthIndex> fanHealthIndices1 = new ArrayList<>();
-        fanHealthIndices1.add(fanHealthIndex1);
-        list.add(fanHealthIndex);
-//        commonService.healthWarningMinuteByFJ();
-        fanHealthIndexMapper.saveBatchHealthIndexList(fanHealthIndices1, "fan_health_index_moment");
+        tdengineTimeService.insertHourData();
+//        QueryWrapper<FanHealthIndex> fanHealthIndexQueryWrapper = new QueryWrapper<>();
+//        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectList(fanHealthIndexQueryWrapper);
+//
+//        List<IdxBizFanHealthIndex> list = new ArrayList<>();
+//        IdxBizFanHealthIndex fanHealthIndex = new IdxBizFanHealthIndex();
+//        fanHealthIndex.setHealthIndex(2.0);
+////        fanHealthIndex.setTs(System.currentTimeMillis());
+//        fanHealthIndex.setArae("区域");
+//        fanHealthIndex.setAnalysisEndTime(DateUtil.date());
+//        fanHealthIndex.setAnalysisObjSeq("2");
+//        fanHealthIndex.setHealthLevel("2321");
+//        fanHealthIndex.setHealthIndex(25.0);
+//        fanHealthIndex.setAnalysisStartTime(DateUtil.date());
+//        fanHealthIndex.setAnalysisObjType("21");
+//        fanHealthIndex.setANALYSISTIME("21");
+//        fanHealthIndex.setANOMALY(2.0);
+//        fanHealthIndex.setEquipmentName("21");
+//        fanHealthIndex.setGatewayId("213412");
+//        fanHealthIndex.setPointName("21312");
+//        fanHealthIndex.setNumber("213");
+//        fanHealthIndex.setKks("213");
+//        fanHealthIndex.setRecDate(DateUtil.date());
+//        fanHealthIndex.setSubSystem("213421");
+//        fanHealthIndex.setWeigth(2.2);
+//        fanHealthIndex.setAnalysisType("按时刻");
+//        fanHealthIndex.setStation("rwwrrw");
+//        fanHealthIndex.setIndexAddress("2321");
+//        FanHealthIndex fanHealthIndex1 = new FanHealthIndex();
+//        BeanUtil.copyProperties(fanHealthIndex, fanHealthIndex1);
+//        fanHealthIndex1.setWeight(fanHealthIndex.getWeigth());
+//        fanHealthIndex1.setAnomaly(fanHealthIndex.getANOMALY());
+//        fanHealthIndex1.setRecDate(DateUtil.now());
+//        fanHealthIndex1.setArea(fanHealthIndex.getArae());
+//        fanHealthIndex1.setAnalysisTime(DateUtil.now());
+//        fanHealthIndex1.setHealthLevel(fanHealthIndex.getHealthLevel());
+//        fanHealthIndex1.setKks("123456");
+//        ArrayList<FanHealthIndex> fanHealthIndices1 = new ArrayList<>();
+//        fanHealthIndices1.add(fanHealthIndex1);
+//        list.add(fanHealthIndex);
+////        commonService.healthWarningMinuteByFJ();
+//        fanHealthIndexMapper.saveBatchHealthIndexList(fanHealthIndices1, "fan_health_index_moment");
     }
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/FullViewRecallInfoDTO.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jxiop.biz.dto;
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class FullViewRecallInfoDTO {
     private String key;
@@ -12,4 +15,6 @@ public class FullViewRecallInfoDTO {
     private String status = "";
     private Boolean isRoot = false;
     private String category = "";
+    private List<FullViewRecallInfoDTO> childList = new ArrayList<>();
+    private String parentKey;
 }