From bd528a22d2abaad8efa141693c3684c452e313af Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 09 六月 2025 08:57:25 +0800
Subject: [PATCH] 视频监控点实体重命名，并增加属性。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java | 25 ++++++++
/dev/null | 25 --------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViCamera.java | 46 ++++++++++-----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml | 71 +++++++++++++++++------
4 files changed, 109 insertions(+), 58 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java
new file mode 100644
index 0000000..4255d6d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java
@@ -0,0 +1,25 @@
+package com.dy.pipIrrGlobal.daoVi;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoVi.ViCamera;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/6/9 8:49
+ * @Description
+ */
+@Mapper
+public interface ViCameraMapper extends BaseMapper<ViCamera> {
+ int deleteByPrimaryKey(Long id);
+
+ int insert(ViCamera record);
+
+ int insertSelective(ViCamera record);
+
+ ViCamera selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(ViCamera record);
+
+ int updateByPrimaryKey(ViCamera record);
+}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViYsCameraMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViYsCameraMapper.java
deleted file mode 100644
index ceabdb3..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViYsCameraMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pipIrrGlobal.daoVi;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoVi.ViYsCamera;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/6/7 16:00
- * @Description
- */
-@Mapper
-public interface ViYsCameraMapper extends BaseMapper<ViYsCamera> {
- int deleteByPrimaryKey(Long id);
-
- int insert(ViYsCamera record);
-
- int insertSelective(ViYsCamera record);
-
- ViYsCamera selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(ViYsCamera record);
-
- int updateByPrimaryKey(ViYsCamera record);
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViYsCamera.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViCamera.java
similarity index 65%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViYsCamera.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViCamera.java
index a7efb51..348c6a1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViYsCamera.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViCamera.java
@@ -11,21 +11,20 @@
/**
* @Author: liurunyu
- * @Date: 2025/6/7 16:00
+ * @Date: 2025/6/9 8:49
* @Description
*/
/**
* 钀ょ煶鎽勫儚鏈猴紙瑙嗛绔欙級
*/
-
-@TableName(value="vi_ys_camera", autoResultMap = true)
+@TableName(value="vi_camera", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "瑙嗛鐩戞帶鎽勫儚鏈�")
-public class ViYsCamera implements BaseEntity {
+public class ViCamera implements BaseEntity {
public static final long serialVersionUID = 202506071604001L;
@@ -38,33 +37,50 @@
public Long id;
/**
- * 鎽勫儚鏈哄簭鍒楀彿
- */
+ * 绫诲瀷锛�1钀ょ煶锛�
+ */
+ @Schema(description = "鎽勫儚鏈虹被鍨�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte type;
+
+ /**
+ * 鎽勫儚鏈哄簭鍒楀彿
+ */
@Schema(description = "鎽勫儚鏈哄簭鍒楀彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String devNo;
/**
- * 瑙嗛绔欏悕绉�
- */
+ * 瑙嗛绔欏悕绉�
+ */
@Schema(description = "瑙嗛绔欏悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String name;
/**
- * 缁忓害
- */
+ * 缁忓害
+ */
@Schema(description = "瑙嗛绔欑粡搴�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double lng;
/**
- * 绾害
- */
+ * 绾害
+ */
@Schema(description = "瑙嗛绔欑含搴�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Double lat;
/**
- * 澶囨敞
- */
+ * 鏄惁澶у睆灞曠ず锛�1鏄紝0鎴杗ull鍚︼級
+ */
+ @Schema(description = "鏄惁澶у睍闆嗕腑鏄剧ず", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte onScreen;
+
+ /**
+ * 澶у睆灞曠ず鎺掑簭锛堝ぇ浜庣瓑浜�1锛屾暟瀛楄秺灏忔帓搴忚秺鍓嶏級
+ */
+ @Schema(description = "澶у睆灞曠ず鎺掑簭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer onSort;
+
+ /**
+ * 澶囨敞
+ */
@Schema(description = "澶囨敞淇℃伅", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public String remark;
-
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViYsCameraMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
similarity index 63%
rename from pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViYsCameraMapper.xml
rename to pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
index 82ec412..af73e92 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViYsCameraMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
@@ -1,45 +1,53 @@
<?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.dy.pipIrrGlobal.daoVi.ViYsCameraMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoVi.ViYsCamera">
+<mapper namespace="com.dy.pipIrrGlobal.daoVi.ViCameraMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoVi.ViCamera">
<!--@mbg.generated-->
- <!--@Table vi_ys_camera-->
+ <!--@Table vi_camera-->
<id column="id" jdbcType="BIGINT" property="id" />
+ <result column="type" jdbcType="TINYINT" property="type" />
<result column="dev_no" jdbcType="VARCHAR" property="devNo" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="lng" jdbcType="DOUBLE" property="lng" />
<result column="lat" jdbcType="DOUBLE" property="lat" />
+ <result column="on_screen" jdbcType="TINYINT" property="onScreen" />
+ <result column="on_sort" jdbcType="INTEGER" property="onSort" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, dev_no, `name`, lng, lat, remark
+ id, `type`, dev_no, `name`, lng, lat, on_screen, on_sort, remark
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
- from vi_ys_camera
+ from vi_camera
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
- delete from vi_ys_camera
+ delete from vi_camera
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoVi.ViYsCamera">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoVi.ViCamera">
<!--@mbg.generated-->
- insert into vi_ys_camera (id, dev_no, `name`,
- lng, lat, remark)
- values (#{id,jdbcType=BIGINT}, #{devNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
- #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR})
+ insert into vi_camera (id, `type`, dev_no,
+ `name`, lng, lat, on_screen,
+ on_sort, remark)
+ values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{devNo,jdbcType=VARCHAR},
+ #{name,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, #{lat,jdbcType=DOUBLE}, #{onScreen,jdbcType=TINYINT},
+ #{onSort,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR})
</insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoVi.ViYsCamera">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoVi.ViCamera">
<!--@mbg.generated-->
- insert into vi_ys_camera
+ insert into vi_camera
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
+ </if>
+ <if test="type != null">
+ `type`,
</if>
<if test="devNo != null">
dev_no,
@@ -53,6 +61,12 @@
<if test="lat != null">
lat,
</if>
+ <if test="onScreen != null">
+ on_screen,
+ </if>
+ <if test="onSort != null">
+ on_sort,
+ </if>
<if test="remark != null">
remark,
</if>
@@ -60,6 +74,9 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
+ </if>
+ <if test="type != null">
+ #{type,jdbcType=TINYINT},
</if>
<if test="devNo != null">
#{devNo,jdbcType=VARCHAR},
@@ -73,15 +90,24 @@
<if test="lat != null">
#{lat,jdbcType=DOUBLE},
</if>
+ <if test="onScreen != null">
+ #{onScreen,jdbcType=TINYINT},
+ </if>
+ <if test="onSort != null">
+ #{onSort,jdbcType=INTEGER},
+ </if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoVi.ViYsCamera">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoVi.ViCamera">
<!--@mbg.generated-->
- update vi_ys_camera
+ update vi_camera
<set>
+ <if test="type != null">
+ `type` = #{type,jdbcType=TINYINT},
+ </if>
<if test="devNo != null">
dev_no = #{devNo,jdbcType=VARCHAR},
</if>
@@ -94,19 +120,28 @@
<if test="lat != null">
lat = #{lat,jdbcType=DOUBLE},
</if>
+ <if test="onScreen != null">
+ on_screen = #{onScreen,jdbcType=TINYINT},
+ </if>
+ <if test="onSort != null">
+ on_sort = #{onSort,jdbcType=INTEGER},
+ </if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoVi.ViYsCamera">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoVi.ViCamera">
<!--@mbg.generated-->
- update vi_ys_camera
- set dev_no = #{devNo,jdbcType=VARCHAR},
+ update vi_camera
+ set `type` = #{type,jdbcType=TINYINT},
+ dev_no = #{devNo,jdbcType=VARCHAR},
`name` = #{name,jdbcType=VARCHAR},
lng = #{lng,jdbcType=DOUBLE},
lat = #{lat,jdbcType=DOUBLE},
+ on_screen = #{onScreen,jdbcType=TINYINT},
+ on_sort = #{onSort,jdbcType=INTEGER},
remark = #{remark,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0