From 4e292e0e5efe8110f69196daa8253a7dde8f9b28 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 22 Aug 2024 13:23:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=BF=90=E7=BB=B4?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                        | 2 +-
 .../com/shxy/xymanager_admin/controller/MntnController.java    | 3 ++-
 .../shxy/xymanager_admin/controller/TerminalExtController.java | 1 +
 .../java/com/shxy/xymanager_common/model/StatMaintain.java     | 1 +
 .../java/com/shxy/xymanager_common/util/JSONProcessor.java     | 2 --
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ecc022c..190d1c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <jwt.version>0.9.0</jwt.version>
         <mybatisplus.version>3.2.0</mybatisplus.version>
         <easyexcel.version>3.3.4</easyexcel.version>
-        <jackson.version>2.17.1</jackson.version>
+        <jackson.version>2.16.2</jackson.version>
     </properties>
 
     <dependencyManagement>
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java
index d5f2351..cb7c7ce 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 @Api(tags = {"设备接入接口"})
@@ -37,7 +38,7 @@ public class MntnController extends BaseController {
         String url = req.getRequestURI();
         try {
             String multi = req.getHeader("Accept-Cmds");
-            HashMap<String, Object> map = JSONUtil.json2Object(data, HashMap.class);
+            Map<String, Object> map = JSONUtil.json2Object(data, Map.class);
             String cmdid = (String) map.get("id");
             if (StringUtils.isBlank(cmdid)) {
                 throw new ApiException("id不能为空");
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
index 941e716..04e4a7e 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java
@@ -123,6 +123,7 @@ public class TerminalExtController extends BaseController {
         vo.setPagesize(10000);
         long cost = System.currentTimeMillis();
         StatMaintain result = terminalExtService.statMaintain(vo);
+        result.setLineId(vo.getLineId());
         cost = System.currentTimeMillis() - cost;
         log.info("statMaintain cost=" + cost);
         return ResponseReult.success(result);
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatMaintain.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatMaintain.java
index 1aa6cd4..2eb0d4e 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatMaintain.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/StatMaintain.java
@@ -12,6 +12,7 @@ import java.util.List;
 public class StatMaintain {
     List<View_Dy_Line_Tower_Terminals> termList;
     List<StatDay> dayList = new ArrayList<>();
+    int lineId;
 
     public void initDayList(Long d1, Long d2) throws Exception {
         Date start = new Date(d1 * 1000);
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/JSONProcessor.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/JSONProcessor.java
index b86682c..37c0b64 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/JSONProcessor.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/JSONProcessor.java
@@ -68,8 +68,6 @@ public class JSONProcessor {
 			return mapper.readValue(json, clazz);
 		} catch (UnrecognizedPropertyException e) {
 			throw new Exception(e.getPropertyName(), e);
-		} catch (Exception e) {
-			throw new Exception("JSON Object transform failed. ", e);
 		}
 	}