元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Administrator
2024-06-06 400af57e240a4c0d74c81ffc8b3417226b51345a 
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java


@@ -17,14 +17,12 @@


import com.dy.pipIrrGlobal.command.ComSupport;


import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;


import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;


import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;


import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;


import com.dy.pipIrrGlobal.voSe.VoVirtualCard;


import com.dy.pipIrrRemote.common.CommandSv;


import com.dy.pipIrrRemote.common.dto.ValveClose;


import com.dy.pipIrrRemote.common.dto.ValveOpen;


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;


@@ -35,7 +33,6 @@


import org.springframework.web.bind.annotation.*;




import java.time.format.DateTimeFormatter;


import java.util.Date;


import java.util.List;


import java.util.Objects;




@@ -58,7 +55,7 @@


    private String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ;




    /**


     * 小程序远程开阀


     * 平台远程开阀


     * @param valve


     * @param bindingResult


     * @return


@@ -155,10 +152,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,12 +174,12 @@


                 * 执行成功


                 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间


                 */


                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();


@@ -223,10 +220,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());


                }


@@ -245,12 +242,12 @@


                 * 执行成功


                 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间


                 */


                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();


@@ -266,7 +263,7 @@


    }




    /**


     * 小程序远程关阀


     * 平台远程关阀


     * @param valve


     * @param bindingResult


     * @return


@@ -330,10 +327,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 +349,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();


@@ -397,10 +394,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());


                }


@@ -419,13 +416,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();