From 6dd93982cad21b159840429970576f9d72150aef Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 4 Mar 2025 10:58:03 +0800
Subject: [PATCH] =?UTF-8?q?3/4=20sync=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/dao/sync/BasicExportDao.java |   3 +-
 .../dao/sync/SyncDataChangeBustypesDao.java   |   3 +-
 .../glxp/api/dao/sync/SyncEditLogMapper.java  |   7 +-
 .../glxp/api/dao/sync/SyncEditTypeMapper.java |   1 -
 .../api/service/sync/SyncEditLogService.java  |   2 +-
 .../mapper/schedule/SystemParamConfigDao.xml  |   2 +-
 .../mybatis/mapper/sync/SyncEditLogMapper.xml | 111 ------------------
 .../mapper/sync/SyncEditTypeMapper.xml        |  48 --------
 8 files changed, 9 insertions(+), 168 deletions(-)

diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java
index d4703e85..9e4f8c0a 100644
--- a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java
+++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java
@@ -1,6 +1,7 @@
 package com.glxp.api.dao.sync;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface BasicExportDao extends BaseMapper<BasicExportStatusEntity> {
+public interface BasicExportDao extends BaseMapperPlus<BasicExportDao,BasicExportStatusEntity,BasicExportStatusEntity> {
 
 
     List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);
diff --git a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java b/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java
index ba4a6d22..2a6cdc6f 100644
--- a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java
+++ b/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java
@@ -1,7 +1,8 @@
 package com.glxp.api.dao.sync;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
 
-public interface SyncDataChangeBustypesDao extends BaseMapper<SyncDataChangeBustypesEntity> {
+public interface SyncDataChangeBustypesDao extends BaseMapperPlus<SyncDataChangeBustypesDao,SyncDataChangeBustypesEntity,SyncDataChangeBustypesEntity> {
 }
diff --git a/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java b/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java
index 728c03de..1a28e664 100644
--- a/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java
+++ b/src/main/java/com/glxp/api/dao/sync/SyncEditLogMapper.java
@@ -1,12 +1,11 @@
 package com.glxp.api.dao.sync;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.sync.SyncEditLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface SyncEditLogMapper extends BaseMapper<SyncEditLogEntity> {
-    int insertOrUpdate(SyncEditLogEntity record);
+public interface SyncEditLogMapper extends BaseMapperPlus<SyncEditLogMapper,SyncEditLogEntity,SyncEditLogEntity> {
+    boolean insertOrUpdate(SyncEditLogEntity record);
 
-    int insertOrUpdateSelective(SyncEditLogEntity record);
 }
diff --git a/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java b/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java
index c7bb2977..cfcff0db 100644
--- a/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java
+++ b/src/main/java/com/glxp/api/dao/sync/SyncEditTypeMapper.java
@@ -8,5 +8,4 @@ import org.apache.ibatis.annotations.Mapper;
 public interface SyncEditTypeMapper extends BaseMapper<SyncEditTypeEntity> {
     int insertOrUpdate(SyncEditTypeEntity record);
 
-    int insertOrUpdateSelective(SyncEditTypeEntity record);
 }
diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java
index 4860f10d..2b3f973f 100644
--- a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java
+++ b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java
@@ -12,7 +12,7 @@ public class SyncEditLogService extends ServiceImpl<SyncEditLogMapper, SyncEditL
     @Resource
     SyncEditLogMapper syncEditLogMapper;
 
-    public int insertOrUpdate(SyncEditLogEntity record) {
+    public boolean insertOrUpdate(SyncEditLogEntity record) {
         return baseMapper.insertOrUpdate(record);
     }
 
diff --git a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml
index e65ac1aa..0e4a760b 100644
--- a/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml
+++ b/src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml
@@ -21,7 +21,7 @@
         </where>
         order BY id
     </select>
-    
+
     <select id="selectByParamKey" parameterType="com.glxp.api.req.system.FilterParamConfigRequest"
             resultType="com.glxp.api.entity.system.SystemParamConfigEntity">
         SELECT *
diff --git a/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml b/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml
index aa6e5674..afefc5ce 100644
--- a/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml
+++ b/src/main/resources/mybatis/mapper/sync/SyncEditLogMapper.xml
@@ -72,115 +72,4 @@
       updateTime = #{updateTime,jdbcType=TIMESTAMP},
     </trim>
   </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.sync.SyncEditLogEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into sync_edit_log
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="recordCode != null">
-        recordCode,
-      </if>
-      <if test="operType != null">
-        operType,
-      </if>
-      <if test="dataType != null">
-        dataType,
-      </if>
-      <if test="url != null">
-        url,
-      </if>
-      <if test="param != null">
-        param,
-      </if>
-      <if test="jsonResult != null">
-        jsonResult,
-      </if>
-      <if test="directType != null">
-        directType,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="operUser != null">
-        operUser,
-      </if>
-      <if test="updateTime != null">
-        updateTime,
-      </if>
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="recordCode != null">
-        #{recordCode,jdbcType=VARCHAR},
-      </if>
-      <if test="operType != null">
-        #{operType,jdbcType=TINYINT},
-      </if>
-      <if test="dataType != null">
-        #{dataType,jdbcType=VARCHAR},
-      </if>
-      <if test="url != null">
-        #{url,jdbcType=VARCHAR},
-      </if>
-      <if test="param != null">
-        #{param,jdbcType=VARCHAR},
-      </if>
-      <if test="jsonResult != null">
-        #{jsonResult,jdbcType=VARCHAR},
-      </if>
-      <if test="directType != null">
-        #{directType,jdbcType=TINYINT},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="operUser != null">
-        #{operUser,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-    on duplicate key update
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      <if test="recordCode != null">
-        recordCode = #{recordCode,jdbcType=VARCHAR},
-      </if>
-      <if test="operType != null">
-        operType = #{operType,jdbcType=TINYINT},
-      </if>
-      <if test="dataType != null">
-        dataType = #{dataType,jdbcType=VARCHAR},
-      </if>
-      <if test="url != null">
-        url = #{url,jdbcType=VARCHAR},
-      </if>
-      <if test="param != null">
-        param = #{param,jdbcType=VARCHAR},
-      </if>
-      <if test="jsonResult != null">
-        jsonResult = #{jsonResult,jdbcType=VARCHAR},
-      </if>
-      <if test="directType != null">
-        directType = #{directType,jdbcType=TINYINT},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="operUser != null">
-        operUser = #{operUser,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml b/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml
index cf2beeb1..c559a261 100644
--- a/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml
+++ b/src/main/resources/mybatis/mapper/sync/SyncEditTypeMapper.xml
@@ -43,52 +43,4 @@
       remark = #{remark,jdbcType=VARCHAR},
     </trim>
   </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.sync.SyncEditTypeEntity" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into sync_edit_type
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="code != null">
-        code,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="code != null">
-        #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-    on duplicate key update
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      <if test="code != null">
-        code = #{code,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
 </mapper>