From bb8b1617bbb1fd2503f7fe2538a4a4d925496ffc Mon Sep 17 00:00:00 2001
From: luyie <yangpujun@163.com>
Date: Fri, 28 Nov 2025 17:18:45 +0800
Subject: [PATCH] =?UTF-8?q?modify:=E8=B0=83=E6=95=B4=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97mybatis=E7=9A=84extend=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E4=BB=A5=E9=80=82=E5=BA=94=E5=B9=B3=E5=8F=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video_image/video/entity/Video.java            |  5 +--
 .../video_image/video/mapper/CloudVideoMapper.java |  9 +++-
 .../video_image/video/mapper/CloudVideoMapper.xml  | 48 +++++++++++++++++++---
 .../video/mapper/DirectLinkVideoMapper.java        |  9 +++-
 .../video/mapper/DirectLinkVideoMapper.xml         | 48 +++++++++++++++++++---
 .../video_image/video/mapper/VideoBaseMapper.java  | 19 ---------
 .../video_image/video/mapper/VideoBaseMapper.xml   | 43 -------------------
 7 files changed, 103 insertions(+), 78 deletions(-)
 delete mode 100644 HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.java
 delete mode 100644 HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.xml

diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/entity/Video.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/entity/Video.java
index 0f699ea..af0206b 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/entity/Video.java
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/entity/Video.java
@@ -1,7 +1,4 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
+
 
 package org.springblade.video_image.video.entity;
 
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.java
index ebb2c39..a81cea0 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.java
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.java
@@ -3,10 +3,11 @@ package org.springblade.video_image.video.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.video_image.video.entity.CloudVideo;
+import org.springblade.video_image.video.entity.PointLeafNode;
 
 import java.util.List;
 
