未关阀记录视图补充字段

zhubaomin

2024-11-12 ca965778987c8f2e79831c57073035f29a851a01

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

@@ -2,9 +2,12 @@

import com.alibaba.fastjson2.JSONObject;
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
import com.dy.common.mw.protocol.p206V1.CodeV1;
import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.common.mw.protocol.p206V1.downVos.*;
import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd15Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;
@@ -19,10 +22,7 @@
import com.dy.pipIrrGlobal.voRm.VoIrrigaterProfile;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import com.dy.pipIrrWechat.command.dto.AutomaticClose;
import com.dy.pipIrrWechat.command.dto.Recharge;
import com.dy.pipIrrWechat.command.dto.ValveClose;
import com.dy.pipIrrWechat.command.dto.ValveOpen;
import com.dy.pipIrrWechat.command.dto.*;
import com.dy.pipIrrWechat.result.WechatResultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -159,7 +159,7 @@
        }

        String commandCode = null;
        if (protocol.equals("p206V202404")) {
        if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            // 获取功能码
            commandCode = CodeV202404.cd_A2;

@@ -193,9 +193,9 @@
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);

        } else if (protocol.equals("p206V1_0_1")) {
        } else if (protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_97;
            commandCode = CodeV1.cd_97;

            // 创建视图
            Com97Vo param = new Com97Vo();
@@ -213,7 +213,7 @@
            myParam.setComId(comId);
            myParam.setComType((byte)1);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setCommandName(CodeV1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
@@ -263,7 +263,7 @@
        comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);

        String commandCode = null;
        if (protocol.equals("p206V202404")) {
        if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            // 获取功能码
            commandCode = CodeV202404.cd_A3;

@@ -292,9 +292,9 @@
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if (protocol.equals("p206V1_0_1")) {
        } else if (protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_98;
            commandCode = CodeV1.cd_98;

            // 创建视图
            Com98Vo param = new Com98Vo();
@@ -310,7 +310,7 @@
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setCommandName(CodeV1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
@@ -390,11 +390,11 @@
        }

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
        if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            return BaseResponseUtils.buildSuccess();
        } else if(protocol.equals("p206V1_0_1")) {
        } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_99;
            commandCode = CodeV1.cd_99;

            // 创建视图
            Com99Vo param = new Com99Vo();
@@ -411,9 +411,9 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setComType((byte)1);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setCommandName(CodeV1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
@@ -493,11 +493,11 @@
        }

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
        if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            return BaseResponseUtils.buildSuccess();
        } else if(protocol.equals("p206V1_0_1")) {
        } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_A0;
            commandCode = CodeV1.cd_A0;

            // 创建视图
            ComA0Vo param = new ComA0Vo();
@@ -514,9 +514,9 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setComType((byte)1);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setCommandName(CodeV1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
@@ -603,11 +603,11 @@
        }

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
        if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            return BaseResponseUtils.buildSuccess();
        } else if(protocol.equals("p206V1_0_1")) {
        } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_A1;
            commandCode = CodeV1.cd_A1;

            // 创建视图
            ComA1Vo param = new ComA1Vo();
@@ -629,9 +629,9 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setComType((byte)1);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setCommandName(CodeV1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
@@ -718,11 +718,11 @@
        }

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
        if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            return BaseResponseUtils.buildSuccess();
        } else if(protocol.equals("p206V1_0_1")) {
        } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_A2;
            commandCode = CodeV1.cd_A2;

            // 创建视图
            ComA2Vo param = new ComA2Vo();
@@ -744,9 +744,9 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setComType((byte)1);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setCommandName(CodeV1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
@@ -775,6 +775,22 @@
            log.error("获取未关阀记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 强制隐藏未关阀记录：为指定（阀控器地址、水卡编号、无关阀记录）开关阀最新记录添加关阀时间，使之不在未关阀记录中显示
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "deleteUnclosed", consumes = MediaType.APPLICATION_JSON_VALUE)
    public BaseResponse<Boolean> deleteUnclosed(@RequestBody @Valid deleteUnclosedParam po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        commandSv.addClostTime(po.getRtuAddr(), po.getVcNum());
        return BaseResponseUtils.buildSuccess();
    }

    /**
@@ -815,7 +831,7 @@
        String icCardNo = seClientCard.getCardnum();

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
        if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
            // 获取功能码
            commandCode = CodeV202404.cd_15;

@@ -845,7 +861,7 @@
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
        } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
            return BaseResponseUtils.buildErrorMsg(WechatResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");