From 55b227d4bc75374bca89f413750d236669571a70 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 09:28:29 +0800
Subject: [PATCH] 大屏布局
---
src/main/java/com/moral/controller/ScreenController.java | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d827c2a..10915d3 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -3,17 +3,20 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.alibaba.fastjson.JSONReader;
+import com.alibaba.fastjson.TypeReference;
+import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.alarm.AlarmConfigValue;
+import com.moral.entity.charts.DataSortCondition;
+import com.moral.entity.layout.RealTimeDeviceLayout;
+import com.moral.service.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.log4j.Logger;
@@ -35,7 +38,6 @@
import org.springframework.web.bind.annotation.RestController;
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;
@@ -44,22 +46,7 @@
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
import com.moral.common.xml.Version;
-import com.moral.entity.Account;
-import com.moral.entity.Device;
-import com.moral.entity.MapBounds;
-import com.moral.entity.MonitorPoint;
-import com.moral.entity.alarm.AlarmConfigValue;
import com.moral.entity.alarm.AlarmSensorLevel;
-import com.moral.service.AccountService;
-import com.moral.service.AlarmConfigService;
-import com.moral.service.AlarmDailyService;
-import com.moral.service.AreaService;
-import com.moral.service.DeviceService;
-import com.moral.service.HistoryMinutelyService;
-import com.moral.service.HistoryService;
-import com.moral.service.MachineActivateService;
-import com.moral.service.MonitorPointService;
-import com.moral.service.SensorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -85,6 +72,8 @@
SensorService sensorService;
@Resource
MonitorPointService monitorPointService;
+ @Resource
+ DeviceVersionService deviceVersionService;
/** The screen service. */
@Resource
@@ -105,8 +94,8 @@
private MachineActivateService machineActivateService;
/** The resource. */
- @Value(value = "classpath:system/alarmLevels.json")
- private org.springframework.core.io.Resource resource;
+// @Value(value = "classpath:system/alarmLevels.json")
+// private org.springframework.core.io.Resource resource;
/** The redis template. */
@Resource
@@ -117,6 +106,8 @@
@Resource
private AlarmDailyService alarmDailyService;
+ @Resource
+ private OrganizationLayoutService orgLayoutService;
/**
* Screen login. ������������
*
@@ -160,7 +151,7 @@
* @return the alarm levels
*/
@GetMapping("alarm-levels")
- public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId) {
+ public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId,Optional<String> mac) {
List<Map<String,Object>> sensorAlarmList = null;
try {
AlarmConfig alarmConfig = null;
@@ -168,6 +159,8 @@
alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();
}else if(mpId.isPresent()){
alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();
+ } else if(mac.isPresent() ){
+ alarmConfig = alarmConfigService.queryByDeviceMac(mac.get()).get();
}
//���������������
if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){
@@ -230,6 +223,29 @@
return result;
}
+ /**
+ *
+ * @param dataSortCondition ������������������������
+ * @return
+ */
+ public ResultBean<Map<String,Object>> getOrderData(DataSortCondition dataSortCondition) {
+ ResultBean resultBean = new ResultBean();
+ if(dataSortCondition.getCode()==null){
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("code can't be null");
+ } else if(dataSortCondition.getStyle()==null){
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("style can't be null");
+ }
+ String code = dataSortCondition.getCode().toString();
+ Region region = Region.create(code);
+ if(region == null) {
+ resultBean.setCode(ResultBean.FAIL);
+ resultBean.setMessage("code is not in the correct format");
+ }
+ // todo
+ return null;
+ }
/**
* Gets the day AQI by sensor.���������������AQI������
*
@@ -554,5 +570,32 @@
List<Map<String, Object>> list = historyService.getRegionRankingData(parameters);
return new ResultBean<List<Map<String, Object>>>(list);
}
+ // todo
+ @Value(value = "classpath:system/realTimeMonitorLayout.json")
+ private org.springframework.core.io.Resource resource;
+ @ApiOperation(value = "������������������������������", notes = "")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "primaryKey",defaultValue = "898607b0101730391967", value = "���������������mac������������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "type", defaultValue = "device",value = "���������'monitorPoint'���'device'", required = true, paramType = "query", dataType = "String"),
+ })
+ @GetMapping("rtm-layout")
+ public ResultBean realTimeMonitorLayout(String primaryKey,String type){
+ RealTimeDeviceLayout rtdLayout = null;
+ if(type != null && type.equals("device")) {
+ Device device = deviceService.getDeviceByMac(primaryKey,false);
+ if(device!= null
+ && device.getOrganizationIds()!=null
+ && device.getOrganizationIds().size() >0
+ && device.getDeviceVersionId()!=null) {
+ Integer orgId = device.getOrganizationIds().get(0);
+ DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
+ rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());
+ }else {
+ return ResultBean.fail();
+ }
+
+ }
+ return new ResultBean(rtdLayout);
+ }
}
--
Gitblit v1.8.0