Merge branch '20200918' of http://114.135.61.188:53000/ZONIOT/water-iot into 20200918

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/AmountWaterUsedAmountServiceImpl.java

@@ -224,77 +224,6 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                         (defultNum>0?("，审核失败数："+defultNum):""));
             }
         }
-        if(idList.size()>0){
-            List<Integer> types =new ArrayList<>();
-            types.add(2);
-            types.add(3);
-            types.add(7);
-            List<PayControlRule> payControlRules = payFeeMapper.getValveRulesByType(0,types,loginUser.getSiteId(),loginUser.getCustomerId());
-            for(int i=0;2000*i<idList.size();i++){
-                if(2000*i+2000<idList.size()){
-                    List<PayValveStateInfo> PayValveStateInfos = payFeeMapper.getDeviceValveStateByAmount(idList.subList(2000*i,2000*i+2000));
-                    for(PayValveStateInfo payValveStateInfo :PayValveStateInfos){
-
-                        for(PayControlRule payControlRule :payControlRules){
-                            if(payControlRule.getConditionId() == 2 && payValveStateInfo.getDebt() != null && payControlRule.checkCondition(payValveStateInfo.getDebt())){
-                                payValveStateInfo.setControlRuleId(payControlRule.getId().intValue());
-                                payValveStateInfo.setOperation(payControlRule.getAction());
-                                payValveStateInfo.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
-                                payValveStateInfo.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-                                payFeeService.sendValveCommond(payValveStateInfo);
-                                break;
-                            }
-                            if(payControlRule.getConditionId() == 3 && payValveStateInfo.getDebt() != null && payControlRule.checkCondition(payValveStateInfo.getRemaining())){
-                                payValveStateInfo.setControlRuleId(payControlRule.getId().intValue());
-                                payValveStateInfo.setOperation(payControlRule.getAction());
-                                payValveStateInfo.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
-                                payValveStateInfo.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-                                payFeeService.sendValveCommond(payValveStateInfo);
-                                break;
-                            }
-                            if(payControlRule.getConditionId() == 7 && payValveStateInfo.getDebt() != null &&  payControlRule.checkCondition(payValveStateInfo.getRemaining().subtract(payValveStateInfo.getDebt()))){
-                                payValveStateInfo.setControlRuleId(payControlRule.getId().intValue());
-                                payValveStateInfo.setOperation(payControlRule.getAction());
-                                payValveStateInfo.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
-                                payValveStateInfo.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-                                payFeeService.sendValveCommond(payValveStateInfo);
-                                break;
-                            }
-                        }
-                    }
-                }else{
-                    List<PayValveStateInfo> PayValveStateInfos = payFeeMapper.getDeviceValveStateByAmount(idList.subList(2000*i,idList.size()));
-                    for(PayValveStateInfo payValveStateInfo :PayValveStateInfos){
-                        for(PayControlRule payControlRule :payControlRules){
-                            if(payControlRule.getConditionId() == 2 && payValveStateInfo.getDebt() != null && payControlRule.checkCondition(payValveStateInfo.getDebt())){
-                                payValveStateInfo.setControlRuleId(payControlRule.getId().intValue());
-                                payValveStateInfo.setOperation(payControlRule.getAction());
-                                payValveStateInfo.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
-                                payValveStateInfo.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-                                payFeeService.sendValveCommond(payValveStateInfo);
-                                break;
-                            }
-                            if(payControlRule.getConditionId() == 3 && payValveStateInfo.getDebt() != null && payControlRule.checkCondition(payValveStateInfo.getRemaining())){
-                                payValveStateInfo.setControlRuleId(payControlRule.getId().intValue());
-                                payValveStateInfo.setOperation(payControlRule.getAction());
-                                payValveStateInfo.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
-                                payValveStateInfo.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-                                payFeeService.sendValveCommond(payValveStateInfo);
-                                break;
-                            }
-                            if(payControlRule.getConditionId() == 7 && payValveStateInfo.getDebt() != null &&  payControlRule.checkCondition(payValveStateInfo.getRemaining().subtract(payValveStateInfo.getDebt()))){
-                                payValveStateInfo.setControlRuleId(payControlRule.getId().intValue());
-                                payValveStateInfo.setOperation(payControlRule.getAction());
-                                payValveStateInfo.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
-                                payValveStateInfo.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-                                payFeeService.sendValveCommond(payValveStateInfo);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
         return ajaxMessage;
     }
 

smart-city-platform/src/main/resources/mapper/pay/payFeeMapper.xml

@@ -406,7 +406,7 @@
             d.account_id as "accountId"
             ,d.id as "meterId"
             ,d.water_meter_no as "eleno"
-            ,ifnull(d.water_meter_no,d.metercode )as "metercode"
+            ,ifnull(d.water_meter_file_no,d.metercode )as "metercode"
             ,d.control_status as "valveState"
             ,ifnull((select sum(debt) from pay_pay_receivable where debt>0 and account_id=#{accountId}),0) as "debt"
             ,cs.customer_no as "customerNo"
@@ -425,7 +425,7 @@
             d.account_id as "accountId"
             ,d.id as "meterId"
             ,d.water_meter_no as "eleno"
-            ,ifnull(d.water_meter_no,d.metercode )as "metercode"
+            ,ifnull(d.water_meter_file_no,d.metercode )as "metercode"
             ,d.control_status as "valveState"
             ,(select sum(debt) from pay_pay_receivable where debt>0 and account_id=#{accountId}) as "debt"
             ,cs.customer_no as "customerNo"
@@ -468,7 +468,7 @@
             ,c.account_id as "accountId"
             ,d.id as "meterId"
             ,d.water_meter_no as "eleno"
-            ,ifnull(d.water_meter_no,d.metercode )as "metercode"
+            ,ifnull(d.water_meter_file_no,d.metercode )as "metercode"
             ,d.control_status as "valveState"
             ,cs.customer_no as "customerNo"
             ,v.control_state as "operation"