From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 12:34:27 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据
---
src/main/java/com/moral/controller/ScreenController.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 66467dd..16dc30f 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -15,6 +15,8 @@
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;
@@ -45,16 +47,6 @@
import com.moral.common.util.ValidateUtil;
import com.moral.common.xml.Version;
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;
@@ -80,6 +72,8 @@
SensorService sensorService;
@Resource
MonitorPointService monitorPointService;
+ @Resource
+ DeviceVersionService deviceVersionService;
/** The screen service. */
@Resource
@@ -112,6 +106,10 @@
@Resource
private AlarmDailyService alarmDailyService;
+ @Resource
+ private OrganizationLayoutService orgLayoutService;
+ @Resource
+ private DeviceVersionService dviceVersionService;
/**
* Screen login. ������������
*
@@ -584,15 +582,34 @@
})
@GetMapping("rtm-layout")
public ResultBean realTimeMonitorLayout(String primaryKey,String type){
- InputStreamReader reader = null;
- Map<String,Object> map = null;
- try {
- reader = new InputStreamReader(resource.getInputStream(),"UTF-8");
- map = new JSONReader(reader).readObject(new TypeReference<Map<String,Object>>() {});
- } catch (IOException e) {
- e.printStackTrace();
+ 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();
+ }
+
+ } else {
+ MonitorPoint monitorPoint = monitorPointService.queryMonitorPointById(Integer.parseInt(primaryKey));
+ List<DeviceVersion> versionList = deviceVersionService.queryByOrgId(monitorPoint.getOrganizationId());
+ if(versionList.size() > 0) {
+ List<Integer> versionNolist = versionList.stream().map(item -> {
+ return item.getVersion();
+ }).collect(Collectors.toList());
+ rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(monitorPoint.getOrganizationId(),versionNolist);
+ if(rtdLayout == null) {
+ return ResultBean.fail();
+ }
+ }
}
- return new ResultBean(map);
+ return new ResultBean(rtdLayout);
}
}
--
Gitblit v1.8.0