添加根据用名称查询登入对象的接口

dev-device/device-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -123,7 +123,6 @@ public class TaskServiceImpl implements TaskService {
         taskBto.setUserReadDetailList(new ArrayList<>());
         //set customInfo
         taskBto.setCustomInfo(customInfo);
-        update(taskBto);
         return taskBto;
     }
 

dev-device/device-train/src/main/java/com/tykj/dev/device/train/entity/vo/TrainThemeVo.java

@@ -40,7 +40,7 @@ public class TrainThemeVo {
     private String originatorName;
 
     @ApiModelProperty(value = "状态",example = "10")
-    private String trainStatus;
+    private Integer trainStatus;
 
     /**
      * 主办单位

dev-device/device-user/src/main/java/com/tykj/dev/device/user/util/AuthenticationUtils.java

 package com.tykj.dev.device.user.util;
 
+import com.tykj.dev.device.user.subject.entity.Role;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
+import com.tykj.dev.device.user.subject.entity.User;
+import com.tykj.dev.device.user.subject.entity.UserRole;
+import com.tykj.dev.device.user.subject.service.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 用户实体相关工具类
@@ -16,6 +25,18 @@ import org.springframework.security.core.context.SecurityContextHolder;
  **/
 @Slf4j
 public class AuthenticationUtils {
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserRoleService userRoleService;
+    @Autowired
+    private RoleService roleService;
+    @Autowired
+    private RolePermissionsService rolePermissionsService;
+    @Autowired
+    PermissionsService permissionsService;
+    @Autowired
+    UnitsService unitsService;
 
     public static String ANONYMOUS_USER_STRING = "anonymousUser";
     /***
@@ -37,4 +58,30 @@ public class AuthenticationUtils {
 
     }
 
+    /**
+     * 根据用户名称查询登入对象
+     * @param userName 用户名称
+     */
+    private SecurityUser findUserNameToSecurity(String userName) {
+        SecurityUser securityUser = new SecurityUser();
+        User user = userService.findByUserName(userName);
+        if (user == null) {
+            throw new UsernameNotFoundException("用户名不正确");
+        } else {
+            List<UserRole> userRoles = userRoleService.findByUserId(user.getUserId());
+            List<Integer> roleIds = new ArrayList<>();
+            if (userRoles != null) {
+                for (UserRole userRole : userRoles) {
+                    roleIds.add(userRole.getRoleId());
+                }
+            }
+            List<Role> roles = roleService.findAllByRoles(roleIds);
+            user.setUnits(unitsService.findById(user.getUnitsId()));
+            securityUser.setCurrentUserInfo(user);
+            securityUser.setRoleList(roles);
+            securityUser.setUsername(userName);
+            return securityUser;
+        }
+    }
+
 }