manager-server | 修改 |

未记录运单信息
mt
2025年5月29日14:26:40

@@ -131,6 +131,7 @@ public class OperationLogAspect {
 
         //获取用户信息。 login,logout,oss登录特殊处理
         User user = CurrentUserInfo.getUser();
+        log.setLoginName(user.getLoginName());
         log.setUserId(user.getId());
         log.setUserName(user.getUserName());
         //请求时间

@@ -7,6 +7,7 @@ import com.fedex.connect.common.dependencies.contants.ParamConfigConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.sys.UserLoginTypeEnum;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
 import com.fedex.connect.common.dependencies.util.StringExtUtil;
@@ -141,6 +142,14 @@ public class SysAuthController extends BaseController implements ISysAuthControl
             //如果用户不存在，则创建FCL用户信息
             SysUserDto dto = new SysUserDto(fcl_uuid, fcl_contactname);
             sysUserService.initUserInfo(fclInfoDto,dto);
+            try {
+                /**
+                 * 初始化表基础字段
+                 */
+                AssignmentFieldUtils.assignmentTableBaseField(dto);
+            }catch(Exception ex){
+                log.error("用户登录初始化账号基础信息失败：",ex);
+            }
             loginUser = sysUserService.save(dto);
         } else {
             //首先对用户中的姓名进行解密
@@ -158,7 +167,14 @@ public class SysAuthController extends BaseController implements ISysAuthControl
                 } else {
                     loginUser.setUserName(StringUtils.trimToEmpty(fcl_contactname));
                 }
-                loginUser.setModifyTime(new Date());
+                try {
+                    /**
+                     * 初始化表基础字段
+                     */
+                    AssignmentFieldUtils.assignmentTableBaseField(loginUser);
+                }catch(Exception ex){
+                    log.error("用户登录初始化账号基础信息失败：",ex);
+                }
                 sysUserService.initUserInfo(fclInfoDto,loginUser);
                 sysUserService.update(loginUser);
             }
@@ -171,7 +187,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
 
         DictionaryEntries dicUserLoginType = cacheSystem.getDicUserLoginType(UserLoginTypeEnum.FCLLOGINREGISTRATION.getCode());
         //记录日志
-        LogLoginDto dto = new LogLoginDto(loginUser.getId(), dicUserLoginType.getId(),
+        LogLoginDto dto = new LogLoginDto(loginUser.getId(), dicUserLoginType.getCode(),
                 UserLoginTypeEnum.LOGIN.getMsg());
         logLoginService.saveLoginLog(dto);
         try{
@@ -282,7 +298,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
                 //插入日志
                 User sysUser = sysUserService.findById(Long.parseLong(id));
                 DictionaryEntries dicUserLoginType = cacheSystem.getDicUserLoginType(UserLoginTypeEnum.EXIT.getCode());
-                LogLoginDto dto = new LogLoginDto(sysUser.getId(), dicUserLoginType.getId(),
+                LogLoginDto dto = new LogLoginDto(sysUser.getId(), dicUserLoginType.getCode(),
                         UserLoginTypeEnum.EXIT.getMsg());
                 logLoginService.saveLoginLog(dto);
             }

 package com.fedex.connect.manager.data.dto;
 
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.model.log.UserLoginInfo;
+import lombok.Data;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -12,12 +14,13 @@ import java.util.Date;
  * 不建议反射：数据量上来反射copy很慢。set最快
  * dao 转dto 看业务是否需要了。
  */
+@Data
 public class LogLoginDto {
 
     /**
      * 重载构造函数
      */
-    public LogLoginDto(Long userId, Long operType, String operDesc){
+    public LogLoginDto(Long userId, String operType, String operDesc){
         this.userId = userId;
         this.operTime = new Date();
         this.operType = operType;
@@ -42,9 +45,19 @@ public class LogLoginDto {
         if (dto.getId() != null && dto.getId() != 0){
             log.setId(dto.getId());
         }
+        log.setOperTypeCode(dto.getOperType());
+        log.setOperTypeName(dto.getOperDesc());
         log.setUserId(dto.getUserId());
         log.setOperDesc(dto.getOperDesc());
         log.setIp(dto.getIp());
+        try {
+            /**
+             * 初始化表基础字段
+             */
+            AssignmentFieldUtils.assignmentTableBaseField(dto);
+        }catch(Exception ex){
+            ex.printStackTrace();
+        }
         return log;
     }
 
@@ -66,9 +79,14 @@ public class LogLoginDto {
 
     /**
      * 操作类型
-     1：登录 2：退出 3：修改密码4：FCL登录注册
+     userLoginType_01 登录
+     userLoginType_02 退出
+     userLoginType_03 修改密码
+     userLoginType_04 FCL登录注册
+     userLoginType_05 停用
+     userLoginType_06 启用
      */
-    private Long operType;
+    private String operType;
 
     /**
      * 操作描述
@@ -79,64 +97,4 @@ public class LogLoginDto {
      * IP
      */
     private String ip;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Date getOperTime() {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime) {
-        this.operTime = operTime;
-    }
-
-    public Long getOperType() {
-        return operType;
-    }
-
-    public void setOperType(Long operType) {
-        this.operType = operType;
-    }
-
-    public String getOperDesc() {
-        return operDesc;
-    }
-
-    public void setOperDesc(String operDesc) {
-        this.operDesc = operDesc;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public LogLoginDto() {
-    }
-
-    public LogLoginDto(Long id, Long userId, Date operTime, Long operType, String operDesc, String ip) {
-        this.id = id;
-        this.userId = userId;
-        this.operTime = operTime;
-        this.operType = operType;
-        this.operDesc = operDesc;
-        this.ip = ip;
-    }
 }

 package com.fedex.connect.manager.service.log.impl;
 
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.manager.data.dto.LogLoginDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.base.BaseService;

@@ -71,7 +71,7 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
             UserExample example = new UserExample();
             UserExample.Criteria criteria = example.createCriteria();
             criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
-            criteria.andLoginNameEqualTo(fclUuid);
+            criteria.andUserUuidEqualTo(fclUuid);
             //criteria.andFedexAccNoEqualTo(fclUuid);
             example.setOrderByClause("ID DESC");