配置文件修改

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -1,18 +1,24 @@
 package cn.cslg.permission.service;
 
 import cn.cslg.permission.common.core.base.RedisConf;
-import cn.cslg.permission.common.model.vo.LoginRecordVO;
-import cn.cslg.permission.common.model.vo.LoginVO;
-import cn.cslg.permission.common.model.vo.PersonnelVO;
-import cn.cslg.permission.common.model.vo.RoleVO;
+import cn.cslg.permission.common.model.dto.EncryptionFunctionDTO;
+import cn.cslg.permission.common.model.dto.EncryptionLoginDTO;
+import cn.cslg.permission.common.model.vo.*;
 import cn.cslg.permission.common.utils.*;
 import cn.cslg.permission.common.utils.message.MessageUtils;
+import cn.cslg.permission.domain.Function;
 import cn.cslg.permission.domain.Personnel;
 import cn.cslg.permission.domain.ReSetPasswordDTO;
 import cn.cslg.permission.domain.Tenant;
+import cn.cslg.permission.domain.associate.AssoFunctionModule;
+import cn.cslg.permission.domain.associate.AssoPersonnelMachine;
+import cn.cslg.permission.mapper.FunctionMapper;
 import cn.cslg.permission.mapper.PersonnelMapper;
+import cn.cslg.permission.mapper.associate.AssoFunctionModuleMapper;
+import cn.cslg.permission.mapper.associate.AssoPersonnelMachineMapper;
 import cn.cslg.permission.service.associate.PerDpService;
 import cn.cslg.permission.service.associate.PersonRoleService;
+import cn.cslg.permission.service.associate.RoleFunctionDataService;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.CircleCaptcha;
@@ -22,14 +28,19 @@ import cn.hutool.crypto.SecureUtil;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import eu.bitwalker.useragentutils.UserAgent;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.ServletRequest;
 import java.util.*;
@@ -54,6 +65,17 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
     private final SystemService systemService;
     private final LoginRecordService loginRecordService;
     private final HttpServletRequest request;
+    private final RoleFunctionDataService roleFunctionDataService;
+    private final FunctionService functionService;
+    private final ApplicationService applicationService;
+    @Autowired
+    private PersonnelMapper personnelMapper;
+    @Autowired
+    private FunctionMapper functionMapper;
+    @Autowired
+    private AssoPersonnelMachineMapper assoPersonnelMachineMapper;
+    @Autowired
+    private AssoFunctionModuleMapper assoFunctionModuleMapper;
 
     /**
      * @param loginVO 登录参数类
@@ -371,9 +393,10 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
         }
         boolean flag = addOrUpdatePersonnelMachine(machineCode, personnel);
         EncryptionLoginVO loginVO = new EncryptionLoginVO();
-        if (flag) {
-            loginVO.setPrivateKey(personnel.getPrivateKey());
-        }
+//        if (flag) {
+//            loginVO.setPrivateKey(personnel.getPrivateKey());
+//        }
+        loginVO.setPrivateKey(personnel.getPrivateKey());
         loginVO.setPersonId(personId);
         loginVO.setPersonnelName(personnel.getPersonnelName());
         loginVO.setPersonnelUserName(personnel.getPersonnelUserName());