bug修改

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

@@ -642,7 +642,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexDays.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexDays.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}else if (requiredType.equals("按小时")){
 
@@ -666,7 +666,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexHour> fanHealthIndexHours = fanHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexHours.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexHours.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}else {
 //			if (null != type && type.equals("0")){
@@ -683,7 +683,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexMoments.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexMoments.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}
 	}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.jxiop.biz.Enum.HealthLevelSortEnum;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvHealthIndexServiceImpl;
@@ -18,6 +19,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -44,6 +46,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 	PvHealthIndexMomentMapper pvHealthIndexMomentMapper;
 	@Autowired
 	PvWaringRecordMapper pvWaringRecordMapper;
+	public final DecimalFormat df = new DecimalFormat("#.0");
     /**
      * 新增
      *
@@ -298,6 +301,76 @@ public class IdxBizPvHealthIndexController extends BaseController {
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "仪表盘",   notes = "仪表盘")
+	@GetMapping(value = "/pointHealthIndexTableByPanel")
+	public ResponseModel<Map<String, Object>> pointHealthIndexTableByPanel(@RequestParam(value = "area",required = false) String area,
+													 		@RequestParam(value = "station",required = false) String station,
+													 		@RequestParam(value = "analysisObjType",required = false) String analysisObjType,
+													 		@RequestParam(value = "analysisType",required = false) String analysisType,
+													 		@RequestParam(value = "endTimeTop",required = false) String endTimeTop,
+													 		@RequestParam(value = "startTimeTop",required = false) String startTimeTop,
+													 		@RequestParam(value = "indexAddress",required = false) String indexAddress,
+													 		@RequestParam(value = "pointName",required = false) String pointName,
+													 		@RequestParam(value = "equipmentName",required = false) String equipmentName,
+													 		@RequestParam(value = "healthLevel",required = false) String healthLevel,
+													 		@RequestParam(value = "type",required = false) String type,
+													 		@RequestParam(value = "requiredType",required = false) String requiredType,
+													 		@RequestParam(value = "current",required = false) Integer current,
+													 		@RequestParam(value = "size",required = false) Integer size,
+													 		@RequestParam(value = "subarray",required = false) String subarray){
+
+
+
+		if (requiredType.equals("按天")){
+			Date startDayTime = DateUtils.getCurrentDayStartTime(new Date());
+			Date date = DateUtils.dateAddHours(startDayTime, -8);
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			startTimeTop = formatter.format(date);
+
+			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+
+			Map<String,Object> map = new HashMap<>();
+
+			map.put("value", Double.parseDouble(df.format(fanHealthIndexDays.get(0).getHealthIndex())));
+
+			return 	ResponseHelper.buildResponse(map);
+
+
+
+
+		}else if (requiredType.equals("按小时")){
+			int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+			String day = DateUtils.getDateNowShortStr();
+			startTimeTop = day + " "+ hour+":00:00";
+			try {
+				Date date = DateUtils.dateAddHours(DateUtils.dateParse(startTimeTop,DateUtils.DATE_TIME_PATTERN),-8);
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				startTimeTop = formatter.format(date);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			Map<String,Object> map = new HashMap<>();
+
+			map.put("value", Double.parseDouble(df.format(fanHealthIndexHours.get(0).getHealthIndex())));
+
+			return 	ResponseHelper.buildResponse(map);
+		}else {
+			Date date = DateUtils.dateAddMinutes(null,-9);
+			date = DateUtils.dateAddHours(date, -8);
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			startTimeTop = formatter.format(date);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			Map<String,Object> map = new HashMap<>();
+
+			map.put("value", Double.parseDouble(df.format(fanHealthIndexMoments.get(0).getHealthIndex())));
+
+			return 	ResponseHelper.buildResponse(map);
+		}
+	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "TD 光伏折线图",   notes = "TD光伏折线图")
 	@GetMapping(value = "/pointHealthIndexTrend")
 	public ResponseModel<Object> pointHealthIndexTrend(@RequestParam(value = "area",required = false) String area,
@@ -329,12 +402,12 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
 
-			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName, (current - 1) * size, size);
 			fanHealthIndexDays=	fanHealthIndexDays.stream().sorted(Comparator.comparing(PvHealthIndexDay::getAnalysisTime)).collect(Collectors.toList());
 
 			for (PvHealthIndexDay obj : fanHealthIndexDays) {
 				if (type.equals("0")){
-					seriesData.add(obj.getHealthIndex().intValue());
+					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
 					seriesData.add(obj.getAnomaly());
 				}
@@ -355,7 +428,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			fanHealthIndexHours=	fanHealthIndexHours.stream().sorted(Comparator.comparing(PvHealthIndexHour::getAnalysisTime)).collect(Collectors.toList());
 			for (PvHealthIndexHour obj : fanHealthIndexHours) {
 				if (type.equals("0")){
-					seriesData.add(obj.getHealthIndex().intValue());
+					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
 					seriesData.add(obj.getAnomaly());
 				}
@@ -377,7 +450,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			fanHealthIndexMoments=	fanHealthIndexMoments.stream().sorted(Comparator.comparing(PvHealthIndexMoment::getAnalysisTime)).collect(Collectors.toList());
 			for (PvHealthIndexMoment obj : fanHealthIndexMoments) {
 				if (type.equals("0")){
-					seriesData.add(obj.getHealthIndex().intValue());
+					seriesData.add(Double.parseDouble(df.format(obj.getHealthIndex())));
 				}else {
 					seriesData.add(obj.getAnomaly());
 				}
@@ -444,4 +517,80 @@ public class IdxBizPvHealthIndexController extends BaseController {
 		return ResponseHelper.buildResponse(maps);
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "查询场站下设备状态统计",   notes = "查询场站下设备状态统计")
+	@GetMapping (value = "/selectEquipStatusByStationPv")
+	public ResponseModel<List<Map<String,Object>>> selectEquipStatusByStationPv(@RequestParam(value = "area",required = false) String area,
+																			  	@RequestParam(value = "station",required = false) String station,
+																			  	@RequestParam(value = "analysisObjType",required = false) String analysisObjType
+	) {
+		List<Map<String, Object>> maps = pvHealthIndexDayMapper.selectEquipStatusByStationPv(area, analysisObjType, station);
+		if (maps.size() == 4){
+			for (Map<String, Object> map : maps) {
+				map.put("name",map.get("healthlevel"));
+			}
+		} else {
+
+			List<String> levels = new ArrayList<>();
+			levels.add("安全");
+			levels.add("注意");
+			levels.add("警告");
+			levels.add("危险");
+
+			for (Map<String, Object> map : maps) {
+				map.put("name",map.get("healthlevel"));
+				String healthlevel = map.get("healthlevel").toString();
+				levels.remove(healthlevel);
+			}
+
+			if (levels.size()>0){
+				for (String s : levels) {
+					Map<String, Object> map = new HashMap<>();
+					map.put("name",s);
+					map.put("value",0);
+					map.put("sort", HealthLevelSortEnum.getCode(s));
+					maps.add(map);
+				}
+				maps = maps.stream().sorted(Comparator.comparingLong(e ->  Long.valueOf(e.get("sort").toString()))).collect(Collectors.toList());
+			}
+		}
+		return ResponseHelper.buildResponse(maps);
+	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/selectFanWarningNum")
+	@ApiOperation(httpMethod = "GET", value = "查询各风机预警状况", notes = "查询各风机预警状况")
+	public ResponseModel<Map<String,Object>> selectFanWarningNum(@RequestParam String station) {
+		Map<String, Object> resultMap = new HashMap<>();
+		List<Map<String, Object>> maps = pvWaringRecordMapper.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("subarray").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);
+
+	}
+
 }

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
@@ -24,7 +25,17 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "order by health_index "+
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexDay> selectData(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName
+    List<PvHealthIndexDay> selectData(@Param("station")String station,
+                                      @Param("analysisType")String analysisType,
+                                      @Param("indexAddress")String indexAddress,
+                                      @Param("healthLevel")String healthLevel,
+                                      @Param("area")String area,
+                                      @Param("analysisObjType")String analysisObjType,
+                                      @Param("subarray")String subarray,
+                                      @Param("pointName")String pointName,
+                                      @Param("startTimeTop") String startTimeTop,
+                                      @Param("endTimeTop")String endTimeTop,
+                                      @Param("equipmentName")String equipmentName
             , @Param("current")Integer current, @Param("size")Integer size);
 
 
@@ -43,4 +54,12 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "</script>")
     int selectDataTotal(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName);
 
+    @Select("<script>"+
+            "SELECT  station, health_level as healthlevel,( CASE HEALTH_LEVEL WHEN '危险' THEN 4 WHEN '警告' THEN 3 WHEN '注意' THEN 2 ELSE 1 END ) AS sort, count( 1 ) AS `value` FROM analysis_data.pv_health_index_day WHERE analysis_obj_type = #{analysisObjType} AND ts >= TODAY()-8h" +
+            "<if test='area!= null'> AND area = #{area} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            " GROUP BY station,health_level  order by sort"+
+            "</script>")
+    List<Map<String,Object>> selectEquipStatusByStationPv(@Param("area")String area, @Param("analysisObjType")String analysisObjType, @Param("station")String station);
+
 }