Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

1 天以前 d730e2a289b38356e28a04b35a0cb2e7b4c6c282

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cdA2/CdCtrl.java

@@ -45,7 +45,7 @@

    private static final String ComCode = "A2" ;

    private static final Double maxRemainMoney = 9999.9999D ;//协议支持的剩余金额最大值
    private static final Double MaxRemainMoney = com.dy.pipIrrRemote.monitor.p202404V201.cd92.CdCtrl.MaxRemainMoney;//协议支持的剩余金额最大值

    @Autowired
    private CdSv sv ;
@@ -83,8 +83,8 @@
                if(vcPo.getMoney() <= 0.0){
                    return BaseResponseUtils.buildErrorMsg("农户该虚拟卡中剩余金额为0，不能再应用其开阀") ;
                }
                if(vcPo.getMoney() >= maxRemainMoney){
                    return BaseResponseUtils.buildErrorMsg("农户该虚拟卡中剩余金额大于协议支持的最大值" + maxRemainMoney + "，不能再应用其开阀") ;
                if(vcPo.getMoney() >= MaxRemainMoney){
                    return BaseResponseUtils.buildErrorMsg("农户该虚拟卡中剩余金额大于协议支持的最大值" + MaxRemainMoney + "，不能再应用其开阀") ;
                }
                Double waterPrice = sv.selectWaterPrice() ;
                if(waterPrice == null){
@@ -122,15 +122,15 @@
                                        sv.addOrUpdateOftenUseIntake(dto.getOperator(), dto.getIntakeId()) ;
                                        //开阀成功，虚拟卡记录上标记已被占用
                                        sv.setVcUsed(vcPo.getId(), dto.getIntakeId());
                                    }
                                    //记录开阀命令，以备远程关阀
                                    RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
                                    if(comOpen == null){
                                        RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                        sv.saveCommandOpen(po);
                                    }else{
                                        setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                        sv.updateCommandOpen(comOpen);
                                        //记录开阀命令，以备远程关阀
                                        RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
                                        if(comOpen == null){
                                            RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                            sv.saveCommandOpen(po);
                                        }else{
                                            setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                            sv.updateCommandOpen(comOpen);
                                        }
                                    }
                                }
                                @Override