pipIrr-SV.git - Gitblit

parent: 08947136 | 补丁 | 提交 | ignore whitespace

2024-07-26 朱宝民监测控制模块及小程序模块下定时关阀接口和定量关阀接口

Administrator

2024-07-26 9fd656ba2920feb9ab051b4ef12cdfc649b3136a

2024-07-26 朱宝民 监测控制模块及小程序模块下定时关阀接口和定量关阀接口

4个文件已修改

	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/AutomaticClose.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/AutomaticClose.java

@@ -1,6 +1,5 @@
package com.dy.pipIrrRemote.common.dto;

import jakarta.validation.constraints.NotBlank;
import lombok.Data;

/**
@@ -15,22 +14,9 @@
    public static final long serialVersionUID = 202407231039001L;

    /**
     * 阀控器地址
     * 虚拟卡ID
     */
    @NotBlank(message = "阀控器地址不能为空")
    private String rtuAddr;

    /**
     * 虚拟卡编号
     */
    @NotBlank(message = "虚拟卡编号不能为空")
    private String vcNum;

    /**
     * 订单号
     */
    @NotBlank(message = "订单号不能为空")
    private String orderNo;
    private Long vcId;

    /**
     * 用水时长，拥有定时关阀

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

@@ -326,33 +326,46 @@
        }

        Long intakeId = automaticClose.getIntakeId();
        String rtuAddr = automaticClose.getRtuAddr();
        String vcNum = automaticClose.getVcNum();
        String orderNo = automaticClose.getOrderNo();
        Long vcId = automaticClose.getVcId();
        Integer minutes = automaticClose.getMinutes();
        Long operator = automaticClose.getOperator();

        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        Long comId = idLongGenerator.generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
         * 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡
         * 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡
         */
        if(vcId == null) {
            vcId = commandSv.getVcIdByIntakeId(intakeId);
            if(vcId == null) {
                return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
            }
        }

        // 虚拟卡ID换虚拟卡对象
        VoVirtualCard vc = commandSv.getVcById(vcId);
        if (vc == null) {
        if(vc == null) {
            return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
        }
        String vcNum = vc.getVcNum().toString();
        Double moneyRemain = vc.getMoney();

        // 获取水价
        Double waterPrice = commandSv.getPrice();

        // 阀控器地址换取水口ID和通讯协议
        JSONObject job_rtu = getRtu(null, rtuAddr);
        // 取水口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 orgTag = job_rtu.getString("orgTag");
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        // 生成订单号
        String orderNo = generateOrderNo();

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
@@ -407,34 +420,47 @@
        }

        Long intakeId = automaticClose.getIntakeId();
        String rtuAddr = automaticClose.getRtuAddr();
        String vcNum = automaticClose.getVcNum();
        String orderNo = automaticClose.getOrderNo();
        Long vcId = automaticClose.getVcId();
        Integer waterAmount = automaticClose.getWaterAmount();
        Long operator = automaticClose.getOperator();

        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        Long comId = idLongGenerator.generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
         * 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡
         * 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡
         */
        if(vcId == null) {
            vcId = commandSv.getVcIdByIntakeId(intakeId);
            if(vcId == null) {
                return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
            }
        }

        // 虚拟卡ID换虚拟卡对象
        VoVirtualCard vc = commandSv.getVcById(vcId);
        if (vc == null) {
        if(vc == null) {
            return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
        }
        String vcNum = vc.getVcNum().toString();
        Double moneyRemain = vc.getMoney();

        // 获取水价
        Double waterPrice = commandSv.getPrice();

        // 阀控器地址换取水口ID和通讯协议
        JSONObject job_rtu = getRtu(null, rtuAddr);
        // 取水口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 orgTag = job_rtu.getString("orgTag");
        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

        // 生成订单号
        String orderNo = generateOrderNo();

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
            return BaseResponseUtils.buildSuccess();

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

@@ -326,33 +326,46 @@
        }

        Long intakeId = automaticClose.getIntakeId();
        String rtuAddr = automaticClose.getRtuAddr();
        String vcNum = automaticClose.getVcNum();
        String orderNo = automaticClose.getOrderNo();
        Long vcId = automaticClose.getVcId();
        Integer minutes = automaticClose.getMinutes();
        Long operator = automaticClose.getOperator();

        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        Long comId = idLongGenerator.generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
         * 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡
         * 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡
         */
        if(vcId == null) {
            vcId = commandSv.getVcIdByIntakeId(intakeId);
            if(vcId == null) {
                return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
            }
        }

        // 虚拟卡ID换虚拟卡对象
        VoVirtualCard vc = commandSv.getVcById(vcId);
        if (vc == null) {
        if(vc == null) {
            return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
        }
        String vcNum = vc.getVcNum().toString();
        Double moneyRemain = vc.getMoney();

        // 获取水价
        Double waterPrice = commandSv.getPrice();

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

        // 生成订单号
        String orderNo = generateOrderNo();

        String commandCode = null;
        if(protocol.equals("p206V202404")) {
@@ -407,34 +420,46 @@
        }

        Long intakeId = automaticClose.getIntakeId();
        String rtuAddr = automaticClose.getRtuAddr();
        String vcNum = automaticClose.getVcNum();
        String orderNo = automaticClose.getOrderNo();
        Long vcId = automaticClose.getVcId();
        Integer waterAmount = automaticClose.getWaterAmount();
        Long operator = automaticClose.getOperator();

        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        Long comId = idLongGenerator.generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
         * 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡
         * 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡
         */
        if(vcId == null) {
            vcId = commandSv.getVcIdByIntakeId(intakeId);
            if(vcId == null) {
                return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
            }
        }

        // 虚拟卡ID换虚拟卡对象
        VoVirtualCard vc = commandSv.getVcById(vcId);
        if (vc == null) {
        if(vc == null) {
            return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
        }
        String vcNum = vc.getVcNum().toString();
        Double moneyRemain = vc.getMoney();

        // 获取水价
        Double waterPrice = commandSv.getPrice();

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

        // 生成订单号
        String orderNo = generateOrderNo();
        String commandCode = null;
        if(protocol.equals("p206V202404")) {
            return BaseResponseUtils.buildSuccess();

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

@@ -1,6 +1,5 @@
package com.dy.pipIrrWechat.command.dto;

import jakarta.validation.constraints.NotBlank;
import lombok.Data;

/**
@@ -14,22 +13,9 @@
    public static final long serialVersionUID = 202407231056001L;

    /**
     * 阀控器地址
     * 虚拟卡ID
     */
    @NotBlank(message = "阀控器地址不能为空")
    private String rtuAddr;

    /**
     * 虚拟卡编号
     */
    @NotBlank(message = "虚拟卡编号不能为空")
    private String vcNum;

    /**
     * 订单号
     */
    @NotBlank(message = "订单号不能为空")
    private String orderNo;
    private Long vcId;

    /**
     * 用水时长，拥有定时关阀

			@@ -1,6 +1,5 @@
			package com.dy.pipIrrRemote.common.dto;

			import jakarta.validation.constraints.NotBlank;
			import lombok.Data;

			/**
			@@ -15,22 +14,9 @@
			public static final long serialVersionUID = 202407231039001L;

			/**
			* 阀控器地址
			* 虚拟卡ID
			*/
			@NotBlank(message = "阀控器地址不能为空")
			private String rtuAddr;

			/**
			* 虚拟卡编号
			*/
			@NotBlank(message = "虚拟卡编号不能为空")
			private String vcNum;

			/**
			* 订单号
			*/
			@NotBlank(message = "订单号不能为空")
			private String orderNo;
			private Long vcId;

			/**
			* 用水时长，拥有定时关阀

			@@ -326,33 +326,46 @@
			}

			Long intakeId = automaticClose.getIntakeId();
			String rtuAddr = automaticClose.getRtuAddr();
			String vcNum = automaticClose.getVcNum();
			String orderNo = automaticClose.getOrderNo();
			Long vcId = automaticClose.getVcId();
			Integer minutes = automaticClose.getMinutes();
			Long operator = automaticClose.getOperator();

			Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
			Long comId = idLongGenerator.generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			* 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡
			* 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡
			*/
			if(vcId == null) {
			vcId = commandSv.getVcIdByIntakeId(intakeId);
			if(vcId == null) {
			return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
			}
			}

			// 虚拟卡ID换虚拟卡对象
			VoVirtualCard vc = commandSv.getVcById(vcId);
			if (vc == null) {
			if(vc == null) {
			return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
			}
			String vcNum = vc.getVcNum().toString();
			Double moneyRemain = vc.getMoney();

			// 获取水价
			Double waterPrice = commandSv.getPrice();

			// 阀控器地址换取水口ID和通讯协议
			JSONObject job_rtu = getRtu(null, rtuAddr);
			// 取水口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 orgTag = job_rtu.getString("orgTag");
			comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

			// 生成订单号
			String orderNo = generateOrderNo();

			String commandCode = null;
			if(protocol.equals("p206V202404")) {
			@@ -407,34 +420,47 @@
			}

			Long intakeId = automaticClose.getIntakeId();
			String rtuAddr = automaticClose.getRtuAddr();
			String vcNum = automaticClose.getVcNum();
			String orderNo = automaticClose.getOrderNo();
			Long vcId = automaticClose.getVcId();
			Integer waterAmount = automaticClose.getWaterAmount();
			Long operator = automaticClose.getOperator();

			Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
			Long comId = idLongGenerator.generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			* 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡
			* 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡
			*/
			if(vcId == null) {
			vcId = commandSv.getVcIdByIntakeId(intakeId);
			if(vcId == null) {
			return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
			}
			}

			// 虚拟卡ID换虚拟卡对象
			VoVirtualCard vc = commandSv.getVcById(vcId);
			if (vc == null) {
			if(vc == null) {
			return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
			}
			String vcNum = vc.getVcNum().toString();
			Double moneyRemain = vc.getMoney();

			// 获取水价
			Double waterPrice = commandSv.getPrice();

			// 阀控器地址换取水口ID和通讯协议
			JSONObject job_rtu = getRtu(null, rtuAddr);
			// 取水口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 orgTag = job_rtu.getString("orgTag");
			comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

			// 生成订单号
			String orderNo = generateOrderNo();

			String commandCode = null;
			if(protocol.equals("p206V202404")) {
			return BaseResponseUtils.buildSuccess();

			@@ -1,6 +1,5 @@
			package com.dy.pipIrrWechat.command.dto;

			import jakarta.validation.constraints.NotBlank;
			import lombok.Data;

			/**
			@@ -14,22 +13,9 @@
			public static final long serialVersionUID = 202407231056001L;

			/**
			* 阀控器地址
			* 虚拟卡ID
			*/
			@NotBlank(message = "阀控器地址不能为空")
			private String rtuAddr;

			/**
			* 虚拟卡编号
			*/
			@NotBlank(message = "虚拟卡编号不能为空")
			private String vcNum;

			/**
			* 订单号
			*/
			@NotBlank(message = "订单号不能为空")
			private String orderNo;
			private Long vcId;

			/**
			* 用水时长，拥有定时关阀