From 3bb54d86b0a80a13374b10b1a9d9d0f131a85f9d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Jul 2018 15:08:58 +0800
Subject: [PATCH] 大屏登录 返回地址信息完善
---
src/main/java/com/moral/controller/ScreenController.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d02d6d6..6da7b44 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -11,6 +11,7 @@
import com.alibaba.fastjson.JSONReader;
import com.alibaba.fastjson.TypeReference;
+import com.moral.common.util.StringUtils;
import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
import com.moral.entity.alarm.AlarmConfigValue;
@@ -28,14 +29,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
import com.alibaba.fastjson.JSONArray;
@@ -58,9 +52,9 @@
*/
@RestController
@RequestMapping("/screen")
-//@CrossOrigin(origins = "*", maxAge = 3600)
+@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
-@Api(tags = "Screen", description = "������������")
+@Api(tags = "Screen", description = "������������")
public class ScreenController {
public static Logger log = Logger.getLogger(ScreenController.class);
@Resource
@@ -110,6 +104,8 @@
private OrganizationLayoutService orgLayoutService;
@Resource
private DeviceVersionService dviceVersionService;
+ @Resource
+ private OrganizationService organizationService;
/**
* Screen login. ������������
*
@@ -126,6 +122,27 @@
resultMap.put("accountId", -1);
} else {
resultMap = accountService.screenLogin(parameters);
+ Object orgId = resultMap.get("orgId");
+ if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
+ Organization organization = organizationService.getOrganizationById((Integer) orgId);
+ StringBuilder areaNamesBuilder = new StringBuilder("������");
+ if( organization.getAreaNames()!=null){
+ AreaNames areaNames = organization.getAreaNames();
+ if(!StringUtils.isNullOrEmpty(areaNames.getProvinceName())){
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(areaNames.getProvinceName());
+ if(!StringUtils.isNullOrEmpty(areaNames.getCityName())){
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(areaNames.getCityName());
+ if(!StringUtils.isNullOrEmpty(areaNames.getAreaName())){
+ areaNamesBuilder.append("/");
+ areaNamesBuilder.append(areaNames.getAreaName());
+ }
+ }
+ }
+ }
+ resultMap.put("mapPath",areaNamesBuilder.toString());
+ }
}
return resultMap;
}
@@ -599,7 +616,7 @@
} else {
MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
- List<DeviceVersion> versionList = deviceVersionService.queryByOrgId(monitorPoint.getOrganizationId());
+ List<DeviceVersion> versionList = deviceVersionService.queryByMpointId(monitorPoint.getId());
if(versionList.size() > 0) {
List<Integer> versionNolist = versionList.stream().map(item -> {
return item.getVersion();
@@ -610,10 +627,10 @@
}
}
}
- if(rtdLayout.getDefaultMonitorItems().size() == 0 ) {
+ if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {
rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());
}
- return new ResultBean(rtdLayout);
+ return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);
}
@GetMapping("report_avg_data")
@@ -626,7 +643,12 @@
})
public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgDataBySensorKey(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- parameters.put("type", "month");
+ int length = ((String)parameters.get("time")).split("-").length;
+ if (length == 2) {
+ parameters.put("type", "month");
+ } else if (length == 3){
+ parameters.put("type", "day");
+ }
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
parameters.put("sensors", Arrays.asList(sensorKeys));
@@ -636,6 +658,11 @@
String time = map.get("time").toString();
time = time.substring(time.length() - 2);
map.put("time", Integer.valueOf(time));
+ List<Number> values = new ArrayList<Number>();
+ for (String string : sensorKeys) {
+ values.add((Number) map.remove(string));
+ }
+ map.put("values", values);
}
return new ResultBean<List<Map<String, Object>>>(list);
}
--
Gitblit v1.8.0