From 68a37e86d0bfa43e9d4aa0379f47eecee7a0b9c1 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 01 四月 2024 16:07:24 +0800
Subject: [PATCH] xml位置修改
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index fd51090..5db47cf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.TMonitorMapper">
- <resultMap type="TMonitor" id="TMonitorResult">
+ <resultMap type="com.ycl.platform.domain.entity.TMonitor" id="TMonitorResult">
<result property="id" column="id" />
<result property="serialNumber" column="serial_number" />
<result property="name" column="name" />
@@ -36,21 +36,28 @@
<result property="cameraDept" column="camera_dept" />
<result property="hybm" column="hybm" />
<result property="lxbm" column="lxbm" />
+ <result property="reason" column="reason" />
+ <result property="defaultOrder" column="default_order" />
+ <result property="recovery" column="recovery" />
+ <result property="recoveryTime" column="recovery_time" />
+ <result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectTMonitorVo">
- select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm from t_monitor
+ select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,dept_id from t_monitor
</sql>
- <select id="selectTMonitorList" parameterType="TMonitor" resultMap="TMonitorResult">
- <include refid="selectTMonitorVo"/>
+ <select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
+ select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
+ , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, default_order,recovery,recovery_time,sd.dept_name from t_monitor m
+ left join sys_dept sd on m.dept_id = sd.dept_id
<where>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="siteType != null "> and site_type = #{siteType}</if>
<if test="macAddr != null and macAddr != ''"> and mac_addr = #{macAddr}</if>
<if test="ip != null and ip != ''"> and ip = #{ip}</if>
- <if test="cameraFunType != null and cameraFunType != ''"> and camera_fun_type = #{cameraFunType}</if>
+ <if test="cameraFunType != null and cameraFunType != ''"> and camera_fun_type like concat('%', #{cameraFunType}, '%')</if>
<if test="longitude != null and longitude != ''"> and longitude = #{longitude}</if>
<if test="latitude != null and latitude != ''"> and latitude = #{latitude}</if>
<if test="cameraCaptureArea != null and cameraCaptureArea != ''"> and camera_capture_area = #{cameraCaptureArea}</if>
@@ -58,7 +65,7 @@
<if test="civilCode != null and civilCode != ''"> and civil_code = #{civilCode}</if>
<if test="integratedDevice != null "> and integrated_device = #{integratedDevice}</if>
<if test="cameraBrand != null "> and camera_brand = #{cameraBrand}</if>
- <if test="address != null and address != ''"> and address = #{address}</if>
+ <if test="address != null and address != ''"> and address like concat('%',#{address},'%') </if>
<if test="netWorking != null "> and net_working = #{netWorking}</if>
<if test="publicSecurity != null and publicSecurity != ''"> and public_security = #{publicSecurity}</if>
<if test="installedTime != null "> and installed_time = #{installedTime}</if>
@@ -75,6 +82,11 @@
<if test="cameraDept != null and cameraDept != ''"> and camera_dept = #{cameraDept}</if>
<if test="hybm != null and hybm != ''"> and hybm = #{hybm}</if>
<if test="lxbm != null "> and lxbm = #{lxbm}</if>
+ <if test="reason != null and reason != ''"> and reason = #{reason}</if>
+ <if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
+ <if test="recovery != null "> and recovery = #{recovery}</if>
+ <if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
+ <if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
</select>
@@ -83,7 +95,7 @@
where id = #{id}
</select>
- <insert id="insertTMonitor" parameterType="TMonitor" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor" useGeneratedKeys="true" keyProperty="id">
insert into t_monitor
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">serial_number,</if>
@@ -116,6 +128,11 @@
<if test="cameraDept != null">camera_dept,</if>
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
+ <if test="reason != null">reason,</if>
+ <if test="defaultOrder != null">default_order,</if>
+ <if test="recovery != null">recovery,</if>
+ <if test="recoveryTime != null">recovery_time,</if>
+ <if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -148,10 +165,15 @@
<if test="cameraDept != null">#{cameraDept},</if>
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
+ <if test="reason != null">#{reason},</if>
+ <if test="defaultOrder != null">#{defaultOrder},</if>
+ <if test="recovery != null">#{recovery},</if>
+ <if test="recoveryTime != null">#{recoveryTime},</if>
+ <if test="deptId != null">#{deptId},</if>
</trim>
</insert>
- <update id="updateTMonitor" parameterType="TMonitor">
+ <update id="updateTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor">
update t_monitor
<trim prefix="SET" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
@@ -184,6 +206,11 @@
<if test="cameraDept != null">camera_dept = #{cameraDept},</if>
<if test="hybm != null">hybm = #{hybm},</if>
<if test="lxbm != null">lxbm = #{lxbm},</if>
+ <if test="reason != null">reason = #{reason},</if>
+ <if test="defaultOrder != null">default_order = #{defaultOrder},</if>
+ <if test="recovery != null">recovery = #{defaultOrder},</if>
+ <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.8.0