解决冲突

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

@@ -27,10 +27,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 
@@ -337,10 +334,36 @@ public class IdxBizFanWarningRecordController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/selectFanWarningNum")
 	@ApiOperation(httpMethod = "GET", value = "查询各风机预警状况", notes = "查询各风机预警状况")
-	public ResponseModel<List<Map<String,Object>>> selectFanWarningNum(@RequestParam String station) {
+	public ResponseModel<Map<String,Object>> selectFanWarningNum(@RequestParam String station) {
+		Map<String, Object> resultMap = new HashMap<>();
 		List<Map<String, Object>> maps = fanWaringRecordMapper.selectFanWarningNum(station);
+		List<Integer> wxList = new ArrayList<>();
+		List<Integer> zyList = new ArrayList<>();
+		List<Integer> jgList = new ArrayList<>();
+		List<String> list =new ArrayList<>();
+		for (Map<String, Object> map : maps) {
+			wxList.add(Integer.valueOf(map.get("危险").toString()));
+			zyList.add(Integer.valueOf(map.get("注意").toString()));
+			jgList.add(Integer.valueOf(map.get("警告").toString()));
+			list.add(map.get("EQUIPMENT_NAME").toString());
+
+		}
+
+		HashMap<String, Object> wxMapResult = new HashMap<>();
+		wxMapResult.put("data", wxList);
+		wxMapResult.put("name", "危险");
+		HashMap<String, Object> zyMapResult = new HashMap<>();
+		zyMapResult.put("data", zyList);
+		zyMapResult.put("name", "注意");
+		HashMap<String, Object> jgMapResult = new HashMap<>();
+		jgMapResult.put("data", jgList);
+		jgMapResult.put("name", "警告");
+
+		List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult);
+		resultMap.put("axisData", list);
+		resultMap.put("seriesData", hashMaps);
+		return ResponseHelper.buildResponse(resultMap);
 
-		return ResponseHelper.buildResponse(maps);
 	}
 
 

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

@@ -373,41 +373,22 @@ public class TDBigScreenAnalyseController extends BaseController {
     @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) {
+    public ResponseModel<List<Map<String, Object>>> assessIndexRadarMap(@RequestParam(required = false, value = "stationCode") String stationCode) {
         if (CharSequenceUtil.isNotEmpty(stationCode)) {
             StationBasic stationBasic = stationBasicMapper.selectById(stationCode);
             stationCode = stationBasic.getFanGatewayId();
         }
         List<Map<String, Object>> list = fanHealthIndexMapper.equipWarningRadarMapByTd(stationCode);
         Map<String, Integer> warningNumMap = list.stream().collect(Collectors.toMap(t -> t.get("warningname").toString(), t -> Integer.parseInt(t.get("num").toString())));
-        List<String> warningList = Arrays.asList("危险", "注意", "警告");
-        List<Integer> data = new ArrayList<>();
-
-        List<List<Integer>> resultData = new ArrayList<>();
-
+        List<String> warningList = Arrays.asList("注意", "警告", "危险");
         List<Map<String, Object>> resultList = new ArrayList<>();
         warningList.forEach(item -> {
             HashMap<String, Object> map = new HashMap<>();
-            map.put("text", item);
+            map.put("name", item);
+            map.put("value", warningNumMap.getOrDefault(item, 0));
             resultList.add(map);
-            data.add(warningNumMap.getOrDefault(item, 0));
         });
-        resultData.add(data);
-
-        HashMap<String, Object> resultMap = new HashMap<>();
-        resultMap.put("radar", resultList);
-        resultMap.put("array", resultData);
-        return ResponseHelper.buildResponse(resultMap);
-
-//        HashMap<String, Object> resultMap = new HashMap<>();
-//        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());
-//        });
-//
+        return ResponseHelper.buildResponse(resultList);
     }
 
 

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

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     @Select("<script>"+
-            "SELECT `health_index` AS healthIndex,anomaly, `health_index` AS `value`,  analysis_time AS  analysisTime, station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType}" +
+            "SELECT `health_index` AS healthIndex,anomaly, `health_index` AS `value`,  analysis_time AS  analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType}" +
             "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
             "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +

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

@@ -21,7 +21,8 @@ public interface FanHealthIndexHourMapper extends BaseMapper<FanHealthIndexHour>
             "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<FanHealthIndexHour> 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);
+    List<FanHealthIndexHour> 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, @Param("current")Integer current,@Param("size") Integer size);
 
 }

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMoment> {
     @Select("<script>"+
-            "SELECT `health_index` AS healthIndex,`health_index` AS `value`, anomaly, analysis_time AS  analysisTime, station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_moment WHERE analysis_obj_type = #{analysisObjType}" +
+            "SELECT `health_index` AS healthIndex,`health_index` AS `value`, anomaly, analysis_time AS  analysisTime,point_name as pointName,  station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_moment WHERE analysis_obj_type = #{analysisObjType}" +
             "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
             "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
@@ -21,7 +21,8 @@ public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMom
             "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "order by health_index "+
+            "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<FanHealthIndexMoment> 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);
+    List<FanHealthIndexMoment> 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, @Param("current")Integer current,@Param("size") Integer size);
 
 }