最新版本541200007

jiangping

2024-11-19 97a2cd43e3c8137ec896215062efe50bea3c82f5

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -401,11 +401,11 @@
        List<EnergyDataVO> loadCurveList = new ArrayList<>();
        try {
            BaseResponse<List<EnergyTodayLoadDataResponse>>  response = HKService.energyTodayLoadData();
            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
            if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
                for (EnergyTodayLoadDataResponse model :response.getData()) {
                    EnergyDataVO data = new EnergyDataVO();
                    data.setTimeData(model.getName());
                    data.setEnergy(new BigDecimal(model.getName()));
                    data.setEnergy(new BigDecimal(StringUtils.defaultString(model.getValue(),"0")));
                    loadCurveList.add(data);
                }
            }
@@ -473,7 +473,7 @@
        Date month0 = DateUtil.getDateFromString(firstDate);
        Date month1 = DateUtil.increaseMonth(month0,-1);//上月
        Date month2 = DateUtil.increaseMonth(month0,-2);//上上月
        Date month3 = DateUtil.increaseMonth(month0,-12);//去年同月
        Date month3 = DateUtil.increaseMonth(month0,-13);//去年同月

        List<PlatformWaterGas> list =  platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
                .lambda()
@@ -494,10 +494,10 @@
                        data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
                    }
                    if(model.getTimeInfo().getTime() == month2.getTime()){
                        data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
                        data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
                    }
                    if(model.getTimeInfo().getTime() == month3.getTime()){
                        data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
                        data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
                    }

                }else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
@@ -509,10 +509,10 @@
                        data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
                    }
                    if(model.getTimeInfo().getTime() == month2.getTime()){
                        data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
                        data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
                    }
                    if(model.getTimeInfo().getTime() == month3.getTime()){
                        data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
                        data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
                    }
                }
            }
@@ -557,7 +557,7 @@
     * @param data
     */
    private void getLastMonthElectricityData(EnergyModelDataVO data) {
        BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
         BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
           data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
           data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));