蓄电池组1.2.5，1.2.6右侧图标整合

whyclxw

2025-06-12 fad53343c7e7939f652227ebaf9299f84b753d4f

蓄电池组1.2.5，1.2.6右侧图标整合

 src/main/java/com/whyc/controller/StatisticController.java

@@ -74,19 +74,12 @@
        stic.setUid(uinf.getId());
        return battTinfService.getDischr5Statistic(stic);
    }
    @ApiOperation(value = "本年度已放电数量统计右侧图表(1.2.5)")
    @ApiOperation(value = "本年度已放电数量统计右侧图表(1.2.5/6)")
    @PostMapping("getDischr5Chart")
    public Response getDischr5Chart(){
        User uinf= ActionUtil.getUser();
        return battTinfService.getDischr5Chart(uinf.getId());
    }
    @ApiOperation(value = "本年度未放电数量统计右侧图表(1.2.6)")
    @PostMapping("getDischr6Chart")
    public Response getDischr6Chart(){
        User uinf= ActionUtil.getUser();
        return battTinfService.getDischr6Chart(uinf.getId());
    }

    @ApiOperation(value = "本年度未放电数量统计(1.2.6)")
    @PostMapping("getDischr6Statistic")
    public Response getDischr6Statistic(@RequestBody DisChargeStic stic){

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

@@ -809,39 +809,6 @@
        PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
        return new Response().setII(1,reslist.size()>0,pageInfo,"本年度未放电数量统计");
    }
    //本年度未放电数量统计右侧图表(1.2.6)
    public Response getDischr6Chart(Integer uid) {
        Map<String,  Object> map=new HashMap<>();
        //查询出所有的班组并赋予初始值
        setBanZuDefault(map);
        //1查询符合条件的电池组
        List<BattInf> binfList=battInfService.getDischrChart(uid);
        if(binfList==null||binfList.size()==0){
            return new Response().set(1,false,"当前用户未管理满足条件的电池组");
        }
        for (BattInf binf:binfList) {
            //查询电池组所在的班组
            String  groupName=bjService.getGroupName(binf.getPowerId());
            //2.获取电池组在给定时间段的放电记录(指定时间段的标准核容放电)
            BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),null,null);
            if(tinf==null){
                if(!groupName.equals("none")){
                    BanZu bz= (BanZu) map.get(groupName);
                    int nochargeNum=bz.getNochargeNum();
                    bz.setNochargeNum(nochargeNum+1);
                    map.put(groupName,bz);
                }
                continue;
            }
            if(!groupName.equals("none")){
                BanZu bz= (BanZu) map.get(groupName);
                int dischargeNum=bz.getDischargeNum();
                bz.setDischargeNum(dischargeNum+1);
                map.put(groupName,bz);
            }
        }
        return new Response().setII(1,true,map,"本年度已放电数量统计右侧图表(1.2.5)");
    }
    //2.获取电池组未放电记录(指定时间段的标准核容放电)
    private void getNoDischargeData(Integer battgroupId, Date testStartTime, Date testEndTime, List<Integer> typeList, SticDischarge6Res res) {
        List<BatttestdataInf> tinfList=mapper.getNoDischargeData(battgroupId,testStartTime,testEndTime,typeList);