src/main/java/com/whyc/mapper/BattInfMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/PowerInfMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/PowerInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/webSocket/ScreenSocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/BattInfMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/PowerInfMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/BattInfMapper.java
@@ -84,4 +84,10 @@ //第三方接口提供 List<BattInfDTO> getBattInf(); int getBattGroupNum(int userId); int getDevNum(int userId); List<Battinf> getBattGroupList(int userId); } src/main/java/com/whyc/mapper/PowerInfMapper.java
@@ -28,6 +28,6 @@ List<PowerInf> getStations(@Param("uId")Long uId,@Param("stationName5")String stationName5); int getNum(int userId); } src/main/java/com/whyc/service/BattInfService.java
@@ -20,10 +20,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.*; import static com.whyc.util.ActionUtil.createFilefolderIFNotExist; @@ -33,6 +30,8 @@ private BattInfMapper battInfMapper; @Resource private Environment environment; @Resource private PowerInfService powerInfService; public int searchMaxBattgroupId_zj() { Integer id = battInfMapper.getMaxBattGroupId_zj(); @@ -528,4 +527,24 @@ battInfMapper.update(null,update); return new Response().setII(1,"修改完成"); } /** * 获取电池,设备,电源,机房站点 计数 * @param userId * @return */ public Response<Map> getDevCountMap(int userId) { Map<String,Integer> map = new HashMap<>(); int battGroupCount = battInfMapper.getBattGroupNum(userId); int devCount = battInfMapper.getDevNum(userId); int powerNum = powerInfService.getNum(userId); map.put("battGroupCount",battGroupCount); map.put("devCount",devCount); map.put("powerNum",powerNum); return new Response<Map>().set(1,map); } public List<Battinf> getBattGroupList(int userId) { return battInfMapper.getBattGroupList(userId); } } src/main/java/com/whyc/service/PowerInfService.java
@@ -125,4 +125,8 @@ //acdcinfMapper.getInfo(powerDeviceId); return new Response().set(1); } public int getNum(int userId) { return mapper.getNum(userId); } } src/main/java/com/whyc/webSocket/ScreenSocket.java
@@ -2,6 +2,7 @@ import com.whyc.config.WebSocketConfig; import com.whyc.dto.Response; import com.whyc.pojo.Battinf; import com.whyc.pojo.UserInf; import com.whyc.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +13,9 @@ import javax.websocket.server.ServerEndpoint; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * 大屏展示 Socket @@ -32,9 +35,27 @@ private static DevalarmDataService devAlarmDataService; private static BattInfService battInfService; @Autowired public void setPowerAlarmService(PwrdevAlarmService powerAlarmService) { ScreenSocket.powerAlarmService = powerAlarmService; } @Autowired public void setBattAlarmDataService(BattalarmDataService battAlarmDataService) { ScreenSocket.battAlarmDataService = battAlarmDataService; } @Autowired public void setFbs9100StateService(Fbs9100StateService fbs9100StateService) { ScreenSocket.fbs9100StateService = fbs9100StateService; } @Autowired public void setDevAlarmDataService(DevalarmDataService devAlarmDataService) { ScreenSocket.devAlarmDataService = devAlarmDataService; } @Autowired public void setBattInfService(BattInfService battInfService) { ScreenSocket.battInfService = battInfService; } @OnOpen @@ -61,12 +82,19 @@ int battAlarmNum = battAlarmDataService.serchRealTime(userId).getCode(); int devAlarmNum = devAlarmDataService.getAlarmNum(userId); int powerAlarmNum = (int) powerAlarmService.getAlarmNum().getData(); //一体 统计:电池品牌统计 //一体 统计:电池统计 分为品牌和标称电压 List<Battinf> battinfList = battInfService.getBattGroupList(userId); Map<String, List<Battinf>> battProducerMap = battinfList.stream().collect(Collectors.groupingBy(Battinf::getBattProducer)); Map<Float, List<Battinf>> battMonVolStdMap = battinfList.stream().collect(Collectors.groupingBy(Battinf::getMonVolStd)); Map<String,Object> battGroupInfoMap = new HashMap<>(); for(String producer : battGroupInfoMap.keySet()){ } //一体 统计:设备状态 Response<Map> res_devStates = fbs9100StateService.getBTSEquipStatus(userId); //一体 统计:各种设备类型总数 电池 设备 电源 站点 TODO 需要添加电源验证下站点的变化逻辑 //一体 统计:各种设备类型总数 电池 设备 电源 站点 Response<Map> res_devCountMap = battInfService.getDevCountMap(userId); //续航检测??? TODO src/main/resources/mapper/BattInfMapper.xml
@@ -496,5 +496,29 @@ from db_battinf.tb_battinf </select> <select id="getBattGroupNum" resultType="java.lang.Integer"> select count(*) from db_battinf.tb_battinf where StationId in(select distinct db_battinf.tb_battinf.StationId 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> <select id="getDevNum" resultType="java.lang.Integer"> select count(distinct fbsDeviceId) from db_battinf.tb_battinf where StationId in(select distinct db_battinf.tb_battinf.StationId 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> <select id="getBattGroupList" resultType="com.whyc.pojo.Battinf"> select battProducer,monVolStd from db_battinf.tb_battinf where StationId in(select distinct db_battinf.tb_battinf.StationId 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> src/main/resources/mapper/PowerInfMapper.xml
@@ -161,8 +161,18 @@ </if> </where> </select> <select id="getNum" resultType="java.lang.Integer"> select count(PowerDeviceId) from db_pwrdev_inf.tb_pwrdev_inf where StationId in ( select distinct inf.StationId from db_pwrdev_inf.tb_pwrdev_inf inf, 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.StationId=inf.StationId 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=#{uId} ) </select> </mapper>