Skip to content

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

解决冲突

parents b0561695 bbd0c895
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 9 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 @ bffb5e74
...@@ -166,13 +166,17 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -166,13 +166,17 @@ public class IdxBizFanHealthIndexController extends BaseController {
List<IdxBizFanWarningRecord> idxBizPvWarningRecordList = idxBizFanHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME); List<IdxBizFanWarningRecord> idxBizPvWarningRecordList = idxBizFanHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
int total = idxBizFanHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME); int total = idxBizFanHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME);
Map<String,Object> map =new HashMap<>();
Map<String,Object> map1 =new HashMap<>();
Map<String,Object> warningNum =new HashMap<>(); Map<String,Object> warningNum =new HashMap<>();
warningNum.put("name","注意"); warningNum.put("name","注意");
warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count()); warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
warningNum.put("name","警告");
warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count()); map.put("name","警告");
warningNum.put("name","危险"); map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
map1.put("name","危险");
map1.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
Map<String,Object> pointNum =new HashMap<>(); Map<String,Object> pointNum =new HashMap<>();
pointNum.put("name","正常"); pointNum.put("name","正常");
...@@ -180,6 +184,8 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -180,6 +184,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
List<Map<String,Object>> list = new ArrayList<>(); List<Map<String,Object>> list = new ArrayList<>();
list.add(pointNum); list.add(pointNum);
list.add(map1);
list.add(map);
list.add(warningNum); list.add(warningNum);
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java
View file @ bffb5e74
...@@ -170,13 +170,17 @@ public class IdxBizPvHealthIndexController extends BaseController { ...@@ -170,13 +170,17 @@ public class IdxBizPvHealthIndexController extends BaseController {
List<IdxBizPvWarningRecord> idxBizPvWarningRecordList = idxBizPvHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME); List<IdxBizPvWarningRecord> idxBizPvWarningRecordList = idxBizPvHealthIndexServiceImpl.warningData(STATION, SUBARRAY, EQUIPMENTNAME);
int total = idxBizPvHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME); int total = idxBizPvHealthIndexServiceImpl.pointNum(STATION, SUBARRAY, EQUIPMENTNAME);
Map<String,Object> warningNum =new HashMap<>(); Map<String,Object> map =new HashMap<>();
Map<String,Object> map1 =new HashMap<>();
Map<String,Object> warningNum =new HashMap<>();
warningNum.put("name","注意"); warningNum.put("name","注意");
warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count()); warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
warningNum.put("name","警告");
warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count()); map.put("name","警告");
warningNum.put("name","危险"); map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
map1.put("name","危险");
map1.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("危险")).count());
Map<String,Object> pointNum =new HashMap<>(); Map<String,Object> pointNum =new HashMap<>();
pointNum.put("name","正常"); pointNum.put("name","正常");
...@@ -185,6 +189,8 @@ public class IdxBizPvHealthIndexController extends BaseController { ...@@ -185,6 +189,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
List<Map<String,Object>> list = new ArrayList<>(); List<Map<String,Object>> list = new ArrayList<>();
list.add(pointNum); list.add(pointNum);
list.add(warningNum); list.add(warningNum);
list.add(map1);
list.add(map);
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
......
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