src/main/java/com/whyc/mapper/BatttestdataInfMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattdischargePlanService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BatttestdataInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/StationInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/webSocket/HomeMonitorSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BatttestdataInfMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/BatttestdataInfMapper.java
@@ -36,4 +36,7 @@ //本年 List<BatttestdataInf> selectYear(int userId); //查询今天所有正在放电的机房总数 int getPlanStaticToday(int userId); } src/main/java/com/whyc/service/BattdischargePlanService.java
@@ -29,6 +29,9 @@ private BattRtstateMapper rtstateMapper; @Resource private BatttestdataInfService testInfService; @Resource private BaoJiGroupBattGroupService baoJiGroupBattGroupService; //查询 @@ -157,36 +160,40 @@ Response planRes = new Response<>(); try { Map<String, Object> map = new HashMap<>(); Map<String, Integer> stateNumMap = new HashMap<>(); //查询今天所有正在放电的机房总数 int disNumAll = testInfService.getPlanStaticToday(userId); //Map<String, Integer> stateNumMap = new HashMap<>(); Map<String, Object> stateMap = new HashMap<>(); List<BattdischargePlan> stateList = mapper.getPlanStaticToday(userId); Map<Integer, List<BattdischargePlan>> stateDisMap = stateList.stream().collect(Collectors.groupingBy(BattdischargePlan::getDischargeState)); stateNumMap.put("state0", 0); /* stateNumMap.put("state0", 0); stateNumMap.put("state1", 0); stateNumMap.put("state3", 0); stateNumMap.put("state3", 0);*/ stateMap.put("state0", new ArrayList<>()); stateMap.put("state1", new ArrayList<>()); stateMap.put("state3", new ArrayList<>()); for (Integer dischargeState : stateDisMap.keySet()) { stateNumMap.put("state" + String.valueOf(dischargeState), stateDisMap.get(dischargeState).size()); //stateNumMap.put("state" + String.valueOf(dischargeState), stateDisMap.get(dischargeState).size()); stateMap.put("state" + String.valueOf(dischargeState), stateDisMap.get(dischargeState)); } Map<String, Integer> nodeNumMap = new HashMap<>(); /* Map<String, Integer> nodeNumMap = new HashMap<>(); nodeNumMap.put("node0", 0); nodeNumMap.put("node1", 0); nodeNumMap.put("node1", 0);*/ Map<String, Object> nodeMap = new HashMap<>(); nodeMap.put("node0", new ArrayList<>()); nodeMap.put("node1", new ArrayList<>()); Map<Integer, List<BattdischargePlan>> nodeDisMap = stateList.stream().collect(Collectors.groupingBy(BattdischargePlan::getNodeStation)); for (Integer node : nodeDisMap.keySet()) { nodeNumMap.put("node" + String.valueOf(node), nodeDisMap.get(node).size()); //nodeNumMap.put("node" + String.valueOf(node), nodeDisMap.get(node).size()); nodeMap.put("node" + String.valueOf(node), nodeDisMap.get(node)); } stateNumMap.put("sumNum", stateList.size()); map.put("stateNumMap", stateNumMap); //stateNumMap.put("sumNum", stateList.size()); //map.put("stateNumMap", stateNumMap); map.put("stateMap", stateMap); map.put("nodeNumMap", nodeNumMap); // map.put("nodeNumMap", nodeNumMap); map.put("nodeMap", nodeMap); map.put("disNumAll", disNumAll); planRes.setII(1, stateList.size() > 0, map, "今日放电任务统计"); } catch (Exception e) { planRes.set(1, false, "出现异常" + e.getMessage()); src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -315,4 +315,10 @@ map.put("jcchNum", chNum - hrchNum); return map; } //查询今天所有正在放电的机房总数 public int getPlanStaticToday(int userId) { int num = mapper.getPlanStaticToday(userId); return num; } } src/main/java/com/whyc/service/StationInfService.java
@@ -243,6 +243,13 @@ public List<StationInf> getStationMapAndWorkState(int userId) { return mapper.getStationMapAndWorkState(userId); } //监控层地图信息 public List<StationInf> getStationMapInMonitor(int userId) { //下面各个站点数据 List<StationInf> list = mapper.getSystemAll(userId); return list; } //运维层首页:站点实时数据推送 src/main/java/com/whyc/webSocket/HomeMonitorSocket.java
@@ -94,8 +94,8 @@ Response bPwrRes = pAlmService.getPalmToday(userId); map.put("bPwrRes", bPwrRes); //站点地图 List<StationInf> mapAndWorkStateList = sinfService.getStationMapAndWorkState(userId); map.put("stationMap", mapAndWorkStateList); List<StationInf> mapInMonitor = sinfService.getStationMapInMonitor(userId); map.put("stationMap", mapInMonitor); session.getBasicRemote().sendObject(new Response<>().set(1, map)); } threadFlagMap.put(thread.getId(), false); src/main/resources/mapper/BatttestdataInfMapper.xml
@@ -287,4 +287,20 @@ and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid = #{userId}) </select> <select id="getPlanStaticToday" resultType="java.lang.Integer"> select count(1) from db_batt_testdata.tb_batttestdata_inf where TO_DAYS(test_starttime) = TO_DAYS(NOW()) and BattGroupId in (select distinct db_battinf.tb_battinf.BattGroupId from db_battinf.tb_battinf , db_user.tb_user_battgroup_baojigroup_battgroup , db_user.tb_user_battgroup_baojigroup_usr , db_user.tb_user_inf where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId = db_battinf.tb_battinf.BattGroupId and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id = db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid and db_user.tb_user_inf.uid = #{userId}) </select> </mapper>