pipIrr-SV.git - Gitblit

			@@ -5,8 +5,8 @@
			#name: ym
			type: com.alibaba.druid.pool.DruidDataSource
			driverClassName: com.mysql.cj.jdbc.Driver
			url: jdbc:mysql://192.168.91.73:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://192.168.91.73:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			username: root
			password: dysql,;.abc!@#
			druid:

			@@ -240,6 +240,7 @@
			/**
			* 糊掉超时，暂时认为执行成功
			* 更改虚拟卡状态：是否使用中、最后操作、最后操作时间
			* 返回开阀需要的参数
			*/
			SeVirtualCard virtualCard = new SeVirtualCard();
			virtualCard.setId(vcId);
			@@ -247,7 +248,15 @@
			virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
			virtualCard.setLastOperateTime(new Date());
			seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
			return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());

			JSONObject job_response = new JSONObject();
			job_response.put("message", RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			job_response.put("rtuAddr", rtuAddr);
			job_response.put("vcNum", vc.getVcNum());
			job_response.put("orderNo", orderNo);
			//job_response.put("operator", operator);
			return BaseResponseUtils.buildSuccess(job_response);
			//return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
			}

			// 回调成功，再判断执行是否成功
			@@ -276,6 +285,7 @@
			//return BaseResponseUtils.buildSuccess(myData) ;

			JSONObject job_response = new JSONObject();
			job_response.put("message", "ok");
			job_response.put("rtuAddr", rtuAddr);
			job_response.put("vcNum", vc.getVcNum());
			job_response.put("orderNo", orderNo);

	pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史