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

Administrator

2024-06-06 70cd3733e8d72a6bbcfcbfa78f8eecbdec7ee8f9

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java

@@ -23,8 +23,8 @@
import com.dy.pipIrrRemote.common.CommandSv;
import com.dy.pipIrrRemote.common.dto.ValveClose;
import com.dy.pipIrrRemote.common.dto.ValveOpen;
import com.dy.pipIrrRemote.common.enums.LastOperateENUM;
import com.dy.pipIrrRemote.result.RemoteResultCode;
import com.dy.pipIrrSell.virtualCard.enums.LastOperateENUM;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -58,7 +58,7 @@
    private String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ;

    /**
     * 小程序远程开阀
     * 平台远程开阀
     * @param valve
     * @param bindingResult
     * @return
@@ -93,8 +93,6 @@
        if(!setuped) {
            setUp();
        }
// 取水口ID换取水口对象
// 如果取水口为打开状态，则不允许被开阀

        // 虚拟卡ID换虚拟卡对象
        VoVirtualCard vc = commandSv.getVcById(vcId);
@@ -155,10 +153,10 @@
                // 回调失败
                if(!response_CallBack.getCode().equals("0001")) {
                    // 命令日志执行结果改为失败
                    rmCommandHistory = new RmCommandHistory();
                    rmCommandHistory.setId(comId);
                    rmCommandHistory.setResult((byte)0);
                    commandSv.updateCommandResult(rmCommandHistory);
                    //rmCommandHistory = new RmCommandHistory();
                    //rmCommandHistory.setId(comId);
                    //rmCommandHistory.setResult((byte)0);
                    //commandSv.updateCommandResult(rmCommandHistory);
                    return BaseResponseUtils.buildFail(response_CallBack.getMsg());
                    //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
                }
@@ -177,16 +175,23 @@
                 * 执行成功
                 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
                 */
                SeVirtualCard virtualCard = new SeVirtualCard();
                virtualCard.setId(vcId);
                virtualCard.setInUse((byte) 1);
                virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                virtualCard.setLastOperateTime(new Date());
                seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
                //SeVirtualCard virtualCard = new SeVirtualCard();
                //virtualCard.setId(vcId);
                //virtualCard.setInUse((byte) 1);
                //virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
                //virtualCard.setLastOperateTime(new Date());
                //seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);

                // 回调返回的内容
                Data myData = (Data)response_CallBack.getContent();
                return BaseResponseUtils.buildSuccess(myData) ;
                //Data myData = (Data)response_CallBack.getContent();
                //return BaseResponseUtils.buildSuccess(myData);

                JSONObject job_response = new JSONObject();
                job_response.put("rtuAddr", rtuAddr);
                job_response.put("vcNum", vc.getVcNum());
                job_response.put("orderNo", orderNo);
                //job_response.put("operator", operator);
                return BaseResponseUtils.buildSuccess(job_response);
            } else {
                // 请求失败
                JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
@@ -220,15 +225,29 @@
                // 处理回调
                BaseResponse response_CallBack = dealWithCallBack(comId);

                //回调失败
                //回调异常
                if(!response_CallBack.getCode().equals("0001")) {
                    // 命令日志执行结果改为失败
                    rmCommandHistory = new RmCommandHistory();
                    rmCommandHistory.setId(comId);
                    rmCommandHistory.setResult((byte)0);
                    commandSv.updateCommandResult(rmCommandHistory);
                    return BaseResponseUtils.buildFail(response_CallBack.getMsg());
                    //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
                    return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
                }

                // 回调超时
                if(response_CallBack.getContent().toString().equals(RemoteResultCode.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(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
                }

                // 回调成功，再判断执行是否成功
@@ -253,8 +272,16 @@
                seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);

                // 回调返回的内容
                Data myData = (Data)response_CallBack.getContent();
                return BaseResponseUtils.buildSuccess(myData) ;
                //Data myData = (Data)response_CallBack.getContent();
                //return BaseResponseUtils.buildSuccess(myData) ;

                JSONObject job_response = new JSONObject();
                job_response.put("rtuAddr", rtuAddr);
                job_response.put("vcNum", vc.getVcNum());
                job_response.put("orderNo", orderNo);
                //job_response.put("operator", operator);
                return BaseResponseUtils.buildSuccess(job_response);

            } else {
                // 请求失败
                JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
@@ -266,7 +293,7 @@
    }

    /**
     * 小程序远程关阀
     * 平台远程关阀
     * @param valve
     * @param bindingResult
     * @return
@@ -330,10 +357,10 @@
                // 回调失败
                if(!response_CallBack.getCode().equals("0001")) {
                    // 命令日志执行结果改为失败
                    rmCommandHistory = new RmCommandHistory();
                    rmCommandHistory.setId(comId);
                    rmCommandHistory.setResult((byte)0);
                    commandSv.updateCommandResult(rmCommandHistory);
                    //rmCommandHistory = new RmCommandHistory();
                    //rmCommandHistory.setId(comId);
                    //rmCommandHistory.setResult((byte)0);
                    //commandSv.updateCommandResult(rmCommandHistory);
                    return BaseResponseUtils.buildFail(response_CallBack.getMsg());
                    //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage());
                }
@@ -352,13 +379,13 @@
                 * 执行成功
                 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
                 */
                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);
                //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);

                // 回调返回的内容
                Data myData = (Data)response_CallBack.getContent();
@@ -394,15 +421,30 @@
                // 处理回调
                BaseResponse response_CallBack = dealWithCallBack(comId);

                // 回调失败
                // 回调异常
                if(!response_CallBack.getCode().equals("0001")) {
                    // 命令日志执行结果改为失败
                    rmCommandHistory = new RmCommandHistory();
                    rmCommandHistory.setId(comId);
                    rmCommandHistory.setResult((byte)0);
                    commandSv.updateCommandResult(rmCommandHistory);
                    return BaseResponseUtils.buildFail(response_CallBack.getMsg());
                    //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage());
                    return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
                }

                // 回调超时
                if(response_CallBack.getContent().toString().equals(RemoteResultCode.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(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
                }

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