From e77ae508afddfd24d8e713a63dfe2b3f46e9f070 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 10:25:34 +0800
Subject: [PATCH] 2024-10-31 农户问题上报添加接口、查询接口、删除接口，在线查询代码优化
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 280 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 190 insertions(+), 90 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 7673734..54646cf 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,18 +5,23 @@
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.p206V202404.CodeV202404;
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.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;
@@ -42,18 +47,24 @@
* @Description 鍛戒护鏀拺绫�
*/
-//@Component
-//@DependsOn({"baSettingsMapper", "prControllerMapper"})
public class ComSupport {
- protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
+ //@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;
@@ -64,13 +75,19 @@
@Autowired
private PrControllerMapper prControllerMapper;
- //@Autowired
- //private CommandSv commandSv;
-
@Autowired
private RmCommandHistoryMapper rmCommandHistoryMapper;
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardMapper;
+
+ @Autowired
+ private PrCommonIntakesMapper prCommonIntakesMapper;
+
public static ComSupport comSupport;
+
+ public ComSupport() {
+ }
/**
* 寮曞叆BaSettingsMapper
@@ -85,14 +102,15 @@
/**
* 鑾峰彇绯荤粺閰嶇疆鍙傛暟
*/
- 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;
+ //}
/**
* 鐢熸垚璁㈠崟鍙�
+ *
* @return
*/
public String generateOrderNo() {
@@ -110,35 +128,38 @@
/**
* 鏍规嵁鍙栨按鍙D鎴栭榾鎺у櫒鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄
+ *
* @param intakeId
* @return
*/
public JSONObject getRtu(Long intakeId, String rtuAddr) {
PrController prController = prControllerMapper.getRtu(intakeId, rtuAddr);
- if(prController == null) {
+ if (prController == null) {
return null;
}
JSONObject job_rtu = new JSONObject();
job_rtu.put("rtuAddr", prController.getRtuAddr());
job_rtu.put("protocol", prController.getProtocol());
job_rtu.put("intakeId", prController.getIntakeId());
+ job_rtu.put("orgTag", prController.getOrgTag());
return job_rtu;
}
/**
* 鍒涘缓鍛戒护鏃ュ織瀵硅薄
- * @param comId 涓婚敭
+ *
+ * @param comId 涓婚敭
* @param commandCode 鍔熻兘鐮�
- * @param rtuAddr 闃�鎺у櫒鍦板潃
- * @param protocol 閫氳鍗忚鍚嶇О
- * @param param 鍙傛暟鏁版嵁
- * @param operator 鎿嶄綔鍛�
+ * @param rtuAddr 闃�鎺у櫒鍦板潃
+ * @param protocol 閫氳鍗忚鍚嶇О
+ * @param param 鍙傛暟鏁版嵁
+ * @param operator 鎿嶄綔鍛�
* @return
*/
- protected RmCommandHistory getComHistory(Long comId, String commandCode, String commandName, Long intakeId, String rtuAddr, String protocol, Object param, Long operator ) {
+ protected RmCommandHistory getComHistory(Long comId, String commandCode, String commandName, Long intakeId, String rtuAddr, String protocol, Object param, Long operator) {
RmCommandHistory rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
+ rmCommandHistory.setComId(comId);
rmCommandHistory.setCommandCode(commandCode);
//rmCommandHistory.setCommandName(CodeV202404.getCodeName(commandCode));
rmCommandHistory.setCommandName(commandName);
@@ -153,44 +174,55 @@
/**
* 鏋勯�犲懡浠ゅ璞�
- * @param comId 鍛戒护ID
+ *
+ * @param comId 鍛戒护ID
* @param commandCode 鍔熻兘鐮�
- * @param rtuAddr RTU鍦板潃
- * @param param 鍙傛暟鏁版嵁
+ * @param rtuAddr RTU鍦板潃
+ * @param param 鍙傛暟鏁版嵁
* @return 鏋勯�犲ソ鐨勫懡浠ゅ璞�
*/
- protected Command command(Long comId, String commandCode, String rtuAddr, String protocol, String rtuResultSendWebUrl, Object param){
- Command com = new Command() ;
+ protected Command command(Long comId, String commandCode, String rtuAddr, String protocol, String rtuResultSendWebUrl, Object param) {
+ Command com = new Command();
com.id = String.valueOf(comId);
- com.code = commandCode ;
- com.rtuAddr = rtuAddr ;
+ com.code = commandCode;
+ com.rtuAddr = rtuAddr;
com.protocol = protocol;
com.type = commandTypeOuter;
- com.rtuResultSendWebUrl = rtuResultSendWebUrl ;
+ com.rtuResultSendWebUrl = rtuResultSendWebUrl;
- com.param = param ;
-
- return com ;
+ if(param != null) {
+ com.param = param;
+ }
+ return com;
}
/**
* 澶勭悊鍥炶皟鍐呭
+ *
* @param comId
* @return
*/
- protected BaseResponse<Data> dealWithCallBack(Long comId) {
- CompletableFuture<Data> featureObject = new CompletableFuture<>();
- features.put(comId, featureObject);
+ protected BaseResponse<Data> dealWithCallBack(Long comId, Command com) {
+ CompletableFuture<JSONObject> feature = new CompletableFuture<>();
+ features.put(comId, feature);
try {
- CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId);
- System.out.println("receive result ID:" + comId);
- Data resultData = feature.get(30, TimeUnit.SECONDS);
+ // 鍙戦�佸懡浠�
+ JSONObject response_SendCom = (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ if (response_SendCom == null || !response_SendCom.getString("code").equals("0001")) {
+ // 璇锋眰澶辫触锛孯TU鏈笂绾匡紝娓呴櫎feature
+ features.remove(comId);
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildErrorMsg(job_param.getString("message"));
+ }
+
+ JSONObject resultData = feature.get(180, TimeUnit.SECONDS);
features.remove(comId);
- Long commandId = Long.parseLong(resultData.getCommandId());
- if(commandId.equals(comId)) {
+
+ Long commandId = resultData.getLong("commandId");
+ if (commandId.equals(comId)) {
return BaseResponseUtils.buildSuccess(resultData);
- }else {
+ } else {
return BaseResponseUtils.buildSuccess();
}
} catch (InterruptedException e) {
@@ -206,10 +238,11 @@
/**
* 鍙戦�佸懡浠�
+ *
* @return
*/
- protected BaseResponse sendCom2Mw(Command com){
- String url = UriComponentsBuilder.fromUriString(mwUrlSendCom)
+ protected BaseResponse sendCom2Mw(Command com) {
+ String url = UriComponentsBuilder.fromUriString(comSendUrl)
.build()
.toUriString();
HttpHeaders headers = new HttpHeaders();
@@ -221,20 +254,28 @@
} catch (Exception e) {
e.printStackTrace();
}
+
+ if(response == null) {
+ return BaseResponseUtils.buildErrorMsg("涓棿浠惰皟鐢ㄥけ璐�");
+ }
return response.getBody();
}
/**
- * 鍙戦�佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ *
* @param po
* @return
*/
- protected BaseResponse dealWithCommandResult(Param po) {
+ protected BaseResponse<Boolean> dealWithCommandResult(Param po) {
Long comId = po.getComId();
+ Byte comType = po.getComType();
String commandCode = po.getCommandCode();
+ String commandName = po.getCommandName();
Long intakeId = po.getIntakeId();
String rtuAddr = po.getRtuAddr();
String protocol = po.getProtocol();
+ Long vcId = po.getVcId();
Object param = po.getParam();
String rtuResultSendWebUrl = po.getRtuResultSendWebUrl();
Long operator = po.getOperator();
@@ -242,52 +283,111 @@
// 鏋勯�犲懡浠�
Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param);
- // 鍙戦�佸懡浠�
- JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
- if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
- //if(1 > 0) {
- // 璇锋眰鎴愬姛
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
+ rmCommandHistoryMapper.insert(rmCommandHistory);
+ comId = rmCommandHistory.getComId();
- // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- String commandName = CodeV202404.getCodeName(commandCode);
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator);
- //commandSv.insert(rmCommandHistory);
- rmCommandHistoryMapper.insert(rmCommandHistory);
+ // 娣诲姞甯哥敤鍙栨按鍙ｆ垨鏇存柊浣跨敤淇℃伅
+ addCommonIntake(operator, intakeId);
- // 澶勭悊鍥炶皟
- BaseResponse response_CallBack = dealWithCallBack(comId);
+ /**
+ * 澶勭悊鍥炶皟
+ * feature鍑嗗灏辩华鍚庡彂閫佸懡浠�
+ * 鍛戒护鍙戦�佸悗绔嬪嵆闃诲绛夊緟鍥炶皟
+ */
+ BaseResponse response_CallBack = dealWithCallBack(comId, com);
- // 鍥炶皟澶辫触
- if(!response_CallBack.getCode().equals("0001")) {
- // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
- rmCommandHistory = new RmCommandHistory();
- rmCommandHistory.setId(comId);
- rmCommandHistory.setResult((byte)0);
- //commandSv.updateCommandResult(rmCommandHistory);
- rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
- return BaseResponseUtils.buildFail(response_CallBack.getMsg());
- //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- // 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
- JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent());
- System.out.println(job_content);
- JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData");
- System.out.println(job_subData);
- Boolean dealResult = job_subData.getBoolean("success");
- if(!dealResult) {
- return BaseResponseUtils.buildFail(response_CallBack.getContent().toString());
- }
-
- /**
- * 鎵ц鎴愬姛锛岃繑鍥炲洖璋冨唴瀹�
- */
- Data myData = (Data)response_CallBack.getContent();
- return BaseResponseUtils.buildSuccess(myData) ;
- } else {
- // 璇锋眰澶辫触
- JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
- return BaseResponseUtils.buildFail(job_param.getString("message"));
+ // 鍥炶皟寮傚父
+ if (!response_CallBack.getCode().equals("0001")) {
+ // 鍛戒护鏃ュ織鎵ц缁撴灉鏀逛负澶辫触
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ //return BaseResponseUtils.buildErrorMsg(response_CallBack.getContent().toString());
+ return BaseResponseUtils.buildErrorMsg(response_CallBack.getMsg());
}
+
+ // 鍥炶皟瓒呮椂
+ if (response_CallBack.getContent().toString().equals(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage())) {
+ /**
+ * 鍥炶皟瓒呮椂锛屾殏鏃惰涓烘墽琛屽け璐�
+ * 鍛戒护缃负澶辫触
+ * 铏氭嫙鍗′緷鏃т繚鎸佷娇鐢ㄤ腑鐨勭姸鎬�
+ */
+
+ rmCommandHistory = new RmCommandHistory();
+ rmCommandHistory.setComId(comId);
+ rmCommandHistory.setResult((byte) 0);
+ rmCommandHistoryMapper.updateByPrimaryKeySelective(rmCommandHistory);
+ return BaseResponseUtils.buildErrorMsg(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ }
+
+ /**
+ * 濡傛灉鏄紑鍏抽榾锛氭洿鏀硅櫄鎷熷崱鐘舵�侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * 鏇存柊鎵ц缁撴灉銆佽繑鍥炵粨鏋滄椂闂淬�佺粨鏋滃唴瀹�
+ * 杩斿洖鍥炶皟鍐呭
+ */
+ 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")) {
+ 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")) {
+ // 寮�鍏抽榾澶辫触
+ response_CallBack.setCode("10003");
+ response_CallBack.setMsg(CommandResultCode.OPEN_CLOSE_FAIL.getMessage());
+ response_CallBack.setSuccess(false);
+ }else {
+ // 寮�鍏抽榾鎴愬姛
+ 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);
+ }
+ }
+
+ // 鍥炶皟杩斿洖鐨勫唴瀹癸紝鍥炶皟缁撴灉鍐欏叆鍛戒护鏃ュ織琛ㄧ殑浠诲姟鐢变腑闂翠欢瀹屾垚
+ 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