diff --git a/pom.xml b/pom.xml
index ecc022c..190d1c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
0.9.0
3.2.0
3.3.4
- 2.17.1
+ 2.16.2
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 map = JSONUtil.json2Object(data, HashMap.class);
+ Map 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 termList;
List 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);
}
}