优化diamante

Your Name

2023-08-26 7958f1dddb8a7f4e70d232b07a7703955ecedae0

 service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java

@@ -16,21 +16,19 @@
package com.java110.common.smo.impl;


import com.java110.common.SmartMeter.ISmartMeterFactoryAdapt;
import com.java110.common.smartMeter.ISmartMeterFactoryAdapt;
import com.java110.common.dao.IMeterMachineV1ServiceDao;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.meterMachineFactory.MeterMachineFactoryDto;
import com.java110.dto.storeOrderCart.StoreOrderCartDto;
import com.java110.dto.meter.MeterMachineFactoryDto;
import com.java110.intf.common.IMeterMachineFactoryV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
import com.java110.dto.meterMachine.MeterMachineDto;
import com.java110.po.meterMachine.MeterMachinePo;
import com.java110.dto.meter.MeterMachineDto;
import com.java110.po.meter.MeterMachinePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -55,7 +53,7 @@
@RestController
public class MeterMachineV1InnerServiceSMOImpl extends BaseServiceSMO implements IMeterMachineV1InnerServiceSMO {

   private Logger logger = LoggerFactory.getLogger(MeterMachineV1InnerServiceSMOImpl.class);
    private Logger logger = LoggerFactory.getLogger(MeterMachineV1InnerServiceSMOImpl.class);

    @Autowired
    private IMeterMachineV1ServiceDao meterMachineV1ServiceDaoImpl;
@@ -118,7 +116,7 @@
        }

        // 通知 厂家适配器数据
        ResultVo resultVo = smartMeterFactoryAdapt.requestRecharge(meterMachineDto, meterMachineDto.getRechargeDegree());
        ResultVo resultVo = smartMeterFactoryAdapt.requestRecharge(meterMachineDto, meterMachineDto.getRechargeDegree(),meterMachineDto.getRechargeMoney());
        return resultVo;
    }

@@ -144,7 +142,6 @@
        }

        for (String implBean : maps.keySet()) {

            MeterMachineFactoryDto meterMachineFactoryDto = new MeterMachineFactoryDto();
            meterMachineFactoryDto.setFactoryId(implBean);
            List<MeterMachineFactoryDto> meterMachineFactoryDtos = meterMachineFactoryV1InnerServiceSMOImpl.queryMeterMachineFactorys(meterMachineFactoryDto);
@@ -154,10 +151,10 @@
                continue;
            }
            ResultVo resultVo = smartMeterFactoryAdapt.requestReads(maps.get(implBean));
            logger.debug("抄表返回，{}",resultVo.toString());
            logger.debug("抄表返回，{}", resultVo.toString());
        }

        return new ResultVo(ResultVo.CODE_OK,ResultVo.MSG_OK);
        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
    }

    @Override