测试

lxw

2023-03-15 5d6834337b696e4eb3b6acfee992c45fd416dccf

测试

 src/main/java/com/whyc/pojo/BattdischargePlan.java

@@ -82,6 +82,9 @@
    private Integer alreadyCount;

    @TableField(exist = false)
    private String stationId;

    @TableField(exist = false)
    private String stationName;

    @TableField(exist = false)

 src/main/java/com/whyc/service/BattalarmDataService.java

@@ -548,16 +548,22 @@
            Map<String, Object> map = new HashMap<>();
            int btatolNum = 0;
            Map<String, Integer> bAlmClearMap = new HashMap<>();
            bAlmClearMap.put("clear0", 0);
            bAlmClearMap.put("clear1", 1);
            List<BattalarmData> bAlmList = mapper.getBalmToday(userId);
            Map<Integer, List<BattalarmData>> bclearedMap = bAlmList.stream().collect(Collectors.groupingBy(BattalarmData::getAlmClearedType));
            for (Integer cleared : bclearedMap.keySet()) {
                bAlmClearMap.put(String.valueOf(cleared), bclearedMap.get(cleared).size());
                bAlmClearMap.put("clear" + String.valueOf(cleared), bclearedMap.get(cleared).size());
                btatolNum += bclearedMap.get(cleared).size();
            }
            Map<String, Integer> bAlmLevelMap = new HashMap<>();
            bAlmLevelMap.put("level1", 0);
            bAlmLevelMap.put("level2", 0);
            bAlmLevelMap.put("level3", 0);
            bAlmLevelMap.put("level4", 0);
            Map<Integer, List<BattalarmData>> blevelMap = bAlmList.stream().collect(Collectors.groupingBy(BattalarmData::getAlmLevel));
            for (Integer level : blevelMap.keySet()) {
                bAlmLevelMap.put(String.valueOf(level), blevelMap.get(level).size());
                bAlmLevelMap.put("level" + String.valueOf(level), blevelMap.get(level).size());
                btatolNum += blevelMap.get(level).size();
            }
            map.put("bAlmClearMap", bAlmClearMap);

 src/main/java/com/whyc/service/BattdischargePlanService.java

@@ -159,16 +159,26 @@
            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("state1", 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(String.valueOf(dischargeState), stateDisMap.get(dischargeState).size());
                stateMap.put(String.valueOf(dischargeState), stateDisMap.get(dischargeState));
                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<>();
            nodeNumMap.put("node0", 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(String.valueOf(node), nodeDisMap.get(node).size());
                nodeMap.put(String.valueOf(node), nodeDisMap.get(node));
                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);
@@ -182,7 +192,6 @@

        return planRes;
    }

    /**
     * 原则:
     * 0.每个站点只取第一组电池参与放电计划

 src/main/java/com/whyc/service/DevalarmDataService.java

@@ -126,16 +126,22 @@
            Map<String, Object> map = new HashMap<>();
            int dtatolNum = 0;
            Map<String, Integer> dAlmClearMap = new HashMap<>();
            dAlmClearMap.put("clear0", 0);
            dAlmClearMap.put("clear1", 1);
            List<DevalarmData> dAlmList = mapper.getDalmToday(userId);
            Map<Integer, List<DevalarmData>> dclearedMap = dAlmList.stream().collect(Collectors.groupingBy(DevalarmData::getAlmClearedType));
            for (Integer cleared : dclearedMap.keySet()) {
                dAlmClearMap.put(String.valueOf(cleared), dclearedMap.get(cleared).size());
                dAlmClearMap.put("clear" + String.valueOf(cleared), dclearedMap.get(cleared).size());
                dtatolNum += dclearedMap.get(cleared).size();
            }
            Map<String, Integer> dAlmLevelMap = new HashMap<>();
            dAlmLevelMap.put("level1", 0);
            dAlmLevelMap.put("level2", 0);
            dAlmLevelMap.put("level3", 0);
            dAlmLevelMap.put("level4", 0);
            Map<Integer, List<DevalarmData>> dlevelMap = dAlmList.stream().collect(Collectors.groupingBy(DevalarmData::getAlmLevel));
            for (Integer level : dlevelMap.keySet()) {
                dAlmLevelMap.put(String.valueOf(level), dlevelMap.get(level).size());
                dAlmLevelMap.put("level" + String.valueOf(level), dlevelMap.get(level).size());
                dtatolNum += dlevelMap.get(level).size();
            }
            map.put("dAlmClearMap", dAlmClearMap);

 src/main/java/com/whyc/service/PwrdevAlarmService.java

@@ -304,16 +304,22 @@
            Map<String, Object> map = new HashMap<>();
            int ptatolNum = 0;
            Map<String, Integer> pAlmClearMap = new HashMap<>();
            pAlmClearMap.put("clear0", 0);
            pAlmClearMap.put("clear1", 1);
            List<PwrdevAlarm> pAlmList = mapper.getPalmToday(userId);
            Map<Integer, List<PwrdevAlarm>> pclearedMap = pAlmList.stream().collect(Collectors.groupingBy(PwrdevAlarm::getAlmClearedType));
            for (Integer cleared : pclearedMap.keySet()) {
                pAlmClearMap.put(String.valueOf(cleared), pclearedMap.get(cleared).size());
                pAlmClearMap.put("clear" + String.valueOf(cleared), pclearedMap.get(cleared).size());
                ptatolNum += pclearedMap.get(cleared).size();
            }
            Map<String, Integer> pAlmLevelMap = new HashMap<>();
            pAlmLevelMap.put("level1", 0);
            pAlmLevelMap.put("level2", 0);
            pAlmLevelMap.put("level3", 0);
            pAlmLevelMap.put("level4", 0);
            Map<Integer, List<PwrdevAlarm>> plevelMap = pAlmList.stream().collect(Collectors.groupingBy(PwrdevAlarm::getAlmLevel));
            for (Integer level : plevelMap.keySet()) {
                pAlmLevelMap.put(String.valueOf(level), plevelMap.get(level).size());
                pAlmLevelMap.put("level" + String.valueOf(level), plevelMap.get(level).size());
                ptatolNum += plevelMap.get(level).size();
            }
            map.put("pAlmClearMap", pAlmClearMap);

 src/main/resources/mapper/BattdischargePlanMapper.xml

@@ -139,7 +139,7 @@
    </insert>

    <select id="getPlanStaticToday" resultType="com.whyc.pojo.BattdischargePlan">
        select tb_battdischarge_plan.*, tb_battinf.StationName, NodeStation
        select tb_battdischarge_plan.*, tb_battinf.StationName, tb_battinf.NodeStation, tb_battinf.stationId
        from web_site.tb_battdischarge_plan,
             db_battinf.tb_battinf
        where tb_battdischarge_plan.battgroupid = db_battinf.tb_battinf.BattGroupId