From a370cd1277689094b126eb6f0490c4ba69c7baee Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 03 Jul 2018 14:09:39 +0800
Subject: [PATCH] 监控站页面布局返回接口 优化
---
src/main/java/com/moral/service/DeviceVersionService.java | 2 ++
src/main/resources/mapper/DeviceVersionMapper.xml | 16 ++++++++++++++++
src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java | 4 ++++
src/main/java/com/moral/controller/ScreenController.java | 2 +-
src/main/java/com/moral/mapper/DeviceVersionMapper.java | 2 ++
5 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index b3d6354..e0ef646 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -599,7 +599,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();
diff --git a/src/main/java/com/moral/mapper/DeviceVersionMapper.java b/src/main/java/com/moral/mapper/DeviceVersionMapper.java
index 3629c23..7b5c78c 100644
--- a/src/main/java/com/moral/mapper/DeviceVersionMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceVersionMapper.java
@@ -7,4 +7,6 @@
public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
public List<DeviceVersion> selectListByOrgId(Integer orgId);
+ // ������������������������������������������
+ public List<DeviceVersion> selectListByMpointId(Integer orgId);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/DeviceVersionService.java b/src/main/java/com/moral/service/DeviceVersionService.java
index af8d202..654a914 100644
--- a/src/main/java/com/moral/service/DeviceVersionService.java
+++ b/src/main/java/com/moral/service/DeviceVersionService.java
@@ -18,5 +18,7 @@
List<DeviceVersion> queryByOrgId(Integer organizationId);
+ List<DeviceVersion> queryByMpointId(Integer mpointId);
+
DeviceVersion queryVersionById(Integer versionId);
}
diff --git a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
index 2083175..8af2ad5 100644
--- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
@@ -85,6 +85,10 @@
public List<DeviceVersion> queryByOrgId(Integer organizationId){
return this.deviceVersionMapper.selectListByOrgId(organizationId);
}
+ @Override
+ public List<DeviceVersion> queryByMpointId(Integer mpointId){
+ return this.deviceVersionMapper.selectListByMpointId(mpointId);
+ }
@Override
public DeviceVersion queryVersionById(Integer versionId) {
diff --git a/src/main/resources/mapper/DeviceVersionMapper.xml b/src/main/resources/mapper/DeviceVersionMapper.xml
index 576253e..b8d7606 100644
--- a/src/main/resources/mapper/DeviceVersionMapper.xml
+++ b/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -32,4 +32,20 @@
)
order by dvn.create_time desc
</select>
+ <select id="selectListByMpointId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ device_version dvn
+ WHERE
+ dvn.id IN (
+ SELECT DISTINCT
+ dev.device_version_id
+ FROM
+ device dev
+ WHERE
+ dev.monitor_point_id = #{mpointId,jdbcType=VARCHAR}
+ )
+ order by dvn.create_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0