From 89d69ac261923790e2d46b9bf3748a6cf2f2767b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 10:22:22 +0800
Subject: [PATCH] screen-manage 型号查询功能完成
---
screen-manage/src/main/resources/mapper/VersionMapper.xml | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index b1581d7..bf5d5e5 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -2,14 +2,75 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.api.mapper.VersionMapper">
- <!-- ������������������������ -->
- <resultMap id="BaseResultMap" type="com.moral.api.entity.Version">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="is_delete" property="isDelete" />
- <result column="desc" property="desc" />
- </resultMap>
+ <!-- ������������������������ -->
+ <resultMap id="BaseResultMap" type="com.moral.api.entity.Version">
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="is_delete" property="isDelete"/>
+ <result column="desc" property="desc"/>
+ </resultMap>
+
+ <!--���������������������������������map-->
+ <resultMap id="VersionSensorUnitMap" type="com.moral.api.entity.Version">
+ <id property="id" column="id"></id>
+ <result property="name" column="name"></result>
+ <result property="desc" column="desc"></result>
+ <result property="createTime" column="create_time"></result>
+ <result property="updateTime" column="update_time"></result>
+ <collection property="sensors" column="id" ofType="com.moral.api.entity.Sensor">
+ <id property="id" column="sid"></id>
+ <result property="name" column="sname"></result>
+ <result property="code" column="scode"></result>
+ <result property="unitKey" column="dataKey"></result>
+ <result property="unit" column="dataValue"></result>
+ </collection>
+ </resultMap>
+
+ <select id="queryVersionsAndSensorUnitByIds" resultMap="VersionSensorUnitMap">
+ SELECT
+ v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue
+ FROM
+ `version` v
+ JOIN
+ version_sensor_unit vsu
+ ON
+ v.`id` = vsu.`version_id` AND vsu.`is_delete` = 0
+ JOIN
+ sensor s
+ ON
+ s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
+ JOIN
+ (
+ SELECT
+ sdd.datakey,sdd.dataValue,sdd.is_delete
+ FROM
+ sys_dict_data sdd
+ JOIN
+ sys_dict_type sdt
+ ON
+ sdt.`name` = 'unit' AND sdt.`id` = sdd.`dict_type_id` AND sdt.`is_delete` = 0
+ WHERE
+ sdd.`is_delete` = 0
+ ) u
+ ON
+ vsu.unit_key = u.dataKey AND u.is_delete = 0
+ WHERE
+ v.`id`
+ in
+ <foreach collection="list" item="vid" open="(" separator="," close=")">
+ #{vid}
+ </foreach>
+ AND
+ v.`is_delete` = 0
+ ORDER BY FIELD
+ (v.`id`,
+ <foreach collection="list" item="vid" separator="," >
+ #{vid}
+ </foreach>
+ )
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0