From d1e380d5bc8d6cda7dc26778dd638b3367483ae7 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 17:27:30 +0800
Subject: [PATCH] 小程序6种开关阀操作失败时重发一次
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 220 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 174 insertions(+), 46 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index f774726..646d9be 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -5,20 +5,25 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandType;
import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1.CodeV1;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.command.enums.LastOperateENUM;
import com.dy.pipIrrGlobal.command.result.CommandResultCode;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
+import com.dy.pipIrrGlobal.daoIr.IrIntakeOperateMapper;
+import com.dy.pipIrrGlobal.daoPr.PrCommonIntakesMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrCommonIntakes;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -26,6 +31,8 @@
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;
@@ -48,13 +55,20 @@
//@Value("${mw.comSendUrl}")
protected String comSendUrl;
- protected static String controllerType = null;
- protected static Integer projectNo = null;
+ //protected static String controllerType = null;
+ //protected static Integer projectNo = null;
+
+ @Value("${project.projectNo}")
+ protected Integer projectNo;
+
+ @Value("${project.controllerType}")
+ protected String controllerType;
+
protected String commandTypeOuter = CommandType.outerCommand;
// 瀛樺偍瀹炰緥鍖栫殑 CompletableFuture<Data> 瀵硅薄
protected static Map<Long, Object> features = new HashMap<>();
- protected static Boolean setuped = false;
+ //protected static Boolean setuped = false;
@Autowired
private RestTemplate restTemplate;
@@ -70,6 +84,12 @@
@Autowired
private SeVirtualCardMapper seVirtualCardMapper;
+
+ @Autowired
+ private PrCommonIntakesMapper prCommonIntakesMapper;
+
+ @Autowired
+ private IrIntakeOperateMapper irIntakeOperateMapper;
public static ComSupport comSupport;
@@ -89,11 +109,11 @@
/**
* 鑾峰彇绯荤粺閰嶇疆鍙傛暟
*/
- public void setUp() {
- controllerType = comSupport.baSettingsMapper.getItemValue("controllerType");
- projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo"));
- setuped = true;
- }
+ //public void setUp() {
+ // controllerType = comSupport.baSettingsMapper.getItemValue("controllerType");
+ // projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo"));
+ // setuped = true;
+ //}
/**
* 鐢熸垚璁㈠崟鍙�
@@ -178,8 +198,9 @@
com.type = commandTypeOuter;
com.rtuResultSendWebUrl = rtuResultSendWebUrl;
- com.param = param;
-
+ if(param != null) {
+ com.param = param;
+ }
return com;
}
@@ -190,7 +211,7 @@
* @return
*/
protected BaseResponse<Data> dealWithCallBack(Long comId, Command com) {
- CompletableFuture<Data> feature = new CompletableFuture<>();
+ CompletableFuture<JSONObject> feature = new CompletableFuture<>();
features.put(comId, feature);
try {
// 鍙戦�佸懡浠�
@@ -202,9 +223,10 @@
return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
}
- Data resultData = feature.get(180, TimeUnit.SECONDS);
+ JSONObject resultData = feature.get(180, TimeUnit.SECONDS);
features.remove(comId);
- Long commandId = Long.parseLong(resultData.getCommandId());
+
+ Long commandId = resultData.getLong("commandId");
if (commandId.equals(comId)) {
return BaseResponseUtils.buildSuccess(resultData);
} else {
@@ -239,6 +261,10 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ if(response == null) {
+ return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+ }
return response.getBody();
}
@@ -260,6 +286,7 @@
Object param = po.getParam();
String rtuResultSendWebUrl = po.getRtuResultSendWebUrl();
Long operator = po.getOperator();
+ Byte openType = po.getOpenType();
// 鏋勯�犲懡浠�
Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
@@ -268,6 +295,9 @@
RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
rmCommandHistoryMapper.insert(rmCommandHistory);
comId = rmCommandHistory.getComId();
+
+ // 娣诲姞甯哥敤鍙栨按鍙ｆ垨鏇存柊浣跨敤淇℃伅
+ addCommonIntake(operator, intakeId);
/**
* 澶勭悊鍥炶皟
@@ -283,7 +313,9 @@
rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte) 0);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ //return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, response_CallBack.getMsg());
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getMsg());
}
// 鍥炶皟瓒呮椂
@@ -298,50 +330,146 @@
rmCommandHistory.setComId(comId);
rmCommandHistory.setResult((byte) 0);
rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "鍥炶皟瓒呮椂");
return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject) JSON.toJSON(response_CallBack.getContent());
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- Boolean dealResult = job_subData.getBoolean("success");
- if (!dealResult) {
- /**
- * 鎵ц澶辫触
- * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
- */
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setComId(comId);
- rmCommandHistory.setResult((byte) 0);
- rmCommandHistory.setResultTime(new Date());
- //rmCommandHistory.setResultText((JSONObject)JSON.toJSON(response_CallBack.getContent()));
- rmCommandHistory.setResultText(response_CallBack.getContent().toString());
- rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
- }
-
/**
- * 鎵ц鎴愬姛
* 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
* 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
* 杩斿洖鍥炶皟鍐呭
+ * ***************************** 铏氭嫙鍗′娇鐢ㄧ姸鎬佷笉渚濊禆寮�鍏抽榾鎰忔効锛屼緷璧栧紑鍏抽榾鎴愬姛涓庡惁
*/
- if (comType != null) {
- SeVirtualCard virtualCard = new SeVirtualCard();
- virtualCard.setId(vcId);
- if (comType == 1) {
- virtualCard.setInUse((byte) 1);
- } else {
- virtualCard.setInUse((byte) 0);
+ //if (comType != null) {
+ // SeVirtualCard virtualCard = new SeVirtualCard();
+ // virtualCard.setId(vcId);
+ // if (comType == 1) {
+ // virtualCard.setInUse((byte) 1);
+ // } else {
+ // virtualCard.setInUse((byte) 0);
+ // }
+ // virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ // virtualCard.setLastOperateTime(new Date());
+ // seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ //}
+
+ // 濡傛灉鏄紑鍙戝懡浠わ紙92-骞冲彴寮�闃�锛�91-灏忕▼搴忓紑闃�锛夛紝杩斿洖缁撴灉涓坊鍔犻榾鎺у櫒鍦板潃銆佽櫄鎷熷崱缂栧彿銆佽鍗曞彿
+ //if(commandCode.equals("92") || commandCode.equals("97")) {
+ if(commandCode.equals(CodeV1.cd_92) || commandCode.equals(CodeV1.cd_97)
+ || commandCode.equals(CodeV1.cd_99) || commandCode.equals(CodeV1.cd_A0)
+ || commandCode.equals(CodeV1.cd_A1) || commandCode.equals(CodeV1.cd_A2)) {
+ JSONObject job_response = (JSONObject) JSON.toJSON(response_CallBack);
+ 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(openType != null && openType == 1 ) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)2, "寮�闃�澶辫触");
+ }
+
+ // 寮�闃�澶辫触鍒欒В闄ゅ崰鐢紝鍏抽榾澶辫触鍒欏崰鐢�
+ if (comType != null) {
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ if (comType == 1) {
+ virtualCard.setInUse((byte) 0);
+ virtualCard.setIntakeId(null);
+ virtualCard.setOpenTime(null);
+ } else {
+ virtualCard.setInUse((byte) 1);
+ virtualCard.setIntakeId(intakeId);
+ }
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ }
+
+ response_CallBack.setCode("10003");
+ 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(openType != null && openType == 1) {
+ irIntakeOperateMapper.updateByCommandId(comId, (byte)1, null);
+ }
+
+ // 寮�闃�鎴愬姛鍒欏崰鐢紝鍏抽榾鎴愬姛涓嶅崰鐢�
+ if (comType != null) {
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ 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);
+ }
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+ }
+
+ job_data.remove("success");
+ job_data.put("intakeId", intakeId);
+ job_data.put("rtuAddr", rtuAddr);
+ if(job_param != null) {
+ job_data.put("vcNum", job_param.getString("icCardNo"));
+ job_data.put("orderNo", job_param.getString("orderNo"));
+ }
+ response_CallBack = JSON.parseObject(job_response.toJSONString(), BaseResponse.class);
}
- virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
- virtualCard.setLastOperateTime(new Date());
- seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
}
// 鍥炶皟杩斿洖鐨勫唴瀹癸紝鍥炶皟缁撴灉鍐欏叆鍛戒护鏃ュ織琛ㄧ殑浠诲姟鐢变腑闂翠欢瀹屾垚
- Data myData = (Data) response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData);
+ return response_CallBack;
}
+
+ /**
+ * 娣诲姞甯哥敤鍙栨按鍙ｆ垨鏇存柊浣跨敤淇℃伅
+ * @param intakeId
+ * @return
+ */
+ public Integer addCommonIntake(Long operatorId, Long intakeId) {
+ PrCommonIntakes commonIntake = prCommonIntakesMapper.selectByOperatorAndIntake(operatorId, intakeId);
+ if(commonIntake == null) {
+ commonIntake = new PrCommonIntakes();
+ commonIntake.setOperatorId(operatorId);
+ commonIntake.setIntakeId(intakeId);
+ commonIntake.setLastUsedTime(new Date());
+ commonIntake.setUsageCount(1);
+ return prCommonIntakesMapper.insert(commonIntake);
+ }
+
+ commonIntake.setLastUsedTime(new Date());
+ commonIntake.setUsageCount(commonIntake.getUsageCount() + 1);
+ return prCommonIntakesMapper.updateByPrimaryKeySelective(commonIntake);
+ }
}
--
Gitblit v1.8.0