同步创客学堂表

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/SecurityConstants.java

@@ -53,7 +53,7 @@ public interface SecurityConstants {
 	String MOBILE = "mobile";
 
 	/**
-	 * 时空客户端
+	 * 客户端
 	 */
 	String KXS = "kxs";
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSchoolStudy.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -57,7 +54,9 @@ public class KxsSchoolStudy extends Model<KxsSchoolStudy> implements Serializabl
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private String delFlag;
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    private Integer delFlag;
 
 
     /**

kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -3,6 +3,7 @@ package com.kxs.transfer.api.controller;
 import com.alibaba.fastjson.JSON;
 import com.aliyun.dts.subscribe.clients.record.DefaultUserRecord;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.kxs.system.api.model.KxsSchoolStudy;
 import com.kxs.transfer.api.annotation.DtsMsgListener;
 import com.kxs.transfer.api.model.KxsDtsErrorLog;
 import com.kxs.transfer.api.model.KxsDtsLog;
@@ -12,6 +13,7 @@ import com.kxs.transfer.api.service.KxsDtsLogService;
 import com.kxs.transfer.api.service.product.KxsShopGoodsService;
 import com.kxs.transfer.api.service.sys.KxsMorningLogService;
 import com.kxs.transfer.api.service.sys.KxsMorningService;
+import com.kxs.transfer.api.service.sys.KxsSchoolStudyService;
 import com.kxs.transfer.api.service.user.*;
 import com.kxs.user.api.model.KxsPartner;
 import lombok.RequiredArgsConstructor;
@@ -50,6 +52,7 @@ public class DtsController {
     private final KxsLeaderAmountLogService kxsLeaderAmountLogService;
     private final KxsPartnerService kxsPartnerService;
     private final KxsMorningService kxsMorningService;
+    private final KxsSchoolStudyService kxsSchoolStudyService;
 
     //产品模块
     private final KxsShopGoodsService kxsShopGoodsService;
@@ -158,15 +161,19 @@ public class DtsController {
             if ("SchoolMorningMeetLog".equals(dmlData.getTableName())) {
                 kxsMorningService.changeLogData(dmlData);
             }
+            //创客学堂
+            if ("SchoolMakerStudy".equals(dmlData.getTableName())) {
+                kxsSchoolStudyService.changeData(dmlData);
+            }
 
 
             //存储历史数据
-            KxsDtsLog kxsDtsLog = new KxsDtsLog();
-            kxsDtsLog.setDataId(dataId);
-            kxsDtsLog.setContent(JSON.toJSONString(dmlData));
-            kxsDtsLog.setTableName(dmlData.getTableName());
-            kxsDtsLog.setOperation(dmlData.getOperation().toString());
-            kxsDtsLogService.save(kxsDtsLog);
+//            KxsDtsLog kxsDtsLog = new KxsDtsLog();
+//            kxsDtsLog.setDataId(dataId);
+//            kxsDtsLog.setContent(JSON.toJSONString(dmlData));
+//            kxsDtsLog.setTableName(dmlData.getTableName());
+//            kxsDtsLog.setOperation(dmlData.getOperation().toString());
+//            kxsDtsLogService.save(kxsDtsLog);
 
             //删除错误记录，不管有没有都删除，因为很快
             kxsDtsErrorLogService.removeById(dataId);

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/sys/KxsSchoolStudyMapper.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.mapper.sys;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表数据库访问层
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Mapper
+@DS("sys")
+public interface KxsSchoolStudyMapper extends BaseMapper<KxsSchoolStudy> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/sys/KxsSchoolStudyService.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.service.sys;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import com.kxs.transfer.api.model.table.DMLData;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表服务接口
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+public interface KxsSchoolStudyService extends IService<KxsSchoolStudy> {
+
+    void changeData(DMLData dmlData);
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/sys/impl/KxsSchoolStudyServiceImpl.java

@@ -0,0 +1,94 @@
+package com.kxs.transfer.api.service.sys.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.api.model.KxsMorning;
+import com.kxs.system.api.model.KxsSchoolStudy;
+import com.kxs.transfer.api.mapper.sys.KxsSchoolStudyMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.service.sys.KxsSchoolStudyService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 商学院创客学堂(KxsSchoolStudy)表服务实现类
+ *
+ * @author 系统
+ * @since 2023-12-15 12:16:31
+ */
+@Service("kxsSchoolStudyService")
+public class KxsSchoolStudyServiceImpl extends ServiceImpl<KxsSchoolStudyMapper, KxsSchoolStudy> implements KxsSchoolStudyService {
+
+    @Override
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsSchoolStudy schoolStudy = new KxsSchoolStudy();
+        schoolStudy.setId(id);
+
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "QueryCount":
+                    schoolStudy.setStudyPerson(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Status":
+                    schoolStudy.setDelFlag(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "SeoTitle":
+                    schoolStudy.setLecturer(validFieldDataMap.get(field).toString());
+                    break;
+                case "SeoKeyword":
+                    schoolStudy.setMenuId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Url":
+                    schoolStudy.setUrl(validFieldDataMap.get(field).toString());
+                    break;
+                case "ListPic":
+                    schoolStudy.setListPic(validFieldDataMap.get(field).toString());
+                    break;
+                case "Detail":
+                    schoolStudy.setDetail(validFieldDataMap.get(field).toString());
+                    break;
+                case "Title":
+                    schoolStudy.setTitle(validFieldDataMap.get(field).toString());
+                    break;
+                case "CreateDate":
+                    schoolStudy.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    schoolStudy.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+        if(schoolStudy.getDelFlag() != null && schoolStudy.getDelFlag() == -1){
+            baseMapper.deleteById(schoolStudy.getId());
+            return;
+        }
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            baseMapper.updateById(schoolStudy);
+        }
+        if(operation.equals(OperationType.INSERT)){
+            KxsSchoolStudy kxsSchoolStudy = baseMapper.selectById(schoolStudy.getId());
+            if (kxsSchoolStudy != null){
+                baseMapper.updateById(schoolStudy);
+            }else{
+                // 插入数据
+                baseMapper.insert(schoolStudy);
+            }
+        }
+    }
+}
+

kxs-transfer/src/main/resources/import.txt

@@ -102,3 +102,11 @@ SELECT
 Id as id, UserId as user_id, MeetId as morning_id
 from SchoolMorningMeetLog
 
+//创客学堂表
+select Id as id, CreateDate as create_time, UpdateDate as update_time, QueryCount as study_person,
+SeoTitle as lecturer, SeoKeyword as menu_id, Url as url, ListPic as list_pic, Detail as detail, Title as title
+FROM SchoolMakerStudy where `Status` > -1
+select Id as id,  CreateDate as create_time, UpdateDate as update_time, Sort as sort,
+ParentId as pid, ColDetail as col_detail, ColPicPath as col_pic_path, ColName as col_name, ColId as col_id
+FROM Col where id in(21,22,23,25,26,27,30)
+