jiangping
2025-01-08 a35b8eec96aac2793de732c3fb7513cd6c5b2e4c
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1627,27 +1627,50 @@
                energyDataVOList.add(data);
            }
        }else{
            String lastYear = null;
            int lastMonths = 0,curMonths =0;
            String curYear =DateUtil.getFomartDate(new Date(),"yyyy");
            for (int i = 0; i < 12; i++) {
                Date tempDate = DateUtil.increaseMonth(lastMonth,i);
                String tt =DateUtil.getFomartDate(tempDate,"yyyy");
                if(!StringUtils.equals(curYear,tt)){
                   lastYear = tt;
                   lastMonths = i+1;//去年的月份数
                }
                EnergyDataVO data = new EnergyDataVO();
                data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
//                data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"月"));
                data.setEnergy(new BigDecimal(0));
                energyDataVOList.add(data);
            }
            //如果是用电数据
            curMonths = 12 - lastMonths;//今年的月份数
            EnergyTrendRequest param = new EnergyTrendRequest();
            param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//年份
            param.setMeterType(1);
            param.setNodeType(2);
            param.setNodeId("root000000");
            param.setPeriodType("year");
            if(lastYear!=null){
                //如果是用电数据
                param.setDate(lastYear);//查询去年年份
                BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
                if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
                    for (int i = 0; i < lastMonths; i++) { //0,11,取值1-12
                        if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>curMonths+i){
                            //取相应的参数值
                            energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[curMonths+i],"0")));
                        }
                    }
                }
            }
            //如果是用电数据
            param.setDate(curYear);//年份
            BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
            if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
                for (int i = 0; i < 12; i++) {
                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
                for (int i = lastMonths; i < 12; i++) { //12 取值 0
                    if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i-lastMonths){
                        //取相应的参数值
                        energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0")));
                        energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i-lastMonths],"0")));
                    }
                }