-public interface CloudVideoMapper extends VideoBaseMapper {
+public interface CloudVideoMapper {
     void insert(CloudVideo var1);
 
     int update(CloudVideo var1);
@@ -16,4 +17,10 @@ public interface CloudVideoMapper extends VideoBaseMapper {
     IPage<CloudVideo> searchList(@Param("videoList") List<Long> var1, @Param("inUse") Integer var2, @Param("condition") String var3, IPage<CloudVideo> var4);
 
     List<CloudVideo> getAllList(@Param("stationId") String var1);
+
+    int clearBindingRelation(@Param("videoList") List<Long> var1);
+
+    List<PointLeafNode> getVideoList(@Param("pointIdList") List<Long> var1);
+
+    int deleteById(long var1);
 }
\ No newline at end of file
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.xml b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.xml
index 4ab91e2..98379f0 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.xml
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/CloudVideoMapper.xml
@@ -17,18 +17,56 @@
 		inUse
 	</sql>
 
+    <sql id="Video_Base_Column_List">
+        id, name, pointId, inUse
+    </sql>
+
+    <sql id="Clear_Condition">
+        <where>
+            <choose>
+                <when test="videoList != null and !videoList.isEmpty()">
+                    AND id IN (
+                    <foreach collection="videoList" item="videoId" separator=",">
+                        #{videoId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
+    <sql id="List_Condition">
+        <where>
+            <choose>
+                <when test="pointIdList != null and !pointIdList.isEmpty()">
+                    AND pointId IN (
+                    <foreach collection="pointIdList" item="pointId" separator=",">
+                        #{pointId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
     <update id="clearBindingRelation">
         UPDATE VIDEO_MONITOR
         SET	pointId = null
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
     </update>
 
     <select id="getVideoList" resultType="org.springblade.video_image.video.entity.PointLeafNode">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         VIDEO_MONITOR
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.List_Condition"/>
+        <include refid="List_Condition"/>
     </select>
 
     <delete id="deleteById">
@@ -39,10 +77,10 @@
 
     <select id="searchList" resultType="org.springblade.video_image.video.entity.CloudVideo">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         VIDEO_MONITOR
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
         <if test="inUse != null">
             AND inUse = #{inUse, jdbcType=SMALLINT}
         </if>
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.java
index 3486b40..61f878d 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.java
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.java
@@ -8,10 +8,11 @@ package org.springblade.video_image.video.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.video_image.video.entity.DirectLinkVideo;
+import org.springblade.video_image.video.entity.PointLeafNode;
 
 import java.util.List;
 
-public interface DirectLinkVideoMapper extends VideoBaseMapper {
+public interface DirectLinkVideoMapper {
 
     IPage<DirectLinkVideo> searchList(@Param("videoList") List<Long> var1, @Param("inUse") Integer var2, @Param("condition") String var3, IPage<DirectLinkVideo> var4);
 
@@ -24,4 +25,10 @@ public interface DirectLinkVideoMapper extends VideoBaseMapper {
     IPage<DirectLinkVideo> getVideoListOfRtmp(@Param("deptId") String var1, IPage<DirectLinkVideo> var2);
 
     List<DirectLinkVideo> getAllList(@Param("deptId") String var1);
+
+    int clearBindingRelation(@Param("videoList") List<Long> var1);
+
+    List<PointLeafNode> getVideoList(@Param("pointIdList") List<Long> var1);
+
+    int deleteById(long var1);
 }
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.xml b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.xml
index 15b7057..6e33a3c 100644
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.xml
+++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/DirectLinkVideoMapper.xml
@@ -14,18 +14,56 @@
         pointId
 	</sql>
 
+    <sql id="Video_Base_Column_List">
+        id, name, pointId, inUse
+    </sql>
+
+    <sql id="Clear_Condition">
+        <where>
+            <choose>
+                <when test="videoList != null and !videoList.isEmpty()">
+                    AND id IN (
+                    <foreach collection="videoList" item="videoId" separator=",">
+                        #{videoId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
+    <sql id="List_Condition">
+        <where>
+            <choose>
+                <when test="pointIdList != null and !pointIdList.isEmpty()">
+                    AND pointId IN (
+                    <foreach collection="pointIdList" item="pointId" separator=",">
+                        #{pointId}
+                    </foreach>
+                    )
+                </when>
+                <otherwise>
+                    AND 1 = 2
+                </otherwise>
+            </choose>
+        </where>
+    </sql>
+
     <update id="clearBindingRelation">
         UPDATE SYS_STATION_VIDEOPOINT
         SET	pointId = null
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
     </update>
 
     <select id="getVideoList" resultType="org.springblade.video_image.video.entity.PointLeafNode">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         SYS_STATION_VIDEOPOINT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.List_Condition"/>
+        <include refid="List_Condition"/>
     </select>
 
     <delete id="deleteById">
@@ -36,10 +74,10 @@
 
     <select id="searchList" resultType="org.springblade.video_image.video.entity.DirectLinkVideo">
         SELECT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Video_Base_Column_List"/>
+        <include refid="Video_Base_Column_List"/>
         FROM
         SYS_STATION_VIDEOPOINT
-        <include refid="org.springblade.video_image.video.mapper.VideoBaseMapper.Clear_Condition"/>
+        <include refid="Clear_Condition"/>
         <if test="inUse != null">
             AND inUse = #{inUse, jdbcType=SMALLINT}
         </if>
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.java
deleted file mode 100644
index d5500b9..0000000
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package org.springblade.video_image.video.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import org.springblade.video_image.video.entity.PointLeafNode;
-
-import java.util.List;
-
-public interface VideoBaseMapper{
-    int clearBindingRelation(@Param("videoList") List<Long> var1);
-
-    List<PointLeafNode> getVideoList(@Param("pointIdList") List<Long> var1);
-
-    int deleteById(long var1);
-}
diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.xml b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.xml
deleted file mode 100644
index d334a1e..0000000
--- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/video-image-service/src/main/java/org/springblade/video_image/video/mapper/VideoBaseMapper.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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="org.springblade.video_image.video.mapper.VideoBaseMapper">
-
-    <sql id="Video_Base_Column_List">
-		id, name, pointId, inUse
-	</sql>
-
-    <sql id="Clear_Condition">
-        <where>
-            <choose>
-                <when test="videoList != null and !videoList.isEmpty()">
-                    AND id IN (
-                    <foreach collection="videoList" item="videoId" separator=",">
-                        #{videoId}
-                    </foreach>
-                    )
-                </when>
-                <otherwise>
-                    AND 1 = 2
-                </otherwise>
-            </choose>
-        </where>
-    </sql>
-
-    <sql id="List_Condition">
-        <where>
-            <choose>
-                <when test="pointIdList != null and !pointIdList.isEmpty()">
-                    AND pointId IN (
-                    <foreach collection="pointIdList" item="pointId" separator=",">
-                        #{pointId}
-                    </foreach>
-                    )
-                </when>
-                <otherwise>
-                    AND 1 = 2
-                </otherwise>
-            </choose>
-        </where>
-    </sql>
-</mapper>
\ No newline at end of file