manager|登陆调整

@@ -27,7 +27,7 @@ public class ConsignmentValidate {
       * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
     public ResponseVo preCheckAdd(AddBo bo){
-        if (bo == null || StringUtils.isEmpty(bo.getAccountNo()) || StringUtils.isEmpty(bo.getConsignmentCode()) ||
+        if (bo == null || StringUtils.isEmpty(bo.getConsignmentCode()) ||
                 StringUtils.isEmpty(bo.getRecipientCountry()) || StringUtils.isEmpty(bo.getShipperAccount()) ||
                 StringUtils.isEmpty(bo.getShipperCountry())){
             return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));

+package com.fedex.connect.common.dependencies.enums.sys;
+
+public enum RoleEnum {
+    SYSTEM(0L,"System","系统"),
+    CUSOTMER(1L,"Cusotmer","用户"),
+
+    ;
+
+
+    private Long code;
+    private  String enMsg;
+    private String msg;
+
+    RoleEnum(Long code, String enMsg,String msg) {
+        this.code = code;
+        this.enMsg = enMsg;
+        this.msg = msg;
+    }
+
+    public Long getCode() {
+        return code;
+    }
+
+    public void setCode(Long code) {
+        this.code = code;
+    }
+
+    public String getEnMsg() {
+        return enMsg;
+    }
+
+    public void setEnMsg(String enMsg) {
+        this.enMsg = enMsg;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

@@ -3,12 +3,14 @@ package com.fedex.connect.common.dependencies.repository.repo.log.impl;
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
 import com.fedex.connect.common.dependencies.repository.repo.log.IOperationRepository;
 import com.fedex.connect.common.model.log.Operation;
+import org.springframework.stereotype.Repository;
 
 /**
   * @Author mt
   * @Description 操作日志
   * @Date 2024/11/6
   */
+@Repository
 public class OperationRepositoryImpl extends BaseDao implements IOperationRepository {
     public void insert(Operation record){
         operationMapper.insert(record);

 package com.fedex.connect.manager.controller.sys.impl;
 
 
-import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.cache.CacheSystem;
 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.GsonUtils;
 import com.fedex.connect.common.dependencies.util.StringExtUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.common.enums.FCLSessionInfoEnum;
 import com.fedex.connect.manager.controller.base.BaseController;
@@ -18,6 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +40,9 @@ import java.util.*;
 @Api(value="SysAuthController",tags={"用户相关请求(无需token)"})
 public class SysAuthController extends BaseController implements ISysAuthController {
 
+    @Autowired
+    CacheSystem cacheSystem;
+
 
     @Value("${fcl.interface.logurl}")
     private String fclIndexLoginUrl;
@@ -138,8 +144,10 @@ public class SysAuthController extends BaseController implements ISysAuthControl
         loginRequest.setRememberMe(true);
         ResponseVo tokenResult = sysAuthService.createAccessToken(loginRequest, loginUser);
 
+
+        DictionaryEntries dicUserLoginType = cacheSystem.getDicUserLoginType(UserLoginTypeEnum.FCLLOGINREGISTRATION.getEnMsg());
         //记录日志
-        LogLoginDto dto = new LogLoginDto(loginUser.getId(), DatabaseConstants.USER_OPER_FCL_REGISTER,
+        LogLoginDto dto = new LogLoginDto(loginUser.getId(), dicUserLoginType.getId(),
                 localeMessageUtil.getMessage("auth_login_desc"));
         logLoginService.saveLoginLog(dto);
 

@@ -49,8 +49,6 @@ public class LogLoginDto {
     }
 
 
-    //InetAddress.getLocalHost().getHostAddress()
-
     /**
      * ID
      */

@@ -2,6 +2,7 @@ package com.fedex.connect.manager.data.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.enums.sys.UserTypeEnum;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.sys.User;
 import io.swagger.annotations.ApiModel;
@@ -46,8 +47,8 @@ public class SysUserDto {
     }
 
     public SysUserDto(String uuid, String contactname){
-        String fcl_acc_no = DatabaseConstants.FCL_PREFIX + "_" + uuid;
-        String fcl_pwd = DatabaseConstants.FCL_PREFIX + "_" + uuid + "_pwd";
+        String fcl_acc_no = UserTypeEnum.FCL.getEnMsg() + "_" + uuid;
+        String fcl_pwd = uuid + "_pwd";
 
         this.loginName = uuid;
         if (Utils.isNotEmpty(contactname)){
@@ -63,7 +64,6 @@ public class SysUserDto {
         this.companyName = null;
         this.unifiedBusinessNum = null;
         this.customsSerialNum = null;
-        this.typeCode = DatabaseConstants.DICT_USER_FEDEX_CODE;
     }
 
     /**

-package com.fedex.connect.manager.repository.repo.sys;
-
-import com.fedex.connect.common.model.bi.DictionaryEntries;
-import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
-
-import java.util.List;
-
-public interface IDictionaryEntriesRepository {
-    List<DictionaryEntries> selectByExample(DictionaryEntriesExample example);
-}

-package com.fedex.connect.manager.repository.repo.sys.impl;
-
-import com.fedex.connect.common.model.bi.DictionaryEntries;
-import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
-import com.fedex.connect.manager.repository.base.BaseDao;
-import com.fedex.connect.manager.repository.repo.sys.IDictionaryEntriesRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class DictionaryEntriesImpl extends BaseDao implements IDictionaryEntriesRepository {
-
-    @Override
-    public List<DictionaryEntries> selectByExample(DictionaryEntriesExample example) {
-        return dictionaryEntriesMapper.selectByExample(example);
-    }
-}

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public class RedisSlabRepositoryImpl extends BaseDao implements IRedisSlabRepository {
+public class RedisSlabExtImpl extends BaseDao implements IRedisSlabRepository {
 
     @Override
     public int insert(RedisSlab record) {

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public class UserRepositoryImpl extends BaseDao implements IUserRepository {
+public class UserExtRepositoryImpl extends BaseDao implements IUserRepository {
 
     @Override
     public List<User> selectByExample(UserExample example) {

 package com.fedex.connect.manager.service.sys.impl;
 
-import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
-import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.RoleExample;
 import com.fedex.connect.common.model.sys.UserRole;
@@ -16,11 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 处理角色相关Service
@@ -94,32 +88,7 @@ public class SysRoleServiceImpl extends BaseService implements ISysRoleService {
             criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
             criteria.andCodeEqualTo(roleCode);
             List<Role> roleInfoList = roleRepository.selectByExample(example);
-
-            //如果不存在，创建默认角色
-            if (roleInfoList == null || roleInfoList.isEmpty()){
-                Role defaultRole = new Role();
-                defaultRole.setCode(DatabaseConstants.DICT_ROLE_DEFAULT_CODE);
-                defaultRole.setName(DatabaseConstants.DICT_ROLE_DEFAULT_CODE.toUpperCase());
-                defaultRole.setRoleDesc(DatabaseConstants.DICT_ROLE_DEFAULT_CODE.toUpperCase());
-
-                //从数据字典获取角色类型
-                List<DictionaryEntries> userTypeList = CacheSystem.dictionaryMap.get(DatabaseConstants.DICT_ROLE_GOOUP_CODE);
-                if (userTypeList != null && !userTypeList.isEmpty()){
-                    Map<String,DictionaryEntries> userTypeDictMap = Utils.listOf(userTypeList).stream().filter(Objects::nonNull)
-                            .collect(Collectors.toMap(DictionaryEntries::getCode, d -> d));
-                    DictionaryEntries dictionary = userTypeDictMap.get(DatabaseConstants.DICT_ROLE_DEFAULT_CODE);
-                    defaultRole.setTypeId(dictionary == null ? 0 : dictionary.getId());
-                } else {
-                    defaultRole.setTypeId(0L);
-                }
-                defaultRole.setStatus(DatabaseConstants.GLOBAL_STATUS_VALID);
-                defaultRole.setCreateTime(new Date());
-                save(defaultRole);
-
-                return defaultRole;
-            } else {
             return roleInfoList.get(0);
-            }
         } catch (Exception e){
             log.error(LogShowModel.showException("Exception",e));
             return null;

@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.arithmetic.AESUtil;
 import com.fedex.connect.common.dependencies.authentication.EncryptProvider;
 import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.enums.sys.RoleEnum;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
@@ -24,7 +25,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -42,6 +42,9 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
     @Autowired
     private ISysUserRoleService sysUserRoleService;
 
+    @Autowired
+    CacheSystem cacheSystem;
+
     /**
      * 邮件过期时间
      */
@@ -55,7 +58,7 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
      */
     public User findUserByFcl(String fclUuid){
         try{
-            String fcl_pwd = DatabaseConstants.FCL_PREFIX + "_" + fclUuid + "_pwd";
+            String fcl_pwd = fclUuid + "_pwd";
 
             UserExample example = new UserExample();
             UserExample.Criteria criteria = example.createCriteria();
@@ -87,14 +90,10 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
         try{
             User user = SysUserDto.dtoToDao(dto);
             //从数据字典获取用户类型
-            List<DictionaryEntries> userTypeList = CacheSystem.dictionaryMap.get(DatabaseConstants.DICT_USER_GOOUP_CODE);
-            if (Utils.isNotEmpty(userTypeList)){
-                //从数据字典中获取用户类型
-                Map<String,DictionaryEntries> userTypeDictMap = Utils.listOf(userTypeList).stream().filter(Objects::nonNull)
-                        .collect(Collectors.toMap(DictionaryEntries::getCode, d -> d));
-                DictionaryEntries dictionary = userTypeDictMap.get(dto.getTypeCode());
-                user.setTypeId(dictionary == null ? 0 : dictionary.getId());
-            } else{
+            DictionaryEntries dicUserType = cacheSystem.getDicUserType(dto.getTypeCode());
+            if (dicUserType != null){
+                user.setTypeId(dicUserType.getId());
+            }else {
                 user.setTypeId(0L);
             }
             //对新增账户的密码进行加密
@@ -111,7 +110,7 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
 
             //当前阶段，权限采用默认权限
             if (saveUserCt > 0){
-                Role roleInfo = sysRoleService.findRoleByCode(DatabaseConstants.DICT_ROLE_DEFAULT_CODE);
+                Role roleInfo = sysRoleService.findRoleByCode(RoleEnum.CUSOTMER.getEnMsg());
                 //创建用户角色对应关系
                 sysUserRoleService.save(user.getId(), roleInfo.getId());
             }