From 5ed2476ff6672d9935682c4f360aa5c76d25d7f0 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 19 Aug 2019 16:53:30 +0800
Subject: [PATCH] 修改最大值最小值service实现

---
 src/main/resources/mapper/DeviceVersionMapper.xml |   65 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/DeviceVersionMapper.xml b/src/main/resources/mapper/DeviceVersionMapper.xml
index 5d7ef20..b8d7606 100644
--- a/src/main/resources/mapper/DeviceVersionMapper.xml
+++ b/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -1,20 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.moral.mapper.DeviceVersionMapper" >
-  <resultMap id="BaseResultMap" type="com.moral.entity.DeviceVersion" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="name" property="name" jdbcType="VARCHAR" />
-    <result column="version" property="version" jdbcType="INTEGER" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="description" property="description" jdbcType="VARCHAR" />
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moral.mapper.DeviceVersionMapper">
+  <resultMap id="BaseResultMap" type="com.moral.entity.DeviceVersion">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
   </resultMap>
-  <sql id="Base_Column_List" >
-    id, name, version, create_time, description
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from device_version
-    where id = #{id,jdbcType=INTEGER}
+  <select id="selectListByOrgId" 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 IN
+                (
+                   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>
+    <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