Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -13,11 +13,13 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,11 +48,11 @@ public class TestController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
     @GetMapping("/test2")
-    public void test2 () {
-
+    public void test2 (@RequestParam(value = "startTime") String startTime, @Param("recDate") String recDate) {
+//        List<FanHealthIndex> infoListByGroupByCD = fanHealthIndexMapper.getInfoListByGroupByCdFan(startTime, recDate);
 //        commonService.healthWarningMinuteByFJ();
-        commonService.healthWarningMinuteByPv();
-
+//        commonService.healthWarningMinuteByPv();
+//        return infoListByGroupByCD;
     }
 
     @Autowired
@@ -64,7 +66,6 @@ public class TestController extends BaseController {
     @PostMapping("/saveTest")
     public void saveTest () {
 
-        tdengineTimeService.insertHourData();
 //        QueryWrapper<FanHealthIndex> fanHealthIndexQueryWrapper = new QueryWrapper<>();
 //        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectList(fanHealthIndexQueryWrapper);
 //

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexMapper.java

@@ -25,4 +25,41 @@ public interface FanHealthIndexMapper extends BaseMapper<FanHealthIndex> {
     List<FanHealthIndexDay> selectData(@Param("healthLevel")String healthLevel, @Param("area")String area, @Param("equipmentName")String equipmentName, @Param("subSystem")String subSystem, @Param("analysisType")String analysisType, @Param("analysisObjType")String analysisObjType, @Param("station")String station, @Param("pointName")String pointName, @Param("indexAddress")String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop);
 
     int saveBatchHealthIndexList(@Param("list") List<FanHealthIndex> list, @Param("tableName") String tableName);
+
+    /**
+     * 测点
+     *
+     * @return
+     */
+    List<FanHealthIndex> getInfoListByGroupByCdFan(@Param("startTime") String startTime,
+                                                   @Param("tableName") String tableName,
+                                                   @Param("analysisObjectType") String analysisObjectType);
+
+    /**
+     * 子系统
+     */
+    List<FanHealthIndex> getInfoListByGroupByZxtFan(@Param("startTime") String startTime,
+                                                    @Param("tableName") String tableName,
+                                                    @Param("analysisObjectType") String analysisObjectType);
+
+    /**
+     * 设备
+     */
+    List<FanHealthIndex> getInfoListByGroupBySbFan(@Param("startTime") String startTime,
+                                                   @Param("tableName") String tableName,
+                                                   @Param("analysisObjectType") String analysisObjectType);
+
+    /**
+     * 场站
+     */
+    List<FanHealthIndex> getInfoListByGroupByCzFan(@Param("startTime") String startTime,
+                                                   @Param("tableName") String tableName,
+                                                   @Param("analysisObjectType") String analysisObjectType);
+
+    /**
+     * 区域
+     */
+    List<FanHealthIndex> getInfoListByGroupByQyFan(@Param("startTime") String startTime,
+                                                   @Param("tableName") String tableName,
+                                                   @Param("analysisObjectType") String analysisObjectType);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndexDay;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex;
 import org.apache.ibatis.annotations.Param;
@@ -28,4 +29,23 @@ public interface PvHealthIndexMapper extends BaseMapper<PvHealthIndex> {
 
     int saveBatchHealthIndexList(@Param("list") List<PvHealthIndex> list, @Param("tableName") String tableName);
 
+    List<PvHealthIndex> getInfoListByGroupByCdPv(@Param("startTime") String startTime,
+                                                 @Param("tableName") String tableName,
+                                                 @Param("analysisObjectType") String analysisObjectType);
+
+    List<PvHealthIndex> getInfoListByGroupBySbPv(@Param("startTime") String startTime,
+                                                 @Param("tableName") String tableName,
+                                                 @Param("analysisObjectType") String analysisObjectType);
+
+    List<PvHealthIndex> getInfoListByGroupByZzPv(@Param("startTime") String startTime,
+                                                 @Param("tableName") String tableName,
+                                                 @Param("analysisObjectType") String analysisObjectType);
+
+    List<PvHealthIndex> getInfoListByGroupByCzPv(@Param("startTime") String startTime,
+                                                 @Param("tableName") String tableName,
+                                                 @Param("analysisObjectType") String analysisObjectType);
+
+    List<PvHealthIndex> getInfoListByGroupByQyPv(@Param("startTime") String startTime,
+                                                 @Param("tableName") String tableName,
+                                                 @Param("analysisObjectType") String analysisObjectType);
 }

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

@@ -32,4 +32,124 @@
         )
     </foreach>
     </insert>
+
+<select id="getInfoListByGroupByCdFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
+    select
+        index_address,
+        gateway_id ,
+        station,
+        analysis_obj_type,
+        analysis_obj_seq,
+        weight,
+        area,
+        sub_system,
+        number,
+        equipment_name,
+        avg(anomaly) as anomaly,
+        point_name,
+        kks,
+        AVG(health_index) as health_index
+    from
+        #{tableName}
+    where
+        analysis_obj_type = #{analysisObjectType}
+      and ts > #{startTime}
+    group by
+        gateway_id,
+        index_address,
+        station,
+        analysis_obj_type,
+        analysis_obj_seq,
+        weight,
+        area,
+        sub_system,
+        number,
+        equipment_name,
+        point_name,
+        kks
+    </select>
+
+<select id="getInfoListByGroupByZxtFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
+    select
+        gateway_id ,
+        station,
+        '子系统' as analysis_obj_type,
+        area,
+        sub_system,
+        equipment_name,
+        avg(anomaly) as anomaly,
+        AVG(health_index) as health_index
+    from
+        #{tableName}
+    where
+        analysis_obj_type = #{analysisObjectType}
+      and ts > #{startTime}
+    group by
+        gateway_id,
+        station,
+        analysis_obj_type,
+        area,
+        sub_system,
+        equipment_name
+    </select>
+
+<select id="getInfoListByGroupBySbFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
+    select
+        gateway_id ,
+        station,
+        '设备' as analysis_obj_type,
+        area,
+        number,
+        equipment_name,
+        avg(anomaly) as anomaly,
+        AVG(health_index) as health_index
+    from
+        #{tableName}
+    where
+        analysis_obj_type = #{analysisObjectType}
+      and ts > #{startTime}
+    group by
+        gateway_id,
+        station,
+        analysis_obj_type,
+        area,
+        number,
+        equipment_name
+    </select>
+
+<select id="getInfoListByGroupByCzFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
+    select
+        gateway_id,
+        station,
+        '场站' as analysis_obj_type,
+        area,
+        avg(anomaly) as anomaly,
+        AVG(health_index) as health_index
+    from
+        #{tableName}
+    where
+        analysis_obj_type = #{analysisObjectType}
+      and ts > #{startTime}
+    group by
+        gateway_id,
+        station,
+        analysis_obj_type,
+        area
+    </select>
+
+<select id="getInfoListByGroupByQyFan" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanHealthIndex">
+    select
+        '片区' as analysis_obj_type,
+        area,
+        avg(anomaly) as anomaly,
+        AVG(health_index) as health_index
+    from
+        #{tableName}
+    where
+        analysis_obj_type = #{analysisObjectType}
+      and ts > #{startTime}
+    group by
+        analysis_obj_type,
+        area
+    </select>
 </mapper>

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

@@ -66,4 +66,124 @@
             )
         </foreach>
     </insert>
+
+    <select id="getInfoListByGroupByCdPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
+        select
+            index_address,
+            gateway_id ,
+            station,
+            '测点' as analysis_obj_type,
+            analysis_obj_seq,
+            weight,
+            area,
+            subarray,
+            manufacturer,
+            equipment_name,
+            avg(anomaly) as anomaly,
+            point_name,
+            device_type,
+            kks,
+            AVG(health_index) as health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+          and ts > #{startTime}
+        group by
+            gateway_id,
+            index_address,
+            station,
+            analysis_obj_type,
+            analysis_obj_seq,
+            weight,
+            area,
+            subarray,
+            manufacturer,
+            equipment_name,
+            point_name,
+            device_type,
+            kks
+    </select>
+
+    <select id="getInfoListByGroupBySbPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
+        select
+            gateway_id ,
+            station,
+            '设备' as analysis_obj_type,
+            area,
+            subarray,
+            equipment_name,
+            avg(anomaly) as anomaly,
+            AVG(health_index) as health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+          and ts > #{startTime}
+        group by
+            gateway_id,
+            station,
+            analysis_obj_type,
+            area,
+            subarray,
+            equipment_name
+    </select>
+
+    <select id="getInfoListByGroupByZzPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
+        select
+            gateway_id ,
+            station,
+            '子阵' as analysis_obj_type,
+            area,
+            subarray,
+            avg(anomaly) as anomaly,
+            AVG(health_index) as health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+          and ts > #{startTime}
+        group by
+            gateway_id,
+            station,
+            analysis_obj_type,
+            area,
+            subarray
+    </select>
+
+    <select id="getInfoListByGroupByCzPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
+        select
+            gateway_id ,
+            station,
+            '场站' as analysis_obj_type,
+            area,
+            avg(anomaly) as anomaly,
+            AVG(health_index) as health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+          and ts > #{startTime}
+        group by
+            gateway_id,
+            station,
+            analysis_obj_type,
+            area
+    </select>
+
+    <select id="getInfoListByGroupByQyPv" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.PvHealthIndex">
+        select
+            '片区' as analysis_obj_type,
+            area,
+            avg(anomaly) as anomaly,
+            AVG(health_index) as health_index
+        from
+            #{tableName}
+        where
+            analysis_obj_type = #{analysisObjectType}
+          and ts > #{startTime}
+        group by
+            analysis_obj_type,
+            area
+    </select>
 </mapper>