pipIrr-SV.git - Gitblit

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

zhubaomin

2024-11-12 a40757e9ca952fad9f0838a17276bf8f71f14496

代码优化

2个文件已修改

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

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

@@ -60,7 +60,6 @@
public class ValveCtrl extends ComSupport {
    private final CommandSv commandSv;
    private final SeVirtualCardMapper seVirtualCardMapper;
    private final IDLongGenerator idLongGenerator;

    @Value("${mw.rtuCallbackUrl_rm}")
    private String rtuCallbackUrl_rm;
@@ -75,10 +74,9 @@
    private String key_mw = "comSendUrl";

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

@@ -100,7 +98,7 @@
        Long intakeId = valve.getIntakeId();
        Long vcId = valve.getVcId();
        Long operator = valve.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 获取水价
        Double waterPrice = commandSv.getPrice();
@@ -238,7 +236,7 @@
        String vcNum = voUnclosedParam.getVcNum();
        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        String orderNo = voUnclosedParam.getOrderNo();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 阀控器地址换取水口ID和通讯协议
        JSONObject job_rtu = getRtu(null, rtuAddr);
@@ -328,7 +326,7 @@
        Long intakeId = valve.getIntakeId();
        Long vcId = valve.getVcId();
        Long operator = valve.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
@@ -479,7 +477,7 @@
        String vcNum = voUnclosedParam.getVcNum();
        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        String orderNo = voUnclosedParam.getOrderNo();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 阀控器地址换取水口ID和通讯协议
        JSONObject job_rtu = getRtu(null, rtuAddr);
@@ -574,7 +572,7 @@
        Long vcId = automaticClose.getVcId();
        Integer minutes = automaticClose.getMinutes();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
@@ -678,7 +676,7 @@
        Long vcId = automaticClose.getVcId();
        Integer waterAmount = automaticClose.getWaterAmount();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
@@ -783,7 +781,7 @@
        Date plannedOpenTime = automaticClose.getPlannedOpenTime();
        Integer minutes = automaticClose.getMinutes();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
        Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -899,7 +897,7 @@
        Date plannedOpenTime = automaticClose.getPlannedOpenTime();
        Integer waterAmount = automaticClose.getWaterAmount();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
        Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -1051,7 +1049,7 @@
        Double chargeWater = po.getChargeWater();
        Long operator = po.getOperator();
        String flowNo = RandomStringUtils.randomNumeric(12); // 生成12位随机数
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);
@@ -1124,7 +1122,7 @@
        Long intakeId = card.getIntakeId();
        String cardAddr = card.getCardAddr();
        Long operator = card.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);

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

@@ -55,7 +55,6 @@
public class ValveCtrl extends ComSupport {
    private final CommandSv commandSv;
    private final SeVirtualCardMapper seVirtualCardMapper;
    private final IDLongGenerator idLongGenerator;

