From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceVersionMapper.xml | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/DeviceVersionMapper.xml b/src/main/resources/mapper/DeviceVersionMapper.xml
index 5d7ef20..05ece87 100644
--- a/src/main/resources/mapper/DeviceVersionMapper.xml
+++ b/src/main/resources/mapper/DeviceVersionMapper.xml
@@ -1,20 +1,47 @@
-<?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}
+ )
+ )
+ 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