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/OrganizationLayoutController.java | 7 ++++---
src/main/resources/mapper/DeviceVersionMapper.xml | 9 ++++++++-
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 1 +
src/main/resources/mapper/SensorMapper.xml | 14 ++++++++++----
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationLayoutController.java b/src/main/java/com/moral/controller/OrganizationLayoutController.java
index 8482391..7500c98 100644
--- a/src/main/java/com/moral/controller/OrganizationLayoutController.java
+++ b/src/main/java/com/moral/controller/OrganizationLayoutController.java
@@ -30,9 +30,10 @@
@GetMapping("rtd-config")
public ResultBean<Map<String,Object>> getRealTimeDevicetConfig(Integer orgId){
Map<String,Object> resultMap = new HashMap();
- resultMap.put("deviceVersions","");
- resultMap.put("sensors","");
- resultMap.put("rtdLayout","");
+ resultMap.put("deviceVersions",new ArrayList<>());
+ resultMap.put("sensorCombs", new ArrayList<>());
+ resultMap.put("sensors", new ArrayList<>());
+ resultMap.put("rtdLayout", new HashMap<>());
// ������������������������������������������
List<DeviceVersion> deviceVersionList = deviceVersionService.queryByOrgId(orgId);
// ���������������version ������������������
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 0ab1c6f..f2d4893 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -80,6 +80,7 @@
Map<Integer,List<SensorUnit>> resultListMap = new HashMap<>();
for(Integer sensorId: sensorIds) {
sensorUnitQuery.setSensorId(sensorId);
+ sensorUnitQuery.setIsDelete(false);
List<SensorUnit> sensorUnitList = sensorUnitMapper.select(sensorUnitQuery);
if(sensorUnitList!=null&&sensorUnitList.size()>0){
resultListMap.put(sensorId,sensorUnitList);
diff --git a/src/main/resources/mapper/DeviceVersionMapper.xml b/src/main/resources/mapper/DeviceVersionMapper.xml
index ad7b3db..576253e 100644
--- a/src/main/resources/mapper/DeviceVersionMapper.xml
+++ b/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -21,7 +21,14 @@
device dev
WHERE
dev.monitor_point_id IN
- ( SELECT id FROM monitor_point mpt WHERE mpt.organization_id = #{orgId,jdbcType=INTEGER} )
+ (
+ SELECT id FROM monitor_point mpt
+ WHERE mpt.organization_id = #{orgId,jdbcType=INTEGER}
+ or EXISTS (
+ SELECT * from dictionary_data where dict_data_key = 'auth_config_super_org' and dict_data_value = #{orgId,jdbcType=INTEGER}
+ )
+
+ )
)
order by dvn.create_time desc
</select>
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 84e8794..2137105 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -85,12 +85,18 @@
select * from sensor sen where sen.id in
(
select DISTINCT sensor_id from device_version_sensor dvs
- where dvs.device_version_id in (
+ where dvs.device_version_id
+ in (
select DISTINCT device_version_id from device dev where
EXISTS (select * from monitor_point mpt where
mpt.organization_id = #{organizationId,jdbcType=INTEGER} and mpt.id = dev.monitor_point_id
- )
- )
- ) order by sen.id asc
+ OR EXISTS (
+ SELECT * from dictionary_data
+ where dict_data_key = 'auth_config_super_org' and dict_data_value = #{organizationId,jdbcType=INTEGER}
+ )
+ )
+ )
+ )
+ order by sen.id asc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0