元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
2025-08-19 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java


@@ -17,11 +17,11 @@


import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;


import com.dy.common.util.IDLongGenerator;


import com.dy.common.webUtil.BaseResponse;


import com.dy.common.webUtil.BaseResponseUtils;


import com.dy.common.webUtil.QueryResultVo;


import com.dy.pipIrrGlobal.command.ComSupport;


import com.dy.pipIrrGlobal.command.dto.Param;


import com.dy.pipIrrGlobal.daoIr.IrIntakeOperateMapper;


import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;


import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;


import com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper;


import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;


@@ -40,6 +40,7 @@


import com.dy.pipIrrWechat.command.dto.AutomaticClose;


import com.dy.pipIrrWechat.command.dto.ValveClose;


import com.dy.pipIrrWechat.command.dto.ValveOpen;


import com.dy.pipIrrWechat.irrigation.IrrigationSv;


import com.dy.pipIrrWechat.result.WechatResultCode;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


@@ -72,6 +73,8 @@


    private final RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;


    //private final PrCommonIntakesMapper prCommonIntakesMapper;


    private final IrIntakeOperateMapper irIntakeOperateMapper;


    private final IrrigationSv irrigationSv;


    private final PrIntakeControllerMapper prIntakeControllerMapper;




    @Value("${mw.rtuCallbackUrl_wx}")


    private String rtuCallbackUrl_wx;


@@ -85,7 +88,7 @@


    private String pro_mw = "mw";


    private String key_mw = "comSendUrl";


    @Autowired


    public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper,RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, RmIrrigateProfileMapper rmIrrigateProfileMapper, Environment env, IrIntakeOperateMapper irIntakeOperateMapper) {


    public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper,RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, RmIrrigateProfileMapper rmIrrigateProfileMapper, Environment env, IrIntakeOperateMapper irIntakeOperateMapper, IrrigationSv irrigationSv, PrIntakeControllerMapper prIntakeControllerMapper) {


        this.rmCommandHistoryMapper = rmCommandHistoryMapper;


        this.rmOpenCloseValveLastMapper = rmOpenCloseValveLastMapper;


        //this.prCommonIntakesMapper = prCommonIntakesMapper;


@@ -97,6 +100,8 @@


        this.rmIrrigateProfileMapper = rmIrrigateProfileMapper;


        this.env = env;


        this.irIntakeOperateMapper = irIntakeOperateMapper;


        this.irrigationSv = irrigationSv;


        this.prIntakeControllerMapper = prIntakeControllerMapper;


    }


    /**


     * 虚拟卡ID换虚拟卡对象


@@ -127,6 +132,7 @@


        com.type = "innerCommand";


        comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);


        JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));


        String aa = response.toJSONString();




        JSONArray jsonArray = new JSONArray();


        if(response != null && response.getString("code").equals("0001")) {


@@ -268,8 +274,10 @@


        Long operator = automaticClose.getOperator();


        Byte openType = automaticClose.getOpenType();


        Long comId = new IDLongGenerator().generate();


        String intakeName = Optional.ofNullable(prIntakeControllerMapper.getIntakeNameById(intakeId)).orElse("");




        // 如果是轮灌


        Long operateId = null;


        if(openType != null && openType == 1) {


            IrIntakeOperate irIntakeOperate = new IrIntakeOperate();


            irIntakeOperate.setPlanId(planId);


@@ -279,8 +287,8 @@


            irIntakeOperate.setStartTime(startTime);


            irIntakeOperate.setDuration(duration);




            Long id = addIntakeOperate(irIntakeOperate);


            if(id == null) {


            operateId = addIntakeOperate(irIntakeOperate);


            if(operateId == null) {


                Map map = new HashMap<>();


                map.put("success", false);


                map.put("msg", "添加取水口操作记录失败");


@@ -307,7 +315,7 @@




                Map map = new HashMap<>();


                map.put("success", false);


                map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");


                map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeName + ")");


                map.put("content", null);


                return map;


            }


@@ -320,14 +328,14 @@




            Map map = new HashMap<>();


            map.put("success", false);


            map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeId + ")");


            map.put("msg", WechatResultCode.PLEASE_SELECT_A_VC.getMessage() + "(" + intakeName + ")");


            map.put("content", null);


            return map;


        }


        String vcNum = vc.getVcNum().toString();


        Double moneyRemain = vc.getMoney();


        if(moneyRemain < 100) {


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "虚拟卡余额不足，请充值" + "(" + intakeId + ")");


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "虚拟卡余额不足，请充值" + "(" + intakeName + ")");


            Map map = new HashMap<>();


            map.put("success", false);


            map.put("msg", "虚拟卡余额不足，请充值");


@@ -338,6 +346,7 @@


        // 获取水价


        Double waterPrice = getPrice();


        if(waterPrice == null) {


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_WATER_PRICE.getMessage() + "(" + intakeName + ")");


            Map map = new HashMap<>();


            map.put("success", false);


            map.put("msg", WechatResultCode.NO_WATER_PRICE.getMessage());


@@ -348,7 +357,7 @@


        // 取水口ID换阀控器地址及通讯协议


        JSONObject job_rtu = getRtu(intakeId, null);


        if(job_rtu == null) {


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeId + ")");


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.RTU_NOT_EXIST.getMessage() + "(" + intakeName + ")");




            Map map = new HashMap<>();


            map.put("success", false);


@@ -364,11 +373,22 @@


        // 生成订单号


        String orderNo = generateOrderNo();


        if(orderNo == null) {


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeId + ")");


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, WechatResultCode.NO_ORDER_NUMBER.getMessage() + "(" + intakeName + ")");




            Map map = new HashMap<>();


            map.put("success", false);


            map.put("msg", WechatResultCode.NO_ORDER_NUMBER.getMessage());


            map.put("content", null);


            return map;


        }




        // 判断阀控器是否已经开阀


        Boolean isOpen = irrigationSv.getOpenCloseStatus(rtuAddr);


        if(isOpen) {


            irIntakeOperateMapper.updateByCommandId(comId, (byte)2, intakeName + " 阀门为打开状态");


            Map map = new HashMap<>();


            map.put("success", false);


            map.put("msg", intakeName + " 阀门为打开状态");


            map.put("content", null);


            return map;


        }


@@ -419,8 +439,12 @@


            BaseResponse<Boolean> result = dealWithCommandResult(myParam);


            // 如果命令执行失败，则再次执行命令


            if(!result.isSuccess()) {


                myParam.setComId(new IDLongGenerator().generate());


                Long newComId = new IDLongGenerator().generate();


                myParam.setComId(newComId);


                result = dealWithCommandResult(myParam);




                // 根据operateId修改取水口操作记录中的commandId


                irIntakeOperateMapper.updateCommandId(newComId, operateId);


            }




            Map map = new HashMap<>();