From 8d2d5103aea98fab6ad94acd1c8421c05d1108fa Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Jul 2018 09:26:39 +0800
Subject: [PATCH] 优化
---
src/main/java/com/moral/controller/ScreenController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a78ff3d..85745f8 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -9,8 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.alibaba.fastjson.JSONReader;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.*;
import com.moral.common.util.StringUtils;
import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
@@ -32,8 +31,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.Constants;
import com.moral.common.bean.JsonData;
import com.moral.common.bean.PageResult;
@@ -616,7 +613,9 @@
DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());
}else {
- return ResultBean.fail();
+ String errMsg = "device ���������������"+ JSON.toJSONString(device);
+ log.warn(errMsg);
+ return ResultBean.fail(errMsg);
}
} else {
--
Gitblit v1.8.0