    @Value("${mw.rtuCallbackUrl_wx}")
    private String rtuCallbackUrl_wx;
@@ -70,10 +69,9 @@
    private String key_mw = "comSendUrl";

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

@@ -95,7 +93,7 @@
        Long vcId = valve.getVcId();
        Boolean forceOpen = valve.getForceOpen();
        Long operator = valve.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        if(intakeId == null && intakeName == null) {
            return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
@@ -246,7 +244,7 @@
        Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
        String orderNo = valve.getOrderNo();
        Long operator = valve.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 阀控器地址换取水口ID和通讯协议
        JSONObject job_rtu = getRtu(null, rtuAddr);
@@ -341,7 +339,7 @@
        Long vcId = automaticClose.getVcId();
        Integer minutes = automaticClose.getMinutes();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
@@ -444,7 +442,7 @@
        Long vcId = automaticClose.getVcId();
        Integer waterAmount = automaticClose.getWaterAmount();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        /**
         * 如果农户选择了虚拟卡，则使用该虚拟卡
@@ -548,7 +546,7 @@
        Date plannedOpenTime = automaticClose.getPlannedOpenTime();
        Integer minutes = automaticClose.getMinutes();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
        Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -663,7 +661,7 @@
        Date plannedOpenTime = automaticClose.getPlannedOpenTime();
        Integer waterAmount = automaticClose.getWaterAmount();
        Long operator = automaticClose.getOperator();
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
        Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -812,7 +810,7 @@
        Double chargeWater = po.getChargeWater();
        Long operator = po.getOperator();
        String flowNo = RandomStringUtils.randomNumeric(12); // 生成12位随机数
        Long comId = idLongGenerator.generate();
        Long comId = new IDLongGenerator().generate();

        // 取水口ID换阀控器地址及通讯协议
        JSONObject job_rtu = getRtu(intakeId, null);

			@@ -60,7 +60,6 @@
			public class ValveCtrl extends ComSupport {
			private final CommandSv commandSv;
			private final SeVirtualCardMapper seVirtualCardMapper;
			private final IDLongGenerator idLongGenerator;

			@Value("${mw.rtuCallbackUrl_rm}")
			private String rtuCallbackUrl_rm;
			@@ -75,10 +74,9 @@
			private String key_mw = "comSendUrl";

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

			@@ -100,7 +98,7 @@
			Long intakeId = valve.getIntakeId();
			Long vcId = valve.getVcId();
			Long operator = valve.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 获取水价
			Double waterPrice = commandSv.getPrice();
			@@ -238,7 +236,7 @@
			String vcNum = voUnclosedParam.getVcNum();
			Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
			String orderNo = voUnclosedParam.getOrderNo();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 阀控器地址换取水口ID和通讯协议
			JSONObject job_rtu = getRtu(null, rtuAddr);
			@@ -328,7 +326,7 @@
			Long intakeId = valve.getIntakeId();
			Long vcId = valve.getVcId();
			Long operator = valve.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			@@ -479,7 +477,7 @@
			String vcNum = voUnclosedParam.getVcNum();
			Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
			String orderNo = voUnclosedParam.getOrderNo();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 阀控器地址换取水口ID和通讯协议
			JSONObject job_rtu = getRtu(null, rtuAddr);
			@@ -574,7 +572,7 @@
			Long vcId = automaticClose.getVcId();
			Integer minutes = automaticClose.getMinutes();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			@@ -678,7 +676,7 @@
			Long vcId = automaticClose.getVcId();
			Integer waterAmount = automaticClose.getWaterAmount();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			@@ -783,7 +781,7 @@
			Date plannedOpenTime = automaticClose.getPlannedOpenTime();
			Integer minutes = automaticClose.getMinutes();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
			Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
			@@ -899,7 +897,7 @@
			Date plannedOpenTime = automaticClose.getPlannedOpenTime();
			Integer waterAmount = automaticClose.getWaterAmount();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
			Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
			@@ -1051,7 +1049,7 @@
			Double chargeWater = po.getChargeWater();
			Long operator = po.getOperator();
			String flowNo = RandomStringUtils.randomNumeric(12); // 生成12位随机数
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 取水口ID换阀控器地址及通讯协议
			JSONObject job_rtu = getRtu(intakeId, null);
			@@ -1124,7 +1122,7 @@
			Long intakeId = card.getIntakeId();
			String cardAddr = card.getCardAddr();
			Long operator = card.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 取水口ID换阀控器地址及通讯协议
			JSONObject job_rtu = getRtu(intakeId, null);

			@@ -55,7 +55,6 @@
			public class ValveCtrl extends ComSupport {
			private final CommandSv commandSv;
			private final SeVirtualCardMapper seVirtualCardMapper;
			private final IDLongGenerator idLongGenerator;

			@Value("${mw.rtuCallbackUrl_wx}")
			private String rtuCallbackUrl_wx;
			@@ -70,10 +69,9 @@
			private String key_mw = "comSendUrl";

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

			@@ -95,7 +93,7 @@
			Long vcId = valve.getVcId();
			Boolean forceOpen = valve.getForceOpen();
			Long operator = valve.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			if(intakeId == null && intakeName == null) {
			return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
			@@ -246,7 +244,7 @@
			Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
			String orderNo = valve.getOrderNo();
			Long operator = valve.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 阀控器地址换取水口ID和通讯协议
			JSONObject job_rtu = getRtu(null, rtuAddr);
			@@ -341,7 +339,7 @@
			Long vcId = automaticClose.getVcId();
			Integer minutes = automaticClose.getMinutes();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			@@ -444,7 +442,7 @@
			Long vcId = automaticClose.getVcId();
			Integer waterAmount = automaticClose.getWaterAmount();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			/**
			* 如果农户选择了虚拟卡，则使用该虚拟卡
			@@ -548,7 +546,7 @@
			Date plannedOpenTime = automaticClose.getPlannedOpenTime();
			Integer minutes = automaticClose.getMinutes();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
			Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
			@@ -663,7 +661,7 @@
			Date plannedOpenTime = automaticClose.getPlannedOpenTime();
			Integer waterAmount = automaticClose.getWaterAmount();
			Long operator = automaticClose.getOperator();
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
			Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
			@@ -812,7 +810,7 @@
			Double chargeWater = po.getChargeWater();
			Long operator = po.getOperator();
			String flowNo = RandomStringUtils.randomNumeric(12); // 生成12位随机数
			Long comId = idLongGenerator.generate();
			Long comId = new IDLongGenerator().generate();

			// 取水口ID换阀控器地址及通讯协议
			JSONObject job_rtu = getRtu(intakeId, null);