liurunyu
昨天 bd528a22d2abaad8efa141693c3684c452e313af
视频监控点实体重命名,并增加属性。
2 文件已重命名
1个文件已添加
1个文件已删除
167 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViYsCameraMapper.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViCamera.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java
New file
@@ -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);
}
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViYsCameraMapper.java
File was deleted
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViCamera.java
File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoVi/ViYsCamera.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或null否)
     */
    @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;
}
pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
File was renamed from pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViYsCameraMapper.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>