优化代码

service-job/src/main/java/com/java110/job/adapt/payment/smartMeter/SmartMeterAdapt.java

@@ -6,21 +6,27 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.fee.FeeAttrDto;
+import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.log.LogSystemErrorDto;
 import com.java110.dto.meter.MeterMachineDto;
 import com.java110.dto.system.Business;
 import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
+import com.java110.job.adapt.hcIotNew.http.ISendIot;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.po.log.LogSystemErrorPo;
 import com.java110.service.smo.ISaveSystemErrorSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.ExceptionUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -47,6 +53,12 @@ public class SmartMeterAdapt extends DatabusAdaptImpl {
     @Autowired
     private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
 
+    @Autowired
+    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
+    @Autowired
+    private ISendIot sendIotImpl;
+
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
 
@@ -100,28 +112,37 @@ public class SmartMeterAdapt extends DatabusAdaptImpl {
 
             Assert.listOnlyOne(feeDtos, "未查询到费用信息");
 
-            feeDto = feeDtos.get(0);
+            // todo 水费 电费 煤气费 才能送
+            if (!FeeConfigDto.FEE_TYPE_CD_METER.equals(feeDtos.get(0).getFeeTypeCd())
+                    && !FeeConfigDto.FEE_TYPE_CD_WATER.equals(feeDtos.get(0).getFeeTypeCd())
+                    && !FeeConfigDto.FEE_TYPE_CD_GAS.equals(feeDtos.get(0).getFeeTypeCd())
+            ) {
+                return;
+            }
 
+            //todo 公式必须要用量乘以单机
 
-            //判断是否有智能水电表
-            MeterMachineDto meterMachineDto = new MeterMachineDto();
-            meterMachineDto.setFeeConfigId(feeDto.getConfigId());
-            meterMachineDto.setRoomId(feeDto.getPayerObjId());
-            meterMachineDto.setCommunityId(payFeeDetailPo.getCommunityId());
-            List<MeterMachineDto> meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
+            FeeConfigDto feeConfigDto = new FeeConfigDto();
+            feeConfigDto.setConfigId(feeDtos.get(0).getConfigId());
+            feeConfigDto.setComputingFormula("6006");
+            List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
 
-            //没有智能电表
-            if (meterMachineDtos == null || meterMachineDtos.size() < 1) {
+            if (ListUtil.isNull(feeConfigDtos)) {
                 return;
             }
 
-            String degree = FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_PROXY_CONSUMPTION);
 
-            meterMachineDtos.get(0).setRechargeDegree(Double.parseDouble(degree));
-            meterMachineDtos.get(0).setRechargeMoney(Double.parseDouble(payFeeDetailPo.getReceivableAmount()));
+            JSONObject reqJson = new JSONObject();
+            reqJson.put("roomId", feeDtos.get(0).getPayerObjId());
+            reqJson.put("communityId", feeDtos.get(0).getCommunityId());
+            reqJson.put("iotApiCode", "preStoreMeterBmoImpl");
+
+            ResultVo resultVo = sendIotImpl.post("/iot/api/common.openCommonApi", reqJson);
+
+            if (resultVo.getCode() != ResultVo.CODE_OK) {
+                throw new CmdException(resultVo.getMsg());
+            }
 
-            //智能电表充值
-            meterMachineV1InnerServiceSMOImpl.reChargeMeterMachines(meterMachineDtos.get(0));
 
         } catch (Exception e) {
             LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();