From 02319a08079d4800c11d96bb4afe7999156686d9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 12 十一月 2024 15:07:51 +0800
Subject: [PATCH] 根据RTU上报状态清除虚拟IC卡占用状态逻辑中，增加一个日期时间限制，以防止清除计划开阀命令的中虚拟IC卡占用状态。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
index 5a422e2..a371bde 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
@@ -1,7 +1,7 @@
package com.dy.rtuMw.web.webRequest;
import com.dy.common.mw.protocol.Command;
-import com.dy.rtuMw.web.comResult.WebResponseVo;
+import com.dy.common.webUtil.BaseResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@
/**
* @Author: liurunyu
* @Date: 2024/11/11 16:29
- * @Description
+ * @Description 閫氫俊涓棿浠跺澶栧彂鍑虹殑web璇锋眰
*/
@Component()
public class WebRequestDeal {
@@ -30,6 +30,11 @@
this.restTemplate = restTemplate ;
}
+ /**
+ * 澶勭悊涓棿浠朵富鍔ㄥ彂璧风殑web璇锋眰
+ * @param webUrl
+ * @param obj
+ */
public void deal(String webUrl, Object obj) {
if (webUrl != null
&& !webUrl.trim().equals("")
@@ -41,10 +46,10 @@
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
HttpEntity<?> httpEntity = new HttpEntity<>(obj, headers);
- ResponseEntity<WebResponseVo> response = null;
+ ResponseEntity<BaseResponse> response = null;
try {
// 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
- response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, WebResponseVo.class);
+ response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
} catch (Exception e) {
log.error("web璁块棶璇锋眰鍙戠敓寮傚父", e);
}
--
Gitblit v1.8.0