系统消息已读表新增

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

@@ -0,0 +1,56 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+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.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 系统消息已读表(KxsSysMsgRead)表实体类
+ *
+ * @author 系统
+ * @since 2024-04-01 16:51:34
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsSysMsgRead extends Model<KxsSysMsgRead> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * id
+     */
+    @Schema(description = "id")
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+
+    /**
+     * 系统消息ID
+     */
+    @Schema(description = "系统消息ID")
+    private Integer msgId;
+
+
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsSysMsgReadMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsSysMsgRead;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统消息已读表(KxsSysMsgRead)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-01 16:51:34
+ */
+@Mapper
+public interface KxsSysMsgReadMapper extends BaseMapper<KxsSysMsgRead> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsSysMsgReadService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsSysMsgRead;
+
+/**
+ * 系统消息已读表(KxsSysMsgRead)表服务接口
+ *
+ * @author 系统
+ * @since 2024-04-01 16:51:34
+ */
+public interface KxsSysMsgReadService extends IService<KxsSysMsgRead> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsSysMsgReadServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsSysMsgReadMapper;
+import com.kxs.system.api.model.KxsSysMsgRead;
+import com.kxs.system.biz.service.KxsSysMsgReadService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 系统消息已读表(KxsSysMsgRead)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-04-01 16:51:34
+ */
+@Service("kxsSysMsgReadService")
+public class KxsSysMsgReadServiceImpl extends ServiceImpl<KxsSysMsgReadMapper, KxsSysMsgRead> implements KxsSysMsgReadService {
+
+}
+

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

@@ -244,6 +244,9 @@ public class DtsController {
             if ("MsgPlacard".equals(dmlData.getTableName())) {
                 kxsSysMsgService.changeSysData(dmlData);
             }
+            if ("MsgPlacardRead".equals(dmlData.getTableName())) {
+                kxsSysMsgService.changeSysReadData(dmlData);
+            }
             //系统弹窗表
             if ("MsgAlert".equals(dmlData.getTableName())) {
                 kxsSysMsgService.changeModalData(dmlData);

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/sys/KxsSysMsgReadMapper.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.KxsSysMsgRead;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统消息已读表(KxsSysMsgRead)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-04-01 16:51:34
+ */
+@Mapper
+@DS("sys")
+public interface KxsSysMsgReadMapper extends BaseMapper<KxsSysMsgRead> {
+
+}
+

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

@@ -7,11 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.product.api.model.KxsMachine;
 import com.kxs.product.api.model.KxsMerchant;
-import com.kxs.system.api.model.KxsAppModal;
-import com.kxs.system.api.model.KxsSysMsg;
-import com.kxs.system.api.model.KxsUserMsg;
+import com.kxs.system.api.model.*;
 import com.kxs.transfer.api.mapper.sys.KxsAppModalMapper;
 import com.kxs.transfer.api.mapper.sys.KxsSysMsgMapper;
+import com.kxs.transfer.api.mapper.sys.KxsSysMsgReadMapper;
 import com.kxs.transfer.api.mapper.sys.KxsUserMsgMapper;
 import com.kxs.transfer.api.mapper.user.KxsUserMapper;
 import com.kxs.transfer.api.model.table.DMLData;
@@ -35,6 +34,8 @@ public class KxsSysMsgService extends ServiceImpl<KxsSysMsgMapper, KxsSysMsg> {
 
     private final KxsAppModalMapper kxsAppModalMapper;
 
+    private final KxsSysMsgReadMapper kxsSysMsgReadMapper;
+
     public void changeUserData(DMLData dmlData) {
         //修改的字段值
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
@@ -288,5 +289,47 @@ public class KxsSysMsgService extends ServiceImpl<KxsSysMsgMapper, KxsSysMsg> {
         }
 
     }
+
+    public void changeSysReadData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsSysMsgRead sysMsgRead = new KxsSysMsgRead();
+        sysMsgRead.setId(id);
+
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    sysMsgRead.setUserId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+                case "PlacardId":
+                    sysMsgRead.setMsgId(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            kxsSysMsgReadMapper.updateById(sysMsgRead);
+        }
+        if(operation.equals(OperationType.INSERT)){
+            KxsSysMsgRead kxsSysMsgRead = kxsSysMsgReadMapper.selectById(sysMsgRead.getId());
+            if (kxsSysMsgRead != null){
+                kxsSysMsgReadMapper.updateById(sysMsgRead);
+            }else{
+                // 插入数据
+                kxsSysMsgReadMapper.insert(sysMsgRead);
+            }
+        }
+    }
+
+
 }
 

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

@@ -223,4 +223,22 @@ SELECT a.Id as id, a.UserId as user_id, a.CreateDate as create_time, a.UpdateDat
 a.MerchantNo as merchant_no, a.MerchantName as merchant_name, a.MerIdcardNo as merchant_card, a.MerchantMobile as merchant_phone,
 a.BrandId as brand_id, a.MerUserId as maker_user_id, a.MerUserType as is_maker, b.id as machine_id, a.StandardStatus as standard_status, a.StandardMonths as standard_months,
 a.Remark as remark
-FROM PosMerchantInfo a LEFT JOIN PosMachinesTwo b on a.KqSnNo = b.PosSn
+FROM PosMerchantInfo a LEFT JOIN PosMachinesTwo b on a.KqSnNo = b.PosSn
+
+--创客消息表
+SELECT Id as id, CreateDate as create_time, UpdateDate as update_time,
+UserId as user_id, MsgType as msg_type, BgPic as bg_pic, Title as title, Content as content, Url as url, Summary as summary, ReadFlag as read_flag
+FROM MsgPersonal
+
+-- 系统消息表
+SELECT Id as id, CreateDate as create_time, UpdateDate as update_time,EffectStartDate as start_time, EffectEndDate as end_time,
+MsgType as msg_type, BgPic as bg_pic, Title as title, Content as content, Url as url, Summary as summary, PushType as push_type, PushTime as push_time
+FROM MsgPlacard
+-- 系统消息已读表
+SELECT Id as id, UserId as user_id, PlacardId as msg_id FROM MsgPlacardRead
+
+-- APP弹窗表
+SELECT Id as id, CreateDate as create_time, UpdateDate as update_time,EffectStartDate as start_time, EffectEndDate as end_time, case Status when  0 then 0 when -1 then 1 else 0 end  del_flag,
+MsgType - 1 as msg_type, BgPic as bg_pic, Title as title, Content as content, Url as url,
+BtnText as btn_text, TimeByDay as time_by_day, IsWeekend as is_weekend, UrlParam as url_param
+FROM MsgAlert