Commit 7057ce03 authored by caotao's avatar caotao

bug

parent ef92a855
...@@ -812,7 +812,7 @@ public class MonitorFanIdxController extends BaseController { ...@@ -812,7 +812,7 @@ public class MonitorFanIdxController extends BaseController {
Map<String, Object> result = monitorFanIndicator.partofWaring3D(stationId,equipNum); Map<String, Object> result = monitorFanIndicator.partofWaring3D(stationId,equipNum);
return ResponseHelper.buildResponse(result); return ResponseHelper.buildResponse(result);
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "逆变器状态数量") @ApiOperation(value = "逆变器状态数量")
@GetMapping("/nbqStatus") @GetMapping("/nbqStatus")
public ResponseModel<Page<Map<String, Object>>> nbqStatus(@RequestParam("stationId") String stationId) { public ResponseModel<Page<Map<String, Object>>> nbqStatus(@RequestParam("stationId") String stationId) {
......
...@@ -1946,49 +1946,44 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -1946,49 +1946,44 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
map.put("color", "#00AA00"); map.put("color", "#00AA00");
resultList.add(map); resultList.add(map);
HashMap<String, Object> map2 = new HashMap<>(); HashMap<String, Object> map2 = new HashMap<>();
map2.put("count", zcNum); map2.put("count", tjNum);
map2.put("equipmentIndexName", "正常运行"); map2.put("equipmentIndexName", "正常停机");
map2.put("color", "#00AA00"); map2.put("color", "#0055FF");
resultList.add(map2); resultList.add(map2);
HashMap<String, Object> map3 = new HashMap<>(); HashMap<String, Object> map3 = new HashMap<>();
map3.put("count", zcNum); map3.put("count", xeNum);
map3.put("equipmentIndexName", "正常运行"); map3.put("equipmentIndexName", "限功率");
map3.put("color", "#00AA00"); map3.put("color", "#A3F5AA");
resultList.add(map3); resultList.add(map3);
HashMap<String, Object> map4 = new HashMap<>(); HashMap<String, Object> map4 = new HashMap<>();
map4.put("count", zcNum); map4.put("count", xdNum);
map4.put("equipmentIndexName", "正常运行"); map4.put("equipmentIndexName", "限电停机");
map4.put("color", "#00AA00"); map4.put("color", "#FF00FF");
resultList.add(map4); resultList.add(map4);
HashMap<String, Object> map5 = new HashMap<>(); HashMap<String, Object> map5 = new HashMap<>();
map5.put("count", zcNum); map5.put("count", gjNum);
map5.put("equipmentIndexName", "正常运行"); map5.put("equipmentIndexName", "告警运行");
map5.put("color", "#00AA00"); map5.put("color", "#F9AD14");
resultList.add(map5); resultList.add(map5);
HashMap<String, Object> map6 = new HashMap<>(); HashMap<String, Object> map6 = new HashMap<>();
map6.put("count", zcNum); map6.put("count", gzNum);
map6.put("equipmentIndexName", "正常运行"); map6.put("equipmentIndexName", "故障停机");
map6.put("color", "#00AA00"); map6.put("color", "#00AAFF");
resultList.add(map6); resultList.add(map6);
HashMap<String, Object> map7 = new HashMap<>(); HashMap<String, Object> map7 = new HashMap<>();
map7.put("count", zcNum); map7.put("count", djNum);
map7.put("equipmentIndexName", "正常运行"); map7.put("equipmentIndexName", "待机");
map7.put("color", "#00AA00"); map7.put("color", "#F91414");
resultList.add(map7); resultList.add(map7);
HashMap<String, Object> map8 = new HashMap<>(); HashMap<String, Object> map8 = new HashMap<>();
map8.put("count", zcNum); map8.put("count", txNum);
map8.put("equipmentIndexName", "正常运行"); map8.put("equipmentIndexName", "通讯中断");
map8.put("color", "#00AA00"); map8.put("color", "#7D8E95");
resultList.add(map8); resultList.add(map8);
mapPage.setTotal(8); mapPage.setTotal(8);
mapPage.setSize(8); mapPage.setSize(8);
mapPage.setCurrent(1); mapPage.setCurrent(1);
mapPage.setRecords(resultList); mapPage.setRecords(resultList);
return mapPage; return mapPage;
} }
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<modules> <modules>
<module>amos-boot-module-jxiop-api</module> <module>amos-boot-module-jxiop-api</module>
<module>amos-boot-module-jxiop-biz</module> <module>amos-boot-module-jxiop-biz</module>
<module>amos-boot-module-hygf-api</module> <!-- <module>amos-boot-module-hygf-api</module>-->
<module>amos-boot-module-hygf-biz</module> <!-- <module>amos-boot-module-hygf-biz</module>-->
<module>amos-boot-module-jxiop-monitor-biz</module> <module>amos-boot-module-jxiop-monitor-biz</module>
<module>amos-boot-module-jxiop-bigscreen-biz</module> <module>amos-boot-module-jxiop-bigscreen-biz</module>
<module>amos-boot-module-jxiop-analyse-biz</module> <module>amos-boot-module-jxiop-analyse-biz</module>
......
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