From d8a62fdbbd0ecc4cb4ab41fc83ec81bc7e4c4bdc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 11:33:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 0de6265..604549a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -454,4 +454,91 @@
) c ON a.area = c.area
</select>
+
+ <select id="assetManagement" resultMap="dyMap">
+ SELECT
+ tm.id,
+ tm.serial_number,
+ tm.name,
+ tm.site_type,
+ tm.mac_addr,
+ tm.ip,
+ tm.camera_fun_type,
+ tm.longitude,
+ tm.latitude,
+ tm.camera_capture_area,
+ tm.on_state,
+ tm.civil_code,
+ tm.integrated_device,
+ tm.camera_brand,
+ tm.address,
+ tm.net_working,
+ tm.public_security,
+ tm.installed_time,
+ tm.management_unit,
+ tm.mu_contact_info,
+ tm.storage_days,
+ tm.monitor_azimuth,
+ tm.scene_photo_addr,
+ tm.model,
+ tm.site_vulgo,
+ tm.camera_type,
+ tm.camera_light_type,
+ tm.encoded_format,
+ tm.camera_dept,
+ tm.hybm,
+ tm.lxbm,
+ dc.prop_name,
+ dc.label_value,
+ dc.field_value
+ FROM
+ t_monitor tm
+ LEFT JOIN t_dynamic_column dc ON tm.id = dc.ref_id
+ <where>
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (tm.name like concat('%', #{query.keyword}, '%') OR dc.field_value like concat('%', #{query.keyword}, '%'))
+ </if>
+ </where>
+ </select>
+
+ <resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">
+ <id column="id" property="id"/>
+ <result column="serial_number" property="serialNumber"/>
+ <result column="name" property="name"/>
+ <result column="site_type" property="siteType"/>
+ <result column="mac_addr" property="macAddr"/>
+ <result column="ip" property="ip"/>
+ <result column="longitude" property="longitude"/>
+ <result column="latitude" property="latitude"/>
+ <result column="camera_capture_area" property="cameraCaptureArea"/>
+ <result column="camera_fun_type" property="cameraFunType"/>
+ <result column="on_state" property="onState"/>
+ <result column="civil_code" property="civilCode"/>
+ <result column="integrated_device" property="integratedDevice"/>
+ <result column="camera_brand" property="cameraBrand"/>
+ <result column="address" property="address"/>
+ <result column="public_security" property="publicSecurity"/>
+ <result column="installed_time" property="installedTime"/>
+ <result column="management_unit" property="managementUnit"/>
+ <result column="mu_contact_info" property="muContactInfo"/>
+ <result column="storage_days" property="storageDays"/>
+ <result column="monitor_azimuth" property="monitorAzimuth"/>
+ <result column="scene_photo_addr" property="scenePhotoAddr"/>
+ <result column="model" property="model"/>
+ <result column="site_vulgo" property="siteVulgo"/>
+ <result column="camera_type" property="cameraType"/>
+ <result column="camera_light_type" property="cameraLightType"/>
+ <result column="encoded_format" property="encodedFormat"/>
+ <result column="camera_dept" property="cameraDept"/>
+ <result column="hybm" property="hybm"/>
+ <result column="lxbm" property="lxbm"/>
+ <collection property="dynamicColumnList" ofType="com.ycl.platform.domain.vo.DynamicColumnVO" resultMap="dynamicColumnMap"/>
+ </resultMap>
+
+ <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
+ <result column="prop_name" property="propName"/>
+ <result column="label_value" property="labelValue"/>
+ <result column="field_value" property="fieldValue"/>
+ </resultMap>
+
</mapper>
--
Gitblit v1.8.0