pipIrr-SV.git - Gitblit

			@@ -30,12 +30,11 @@
			import org.springframework.web.client.RestTemplate;
			import org.springframework.web.util.UriComponentsBuilder;

			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.Map;
			import java.util.Random;
			import java.util.*;
			import java.util.concurrent.CompletableFuture;
			import java.util.concurrent.ExecutionException;
			import java.util.concurrent.TimeUnit;
			@@ -353,7 +352,12 @@
			JSONObject job_param = (JSONObject) JSON.toJSON(param);
			JSONObject job_data = job_response.getJSONObject("content").getJSONObject("data");
			if(!job_data.getBoolean("success")) {
			// 开关阀失败
			// 开关阀失败，更新命令执行状态及虚拟卡状态

			rmCommandHistory = new RmCommandHistory();
			rmCommandHistory.setComId(comId);
			rmCommandHistory.setResult((byte) 0);
			rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);

			// 开阀失败则解除占用，关阀失败则占用
			if (comType != null) {
			@@ -362,6 +366,7 @@
			if (comType == 1) {
			virtualCard.setInUse((byte) 0);
			virtualCard.setIntakeId(null);
			virtualCard.setOpenTime(null);
			} else {
			virtualCard.setInUse((byte) 1);
			virtualCard.setIntakeId(intakeId);
			@@ -375,7 +380,12 @@
			response_CallBack.setMsg(CommandResultCode.OPEN_CLOSE_FAIL.getMessage());
			response_CallBack.setSuccess(false);
			}else {
			// 开关阀成功
			// 开关阀成功，更新命令执行状态及虚拟卡状态

			rmCommandHistory = new RmCommandHistory();
			rmCommandHistory.setComId(comId);
			rmCommandHistory.setResult((byte) 1);
			rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);

			// 开阀成功则占用，关阀成功不占用
			if (comType != null) {
			@@ -384,6 +394,21 @@
			if (comType == 1) {
			virtualCard.setInUse((byte) 1);
			virtualCard.setIntakeId(intakeId);

			// 如果是计划开阀，从命令日志中获取计划时间，否则取当前时间
			if(commandCode.equals(CodeV1.cd_A1) \|\| commandCode.equals(CodeV1.cd_A2)) {
			// 计划开阀
			Date openTime = null;
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			try {
			openTime = sdf.parse(rmCommandHistoryMapper.getTimeByCommId(comId));
			}catch (ParseException e) {
			}
			virtualCard.setOpenTime(openTime);
			}else {
			// 非计划开阀
			virtualCard.setOpenTime(new Date());
			}
			} else {
			virtualCard.setInUse((byte) 0);
			virtualCard.setIntakeId(null);