xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构

Browse Source
This commit is contained in:
dashixiong
2026-02-15 16:02:06 +08:00
parent 6253fb6b2d
commit 71d0b0f609
30 changed files with 2844 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
View File

@ -134,17 +134,17 @@
</select>
<select id="getAllSiteDeviceList" parameterType="String" resultType="com.xzzn.ems.domain.vo.SiteDeviceListVo">
select es.site_id as siteId,es.site_name as siteName,
select ed.site_id as siteId,
ed.device_id as deviceId,ed.device_name as deviceName,
ed.device_type as deviceType,ed.device_status as deviceStatus,ed.work_status as workStatus,
ed.device_category as deviceCategory,
ed.picture_url as pictureUrl,
ed.id,
ed.parent_id as parentId
from ems_site_setting es INNER JOIN ems_devices_setting ed on es.site_id = ed.site_id
from ems_devices_setting ed
where 1=1
<if test="siteId != null and siteId != ''">
and es.site_id = #{siteId}
and ed.site_id = #{siteId}
</if>
<if test="deviceCategory != null and deviceCategory != ''">
and ed.device_category = #{deviceCategory}
@ -153,18 +153,19 @@
</select>
<select id="getAllSiteDeviceListNoDisp" parameterType="String" resultType="com.xzzn.ems.domain.vo.SiteDeviceListVo">
select es.site_id as siteId,es.site_name as siteName,
select ed.site_id as siteId,
ed.device_id as deviceId,ed.device_name as deviceName,
ed.device_type as deviceType,ed.device_status as deviceStatus,ed.work_status as workStatus,
ed.device_category as deviceCategory,
ed.picture_url as pictureUrl,
ed.id,
ed.parent_id as parentId
from ems_site_setting es INNER JOIN ems_devices_setting ed on es.site_id = ed.site_id and (ed.display_flg is null or ed.display_flg != '1')
from ems_devices_setting ed
where 1 = 1
<if test="siteId != null and siteId != ''">
and es.site_id = #{siteId}
and ed.site_id = #{siteId}
</if>
and (ed.display_flg is null or ed.display_flg != '1')
<if test="deviceCategory != null and deviceCategory != ''">
and ed.device_category = #{deviceCategory}
</if>
@ -173,4 +174,4 @@
<select id="getAllSiteId" resultType="String">
select distinct site_id from ems_site_setting
</select>
</mapper>
</mapper>