pipIrr-SV.git - Gitblit

			@@ -57,7 +57,14 @@
			@Value("${mw.rtuCallbackUrl_wx}")
			private String rtuCallbackUrl_wx;

			/**
			* pro_mw：属性
			* tag从控制器中获取
			* key_mw：url的key
			*/
			private Environment env = null;
			private String pro_mw = "mw";
			private String key_mw = "comSendUrl";

			@Autowired
			public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {
			@@ -79,10 +86,6 @@
			if (bindingResult != null && bindingResult.hasErrors()) {
			return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
			}

			String pro_mw = "mw";
			String key_mw = "comSendUrl";
			String a = env.getProperty(pro_mw + "." + key_mw);

			Long intakeId = valve.getIntakeId();
			String intakeName = valve.getIntakeName();
			@@ -141,6 +144,8 @@
			}
			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();
			@@ -154,7 +159,7 @@
			ComCd92_A2Vo param = new ComCd92_A2Vo();
			param.controllerType = controllerType;
			param.projectNo = projectNo;
			param.icCardNo = vc.getVcNum();
			param.icCardNo = vc.getVcNum().toString();
			param.waterRemain = 0.0;
			param.moneyRemain = vc.getMoney();
			param.waterPrice = waterPrice;
			@@ -186,7 +191,7 @@

			// 创建视图
			Com97Vo param = new Com97Vo();
			param.icCardNo = vc.getVcNum();
			param.icCardNo = vc.getVcNum().toString();
			param.moneyRemain = vc.getMoney();
			param.waterPrice = waterPrice;
			param.orderNo = orderNo;
			@@ -247,6 +252,8 @@
			}
			Long intakeId = job_rtu.getLong("intakeId");
			String protocol = job_rtu.getString("protocol");
			String orgTag = job_rtu.getString("orgTag");
			comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);

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