优化代码

wuzeyu

2024-10-22 a38953d69f59226d7451d138b7436bbb2c290628

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java

@@ -2,22 +2,27 @@

import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
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.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.downVos.*;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrRemote.common.CommandSv;
import com.dy.pipIrrRemote.common.dto.*;
import com.dy.pipIrrRemote.common.dto.Alarm;
import com.dy.pipIrrRemote.common.dto.CollectPeriod;
import com.dy.pipIrrRemote.common.dto.CommandGet;
import com.dy.pipIrrRemote.common.dto.Domain;
import com.dy.pipIrrRemote.result.RemoteResultCode;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -27,7 +32,6 @@
import org.springframework.web.bind.annotation.RestController;

import java.util.Objects;
import java.util.Optional;

/**
 * @author ZhuBaoMin
@@ -39,7 +43,7 @@
@Slf4j
@RestController
@RequestMapping(path="rtu")
@RequiredArgsConstructor
//@RequiredArgsConstructor
public class RtuCtrl extends ComSupport {
    private final CommandSv commandSv;
    private final IDLongGenerator idLongGenerator;
@@ -48,20 +52,38 @@
    private String rtuCallbackUrl_rm;

    /**
     * 通用处理接口
     * 97   清除用水记录
     * 98   清除充值记录
     * 99   清除日记录
     * 9A   清除年用水量
     * 50   查询终端地址
     * @param po
     * @param bindingResult
     * @return
     * pro_mw：属性
     * tag从控制器中获取
     * key_mw：url的key
     */
    @PostMapping(path = "common_deal", consumes = MediaType.APPLICATION_JSON_VALUE)
    private Environment env = null;
    private String pro_mw = "mw";
    private String key_mw = "comSendUrl";

    @Autowired
    public RtuCtrl(CommandSv commandSv, IDLongGenerator idLongGenerator, Environment env) {
        this.commandSv = commandSv;
        this.idLongGenerator = idLongGenerator;
        this.env = env;
    }

    /**
     * 通用查询接口
     * p206V1_0_1
     *   66     查询IP和端口
     *   67     查询流量采集周期
     *   68     查询用户余额报警值
     *   69     查询电池电压报警值
     *   6A     查询阀门堵转电流值
     *   6B     查询阀门超时时间
     * @param po    查询传入对象
     * @param bindingResult
     * @return 查询结果
     */
    @PostMapping(path = "common_get", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> commonDeal(@RequestBody @Valid CommandDeal po, BindingResult bindingResult) {
    public BaseResponse<Boolean> commonGet(@RequestBody @Valid CommandGet po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
@@ -70,11 +92,6 @@
        Long operator = po.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
        if(job_rtu == null) {
@@ -82,6 +99,9 @@
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");
        //String orgTag = job_rtu.getString("orgTag");
        String orgTag = DataSourceContext.get();
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        // 获取功能码
        String commandCode = po.getCommandCode();
@@ -109,55 +129,8 @@
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }

    /**
     * 设置设备终端地址
     * @param addr 设置设备终端地址传入对象
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "set_addr", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> setAddr(@RequestBody @Valid Addr addr, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Long intakeId = addr.getIntakeId();
        String newRtuAddr = addr.getNewRtuAddr();
        Long operator = addr.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
        if(job_rtu == null) {
            return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");

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

            // 创建视图
            ComCd10Vo param = new ComCd10Vo() ;
            param.controllerType = controllerType;
            param.projectNo = projectNo;
            param.rtuNewAddr = newRtuAddr;
            ComXyVo param = new ComXyVo();
            param.setCommandCode(commandCode);

            /**
             * 构造命令、发送命令并处理请求结果及执行结果
@@ -166,51 +139,39 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
            //myParam.setVcId(vcId);
            myParam.setParam(param);
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_10;

            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }

    /**
     * 设置设备终端剩余水量和剩余金额报警值
     * 设置流量采集周期
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "set_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
    @PostMapping(path = "set_collect_period", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> setAlarm(@RequestBody @Valid Alarm po, BindingResult bindingResult) {
    public BaseResponse<Boolean> setCollectPeriod(@RequestBody @Valid CollectPeriod po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Long intakeId = po.getIntakeId();
        Integer waterAlarm = Optional.ofNullable(po.getWaterAlarm()).orElse(0);
        Integer moneyAlarm = Optional.ofNullable(po.getMoneyAlarm()).orElse(0);
        Long operator = po.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
@@ -219,18 +180,18 @@
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");
        //String orgTag = job_rtu.getString("orgTag");
        String orgTag = DataSourceContext.get();
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        String commandCode = null;
        // 获取功能码
        String commandCode = po.getCommandCode();
        if(protocol.equals("p206V202404")) {
            // 获取功能码
            commandCode = CodeV202404.cd_16;

            return BaseResponseUtils.buildSuccess("");
        } else if(protocol.equals("p206V1_0_1")) {
            // 创建视图
            ComCd16Vo param = new ComCd16Vo();
            param.controllerType = controllerType;
            param.projectNo = projectNo;
            param.waterAlarm = waterAlarm;
            param.moneyAlarm = moneyAlarm;
            Com37Vo param = new Com37Vo();
            param.setSeconds(po.getSeconds());

            /**
             * 构造命令、发送命令并处理请求结果及执行结果
@@ -239,51 +200,39 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
            //myParam.setVcId(vcId);
            myParam.setParam(param);
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_10;

            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }

    /**
     * 设置机井年最大开采量和水位下限
     * 设置服务端IP和端口
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "set_well", consumes = MediaType.APPLICATION_JSON_VALUE)
    @PostMapping(path = "set_ip_port", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> setWell(@RequestBody @Valid DrivenWell po, BindingResult bindingResult) {
    public BaseResponse<Boolean> setIpPort(@RequestBody @Valid Domain po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Long intakeId = po.getIntakeId();
        Integer maxAmountYear = Optional.ofNullable(po.getMaxAmountYear()).orElse(0);
        Double limitLevel = Optional.ofNullable(po.getLimitLevel()).orElse(0.0);
        Long operator = po.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
@@ -292,18 +241,19 @@
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");
        //String orgTag = job_rtu.getString("orgTag");
        String orgTag = DataSourceContext.get();
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        String commandCode = null;
        // 获取功能码
        String commandCode = po.getCommandCode();
        if(protocol.equals("p206V202404")) {
            // 获取功能码
            commandCode = CodeV202404.cd_22;

            return BaseResponseUtils.buildSuccess("");
        } else if(protocol.equals("p206V1_0_1")) {
            // 创建视图
            ComCd22Vo param = new ComCd22Vo();
            param.controllerType = controllerType;
            param.projectNo = projectNo;
            param.maxAmountYear = maxAmountYear;
            param.limitLevel = limitLevel;
            Com21Vo param = new Com21Vo();
            param.setIp(po.getIp());
            param.setPort(po.getPort());

            /**
             * 构造命令、发送命令并处理请求结果及执行结果
@@ -312,50 +262,39 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
            //myParam.setVcId(vcId);
            myParam.setParam(param);
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_10;

            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }

    /**
     * 设置设备终端年用水量
     * 设置用户余额报警值
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "set_max_amount", consumes = MediaType.APPLICATION_JSON_VALUE)
    @PostMapping(path = "set_remain_money_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> setMaxAmount(@RequestBody @Valid WaterConsumption po, BindingResult bindingResult) {
    public BaseResponse<Boolean> setRemainMoneyAlarm(@RequestBody @Valid Alarm po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Long intakeId = po.getIntakeId();
        Integer maxAmountYear = Optional.ofNullable(po.getMaxAmountYear()).orElse(0);
        Long operator = po.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
@@ -364,17 +303,18 @@
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");
        //String orgTag = job_rtu.getString("orgTag");
        String orgTag = DataSourceContext.get();
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        String commandCode = null;
        // 获取功能码
        String commandCode = po.getCommandCode();
        if(protocol.equals("p206V202404")) {
            // 获取功能码
            commandCode = CodeV202404.cd_26;

            return BaseResponseUtils.buildSuccess("");
        } else if(protocol.equals("p206V1_0_1")) {
            // 创建视图
            ComCd26Vo param = new ComCd26Vo();
            param.controllerType = controllerType;
            param.projectNo = projectNo;
            param.maxAmountYear = maxAmountYear;
            Com38Vo param = new Com38Vo();
            param.setRemainMoneyAlarm(po.getRemainMoneyAlarm());

            /**
             * 构造命令、发送命令并处理请求结果及执行结果
@@ -383,52 +323,39 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
            //myParam.setVcId(vcId);
            myParam.setParam(param);
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_10;

            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }

    /**
     * 设置设备终端IP地址
     * 设置电池电压报警值
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "set_ip", consumes = MediaType.APPLICATION_JSON_VALUE)
    @PostMapping(path = "set_battery_volt_alarm", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> setIp(@RequestBody @Valid Domain po, BindingResult bindingResult) {
    public BaseResponse<Boolean> setBatteryVoltAlarm(@RequestBody @Valid Alarm po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Long intakeId = po.getIntakeId();
        Integer channel = po.getChannel();
        String ip = po.getIp();
        Integer port = po.getPort();
        Long operator = po.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
@@ -437,19 +364,18 @@
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");
        //String orgTag = job_rtu.getString("orgTag");
        String orgTag = DataSourceContext.get();
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        String commandCode = null;
        // 获取功能码
        String commandCode = po.getCommandCode();
        if(protocol.equals("p206V202404")) {
            // 获取功能码
            commandCode = CodeV202404.cd_21;

            return BaseResponseUtils.buildSuccess("");
        } else if(protocol.equals("p206V1_0_1")) {
            // 创建视图
            ComCd21Vo param = new ComCd21Vo();
            param.controllerType = controllerType;
            param.projectNo = projectNo;
            param.channel = channel;
            param.ip = ip;
            param.port = port;
            Com39Vo param = new Com39Vo();
            param.setBatteryVoltAlarm(po.getBatteryVoltAlarm());

            /**
             * 构造命令、发送命令并处理请求结果及执行结果
@@ -458,99 +384,20 @@
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setComType((byte)2);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
            myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
            //myParam.setVcId(vcId);
            myParam.setParam(param);
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_10;

            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }

    /**
     * 设置设备终端域名
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "set_domain", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> setDomain(@RequestBody @Valid Domain po, BindingResult bindingResult) {
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Long intakeId = po.getIntakeId();
        Integer channel = po.getChannel();
        String domain = po.getDomain();
        Integer port = po.getPort();
        Long operator = po.getOperator();
        Long comId = idLongGenerator.generate();

        // 获取系统参数
        if(!setuped) {
            setUp();
        }

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
        if(job_rtu == null) {
            return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
        }
        String rtuAddr = job_rtu.getString("rtuAddr");
        String protocol = job_rtu.getString("protocol");

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

            // 创建视图
            ComCd23Vo param = new ComCd23Vo();
            param.controllerType = controllerType;
            param.projectNo = projectNo;
            param.channel = channel;
            param.domain = domain;
            param.port = port;

            /**
             * 构造命令、发送命令并处理请求结果及执行结果
             * 1 准备参数
             * 2 调用公共方法
             */
            Param myParam = new Param();
            myParam.setComId(comId);
            myParam.setCommandCode(commandCode);
            myParam.setCommandName(CodeV202404.getCodeName(commandCode));
            myParam.setIntakeId(intakeId);
            myParam.setRtuAddr(rtuAddr);
            myParam.setProtocol(protocol);
            myParam.setParam(param);
            myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
            myParam.setOperator(operator);
            return dealWithCommandResult(myParam);
        } else if(protocol.equals("p206V1_0_1")) {
            // 获取功能码
            commandCode = CodeV1_0_1.cd_10;

            // 创建视图
            Com97Vo param = new Com97Vo() ;
            return BaseResponseUtils.buildSuccess("");
        } else {
            return BaseResponseUtils.buildFail("系统暂不支持该协议");
        }
    }
}