2024-06-07 朱宝民 开关阀接口回调超时（平台及小程序）改为按执行失败处理

Administrator

2024-06-07 818e68817af88d2616f8b61dd5a428d58af40838

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java

@@ -225,16 +225,23 @@
                // 回调超时
                if(response_CallBack.getContent().toString().equals(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
                    /**
                     * 回调超时，暂时认为执行成功
                     * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
                     * 回调超时，暂时认为执行失败
                     * 命令置为失败
                     * 虚拟卡依旧保持使用中的状态
                     */
                    SeVirtualCard virtualCard = new SeVirtualCard();
                    virtualCard.setId(vcId);
                    virtualCard.setInUse((byte) 1);
                    virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                    virtualCard.setLastOperateTime(new Date());
                    seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
                    return BaseResponseUtils.buildSuccess(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());

                    rmCommandHistory = new RmCommandHistory();
                    rmCommandHistory.setId(comId);
                    rmCommandHistory.setResult((byte)0);
                    commandSv.update(rmCommandHistory);

                    //SeVirtualCard virtualCard = new SeVirtualCard();
                    //virtualCard.setId(vcId);
                    //virtualCard.setInUse((byte) 1);
                    //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                    //virtualCard.setLastOperateTime(new Date());
                    //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
                    return BaseResponseUtils.buildFail(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
                }

                // 回调成功，再判断执行是否成功
@@ -408,17 +415,24 @@
                // 回调超时
                if(response_CallBack.getContent().toString().equals(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
                    /**
                     * 回调超时，暂时认为执行成功
                     * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
                     * 回调超时，暂时认为执行失败
                     * 命令置为失败
                     * 虚拟卡依旧保持使用中的状态
                     */
                    Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
                    SeVirtualCard virtualCard = new SeVirtualCard();
                    virtualCard.setId(vcId);
                    virtualCard.setInUse((byte) 0);
                    virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                    virtualCard.setLastOperateTime(new Date());
                    seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
                    return BaseResponseUtils.buildSuccess(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());

                    rmCommandHistory = new RmCommandHistory();
                    rmCommandHistory.setId(comId);
                    rmCommandHistory.setResult((byte)0);
                    commandSv.update(rmCommandHistory);

                    //Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
                    //SeVirtualCard virtualCard = new SeVirtualCard();
                    //virtualCard.setId(vcId);
                    //virtualCard.setInUse((byte) 0);
                    //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                    //virtualCard.setLastOperateTime(new Date());
                    //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
                    return BaseResponseUtils.buildFail(WechatResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
                }

                // 回调成功，再判断执行是否成功