解决冲突

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

@@ -223,4 +223,27 @@ public class BigScreenAnalyseController extends BaseController {
         return ResponseHelper.buildResponse(resultMap);
     }
 
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "场站预警信息统计图 - 雷达图", httpMethod = "GET")
+    @GetMapping("/equipWarningRadarMap")
+    public ResponseModel<Map<String, Object>> assessIndexRadarMap(@RequestParam(required = false, value = "stationCode") String stationCode) {
+        List<Map<String, Object>> list = idxBizFanHealthIndexMapper.equipWarningRadarMap(stationCode);
+        HashMap<String, Object> resultMap = new HashMap<>();
+        List<List<String>> resultData = new ArrayList<>();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        List<String> data = new ArrayList<>();
+        list.forEach(item -> {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("text", item.get("warningName"));
+            resultList.add(map);
+            data.add(item.get("num").toString());
+        });
+        resultData.add(data);
+        resultMap.put("radar", resultList);
+        resultMap.put("array", resultData);
+        return ResponseHelper.buildResponse(resultMap);
+    }
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

@@ -28,4 +28,6 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 
 
     List<Map<String, Object>> getHealthInfoByStation(@Param("areaCode") String areaCode);
+
+    List<Map<String, Object>> equipWarningRadarMap(@Param("stationCode") String stationCode);
 }

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

@@ -216,6 +216,33 @@
             a.STATION
     </select>
 
-
-
+<select id="equipWarningRadarMap" resultType="java.util.Map">
+    SELECT
+    a.warningName,
+    count( 1 ) AS num
+    FROM
+    (
+    SELECT
+    WARNING_NAME AS warningName
+    FROM
+    idx_biz_fan_warning_record
+    <where>
+        <if test="stationCode != null and stationCode != ''">
+            station = #{stationCode}
+        </if>
+    </where>
+    UNION ALL
+    SELECT
+    WARNING_NAME AS warningName
+    FROM
+    idx_biz_pv_warning_record
+    <where>
+        <if test="stationCode != null and stationCode != ''">
+            station = #{stationCode}
+        </if>
+    </where>
+    ) a
+    GROUP BY
+    a.warningName
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/AnalysisFanStationController.java

@@ -30,18 +30,20 @@ public class AnalysisFanStationController {
     AnalysisFanStationImpl analysisFanStationImpl;
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "分析-风站 - 场站风速")
+    @ApiOperation(value = "分析-风站/光伏 - 场站风速/辐照强度")
     @GetMapping("/getStationWindSpeedStatistics")
     public ResponseModel<Map<String, Object>> getStationWindSpeedStatistics(@RequestParam(value = "stationId", required = false)String stationId, @RequestParam(value = "type", required = false)String type) {
         String gatewayId = "";
+        String equipmentIndexName = "总辐射累计";
         if (null != stationId) {
             StationBasic stationBasic = stationBasicMapper.selectById(stationId);
             gatewayId = stationBasic.getBoosterGatewayId();
             if (null == type){
                 gatewayId = stationBasic.getFanGatewayId();
+                equipmentIndexName = "瞬时风速";
             }
         }
-        Map<String, Object> detailsWindSpeed = analysisFanStationImpl.getStationWindSpeedStatistics(gatewayId);
+        Map<String, Object> detailsWindSpeed = analysisFanStationImpl.getStationWindSpeedStatistics(gatewayId, equipmentIndexName);
 
         return ResponseHelper.buildResponse(detailsWindSpeed);
     }

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

@@ -18,8 +18,8 @@ public class AnalysisFanStationImpl {
     @Autowired
     private TemporaryDataMapper temporaryDataMapper;
 
-    public Map<String,Object> getStationWindSpeedStatistics(String gatewayId){
-        List<Map<String, String>> list = temporaryDataMapper.getStationWindSpeedStatistics(gatewayId, "瞬时风速");
+    public Map<String,Object> getStationWindSpeedStatistics(String gatewayId, String equipmentIndexName){
+        List<Map<String, String>> list = temporaryDataMapper.getStationWindSpeedStatistics(gatewayId, equipmentIndexName);
         Map<String,Object> map = new HashMap<>();
         List<String> valueList = new ArrayList<>();
         Set<String> time = new  TreeSet<>();