新增预设职级记录日志

kxs-transfer/src/main/java/com/kxs/transfer/api/mapper/user/KxsUserLevelLogMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.transfer.api.mapper.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.user.api.model.KxsUserLevelLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户预设职级日志表(KxsUserLevelLog)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-03-06 11:18:38
+ */
+@Mapper
+public interface KxsUserLevelLogMapper extends BaseMapper<KxsUserLevelLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/KxsUserLevelLogService.java

@@ -0,0 +1,15 @@
+package com.kxs.transfer.api.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.user.api.model.KxsUserLevelLog;
+
+/**
+ * 用户预设职级日志表(KxsUserLevelLog)表服务接口
+ *
+ * @author 系统
+ * @since 2024-03-06 11:18:38
+ */
+public interface KxsUserLevelLogService extends IService<KxsUserLevelLog> {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserLevelLogServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.transfer.api.service.user.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.transfer.api.mapper.user.KxsUserLevelLogMapper;
+import com.kxs.transfer.api.service.user.KxsUserLevelLogService;
+import com.kxs.user.api.model.KxsUserLevelLog;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户预设职级日志表(KxsUserLevelLog)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-03-06 11:18:38
+ */
+@Service("kxsUserLevelLogService")
+public class KxsUserLevelLogServiceImpl extends ServiceImpl<KxsUserLevelLogMapper, KxsUserLevelLog> implements KxsUserLevelLogService {
+
+}
+

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserPresetLogServiceImpl.java

@@ -1,17 +1,22 @@
 package com.kxs.transfer.api.service.user.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 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.transfer.api.mapper.user.KxsUserLevelLogMapper;
 import com.kxs.transfer.api.mapper.user.KxsUserPresetLogMapper;
 import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.transfer.api.model.table.FieldData;
 import com.kxs.transfer.api.service.user.KxsUserPresetLogService;
 import com.kxs.user.api.model.KxsUserAddress;
+import com.kxs.user.api.model.KxsUserLevelLog;
 import com.kxs.user.api.model.KxsUserPresetLog;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -22,12 +27,17 @@ import java.util.Map;
  * @since 2024-01-03 09:39:56
  */
 @Service("kxsUserPresetLogService")
+@RequiredArgsConstructor
 public class KxsUserPresetLogServiceImpl extends ServiceImpl<KxsUserPresetLogMapper, KxsUserPresetLog> implements KxsUserPresetLogService {
 
+    private final KxsUserLevelLogMapper kxsUserLevelLogMapper;
+
     @Override
     public void changeUser(DMLData dmlData) {
         //修改的字段值
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //全部字段值
+        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
         //修改的字段
         List<String> changeFieldList = dmlData.getChangeFieldList();
         //操作的主键
@@ -37,11 +47,12 @@ public class KxsUserPresetLogServiceImpl extends ServiceImpl<KxsUserPresetLogMap
         presetLog.setId(id);
         //操作类型
         OperationType operation = dmlData.getOperation();
-        if(operation.equals(OperationType.DELETE)){
+        if (operation.equals(OperationType.DELETE)) {
             // 更新数据
             baseMapper.deleteById(id);
             return;
         }
+
         for (String field : changeFieldList) {
 
             switch (field) {
@@ -64,21 +75,46 @@ public class KxsUserPresetLogServiceImpl extends ServiceImpl<KxsUserPresetLogMap
             }
         }
 
-        if(operation.equals(OperationType.UPDATE)){
+        if (operation.equals(OperationType.UPDATE)) {
             // 更新数据
             baseMapper.updateById(presetLog);
         }
-        if(operation.equals(OperationType.INSERT)){
+        if (operation.equals(OperationType.INSERT)) {
 
             KxsUserPresetLog userPresetLog = baseMapper.selectById(presetLog.getId());
-            if (userPresetLog != null){
+            if (userPresetLog != null) {
                 baseMapper.updateById(presetLog);
-            }else{
+            } else {
                 // 插入数据
                 baseMapper.insert(presetLog);
             }
         }
 
+        //新增记录
+        KxsUserLevelLog kxsUserLevelLog = new KxsUserLevelLog();
+
+        if (fieldDataMap.get("UserId").getValue() != null) {
+            kxsUserLevelLog.setUserId(Integer.valueOf(fieldDataMap.get("UserId").getValue().toString()));
+        }
+        if (fieldDataMap.get("Rank").getValue() != null) {
+            kxsUserLevelLog.setPresetLevel(Integer.valueOf(fieldDataMap.get("Rank").getValue().toString()));
+        }
+        if (fieldDataMap.get("QueryCount").getValue() != null) {
+            kxsUserLevelLog.setCreateById(Integer.valueOf(fieldDataMap.get("QueryCount").getValue().toString()));
+        }
+        if (fieldDataMap.get("CreateDate").getValue() != null) {
+            LocalDateTime date = LocalDateTimeUtil.parse(fieldDataMap.get("CreateDate").toString(), DatePattern.NORM_DATETIME_PATTERN);
+            kxsUserLevelLog.setStartTime(date);
+            kxsUserLevelLog.setCreateTime(date);
+        }
+        if (fieldDataMap.get("UpdateDate").getValue() != null) {
+            LocalDateTime date = LocalDateTimeUtil.parse(fieldDataMap.get("UpdateDate").toString(), DatePattern.NORM_DATETIME_PATTERN);
+            kxsUserLevelLog.setEndTime(date);
+        }
+        // 插入数据
+        if(kxsUserLevelLog.getEndTime() != null){
+            kxsUserLevelLogMapper.insert(kxsUserLevelLog);
+        }
     }
 }
 

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserServiceImpl.java

@@ -240,13 +240,16 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         }
         //新增数据必然没有实名信息，所以不做操作
         if(operation.equals(OperationType.INSERT)){
-            //加盐
-            String salt = UUID.randomUUID().toString();
-            user.setSalt(salt);
-            //登陆密码
-            user.setPassword(ENCODER.encode(user.getPassword() + salt));
-            user.setId(Integer.valueOf(userId));
-            baseMapper.insert(user);
+            KxsUser kxsUser = baseMapper.selectById(userId);
+            if(kxsUser == null){
+                //加盐
+                String salt = UUID.randomUUID().toString();
+                user.setSalt(salt);
+                //登陆密码
+                user.setPassword(ENCODER.encode(user.getPassword() + salt));
+                user.setId(Integer.valueOf(userId));
+                baseMapper.insert(user);
+            }
 
         }