Skip to content

A
amos-boot-biz
Commit 5d6a13f1 authored by tangwei's avatar tangwei
Browse files
Options

解决冲突

parents 47a5cccb 1c60cdf5
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 19 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java
View file @ 5d6a13f1
...@@ -346,9 +346,9 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -346,9 +346,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "TD 风电场站/设备列表通用接口", notes = "TD 风电场站/设备列表通用接口") @ApiOperation(httpMethod = "GET",value = "TD 风电场站/设备左侧列表通用接口", notes = "TD 风电场站/设备列表通用接口")
@GetMapping(value = "/stationHealthIndexTable") @GetMapping(value = "/stationHealthIndexTable")
public ResponseModel<List<FanHealthIndexDay>> stationHealthIndexTable(@RequestParam(value = "area",required = false) String area, public ResponseModel<Page<FanHealthIndexDay>> stationHealthIndexTable(@RequestParam(value = "area",required = false) String area,
@RequestParam(value = "station",required = false) String station, @RequestParam(value = "station",required = false) String station,
@RequestParam(value = "analysisObjType",required = false) String analysisObjType, @RequestParam(value = "analysisObjType",required = false) String analysisObjType,
@RequestParam(value = "analysisType",required = false) String analysisType, @RequestParam(value = "analysisType",required = false) String analysisType,
...@@ -359,9 +359,14 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -359,9 +359,14 @@ public class IdxBizFanHealthIndexController extends BaseController {
@RequestParam(value = "equipmentName",required = false) String equipmentName, @RequestParam(value = "equipmentName",required = false) String equipmentName,
@RequestParam(value = "healthLevel",required = false) String healthLevel, @RequestParam(value = "healthLevel",required = false) String healthLevel,
@RequestParam(value = "type",required = false) String type, @RequestParam(value = "type",required = false) String type,
@RequestParam(value = "subSystem",required = false) String subSystem){ @RequestParam(value = "subSystem",required = false) String subSystem,
@RequestParam(value = "current",required = false)Integer current,
@RequestParam(value = "size",required = false)Integer size){
Page<FanHealthIndexDay> page = new Page<FanHealthIndexDay>();
page.setCurrent(current);
page.setSize(size);
if (type.equals("0")){ if (type.equals("0")){
Date startDayTime = DateUtils.getCurrentDayStartTime(new Date()); Date startDayTime = DateUtils.getCurrentDayStartTime(new Date());
Date date = DateUtils.dateAddHours(startDayTime, -8); Date date = DateUtils.dateAddHours(startDayTime, -8);
...@@ -374,12 +379,52 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -374,12 +379,52 @@ public class IdxBizFanHealthIndexController extends BaseController {
Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8); Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
startTimeTop = formatter.format(startDate); startTimeTop = formatter.format(startDate);
} }
List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop); List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
page.setRecords(fanHealthIndexDays);
page.setTotal(Long.valueOf(fanHealthIndexDays.size()));
return ResponseHelper.buildResponse(page);
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "TD 风电场站/设备仪表盘", notes = "TD 风电场站/设备仪表盘")
@GetMapping(value = "/HealthIndexValue")
public ResponseModel<Map<String,Object>> HealthIndexValue(@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 = "subSystem",required = false) String subSystem,
@RequestParam(value = "current",required = false)Integer current,
@RequestParam(value = "size",required = false)Integer size){
return ResponseHelper.buildResponse(fanHealthIndexDays);
if (type.equals("0")){
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);
}else{
Date endDate = DateUtils.dateAddHours(DateUtils.longStr2Date(endTimeTop), -8);
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
endTimeTop = formatter.format(endDate);
Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
startTimeTop = formatter.format(startDate);
}
List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null);
Map<String,Object> map = new HashMap<>();
map.put("value",fanHealthIndexDays.get(0).getValue());
return ResponseHelper.buildResponse(map);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "查询场站下设备状态统计", notes = "查询场站下设备状态统计") @ApiOperation(httpMethod = "GET",value = "查询场站下设备状态统计", notes = "查询场站下设备状态统计")
@GetMapping (value = "/selectEquipStatusByStation") @GetMapping (value = "/selectEquipStatusByStation")
...@@ -394,22 +439,27 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -394,22 +439,27 @@ public class IdxBizFanHealthIndexController extends BaseController {
} }
} else { } else {
String[] levels = {"安全","注意","警告","危险"}; List<String> levels = new ArrayList<>();
List<String> level = Arrays.asList(levels); levels.add("安全");
levels.add("注意");
levels.add("警告");
levels.add("危险");
for (Map<String, Object> map : maps) { for (Map<String, Object> map : maps) {
map.put("name",map.get("healthLevel")); map.put("name",map.get("healthlevel"));
level.remove(map.get("healthLevel")); String healthlevel = map.get("healthlevel").toString();
levels.remove(healthlevel);
} }
if (level.size()>0){ if (levels.size()>0){
for (String s : level) { for (String s : levels) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("name",s); map.put("name",s);
map.put("value",0); map.put("value",0);
map.put("sort",HealthLevelSortEnum.getCode(s)); map.put("sort",HealthLevelSortEnum.getCode(s));
maps.add(map); maps.add(map);
} }
maps = maps.stream().sorted(Comparator.comparingInt(e -> (Integer) (e.get("sort")))).collect(Collectors.toList()); maps = maps.stream().sorted(Comparator.comparingLong(e -> Long.valueOf(e.get("sort").toString()))).collect(Collectors.toList());
} }
} }
return ResponseHelper.buildResponse(maps); return ResponseHelper.buildResponse(maps);
...@@ -417,7 +467,7 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -417,7 +467,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "预警监测设备级统计td", notes = "预警监测设备级统计td") @ApiOperation(httpMethod = "GET",value = "预警监测设备级统计td 右侧列表", notes = "各风机预警待确认数量统计")
@GetMapping(value = "/selectPointNum") @GetMapping(value = "/selectPointNum")
public ResponseModel<List<Map<String,Object>>> selectPointNum(@RequestParam(required = false) String STATION,@RequestParam(required = false) String SUBSYSTEM,@RequestParam(required = false) String EQUIPMENTNAME) { public ResponseModel<List<Map<String,Object>>> selectPointNum(@RequestParam(required = false) String STATION,@RequestParam(required = false) String SUBSYSTEM,@RequestParam(required = false) String EQUIPMENTNAME) {
List<FanWarningRecord> idxBizPvWarningRecordList = fanWarningRecord.warningData(STATION,EQUIPMENTNAME ,SUBSYSTEM ); List<FanWarningRecord> idxBizPvWarningRecordList = fanWarningRecord.warningData(STATION,EQUIPMENTNAME ,SUBSYSTEM );
...@@ -462,7 +512,9 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -462,7 +512,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
@RequestParam(value = "healthLevel",required = false) String healthLevel, @RequestParam(value = "healthLevel",required = false) String healthLevel,
@RequestParam(value = "type",required = false) String type, @RequestParam(value = "type",required = false) String type,
@RequestParam(value = "requiredType",required = false) String requiredType, @RequestParam(value = "requiredType",required = false) String requiredType,
@RequestParam(value = "subSystem",required = false) String subSystem){ @RequestParam(value = "subSystem",required = false) String subSystem,
@RequestParam(value = "current",required = false) Integer current,
@RequestParam(value = "size",required = false) Integer size){
...@@ -479,7 +531,7 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -479,7 +531,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
// Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8); // Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
// startTimeTop = formatter.format(startDate); // startTimeTop = formatter.format(startDate);
// } // }
List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop); List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,current,size);
return ResponseHelper.buildResponse(fanHealthIndexDays); return ResponseHelper.buildResponse(fanHealthIndexDays);
}else if (requiredType.equals("按小时")){ }else if (requiredType.equals("按小时")){
...@@ -552,7 +604,7 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -552,7 +604,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8); Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
startTimeTop = formatter.format(startDate); startTimeTop = formatter.format(startDate);
List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop); List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null);
fanHealthIndexDays= fanHealthIndexDays.stream().sorted(Comparator.comparing(FanHealthIndexDay::getAnalysisTime)).collect(Collectors.toList()); fanHealthIndexDays= fanHealthIndexDays.stream().sorted(Comparator.comparing(FanHealthIndexDay::getAnalysisTime)).collect(Collectors.toList());
for (FanHealthIndexDay obj : fanHealthIndexDays) { for (FanHealthIndexDay obj : fanHealthIndexDays) {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/KafkaAnalyseController.java
View file @ 5d6a13f1
...@@ -334,10 +334,10 @@ public class KafkaAnalyseController { ...@@ -334,10 +334,10 @@ public class KafkaAnalyseController {
} }
} }
} }
stationDto.setScoreRange("(最高：" + stationLowScore + "分, 最低：" + stationHighScore + "分)"); stationDto.setScoreRange("(最低：" + stationLowScore + "分, 最高：" + stationHighScore + "分)");
} }
areaMapDto.setScoreRange("(最高：" + areaLowScore + "分, 最低：" + areaHighScore + "分)"); areaMapDto.setScoreRange("(最低：" + areaLowScore + "分, 最高：" + areaHighScore + "分)");
} }
List<FullViewRecallInfoDTO> resultList = new ArrayList<>(); List<FullViewRecallInfoDTO> resultList = new ArrayList<>();
resultList.add(allMapDto); resultList.add(allMapDto);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexDayMapper.java
View file @ 5d6a13f1
...@@ -22,8 +22,10 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> { ...@@ -22,8 +22,10 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
"<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " + "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
"<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" + "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
"order by health_index "+ "order by health_index "+
"<if test='current != null and size != null'>limit ${current},${size} </if>" +
"</script>") "</script>")
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); 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,
@Param("current")Integer current,@Param("size") Integer size);
@Select("<script>"+ @Select("<script>"+
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment