调整

src/main/java/com/glxp/api/config/TaskPoolConfig.java

@@ -2,6 +2,7 @@ package com.glxp.api.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
@@ -15,6 +16,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class TaskPoolConfig {
 
     @Bean(name = "taskExecutor")
+    @Primary
     public ThreadPoolTaskExecutor taskExecutor() {
         // 获取当前主机的cpu核心数
         int threadCount = Runtime.getRuntime().availableProcessors();

src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java

@@ -9,10 +9,7 @@ import com.glxp.api.vo.inv.StockCompareVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
-* @author Administrator
-* @description 针对表【inv_stock_compare】的数据库操作Mapper
-* @createDate 2023-10-23 11:40:33
-* @Entity com.glxp.api.entity.inv.StockCompareEntity
+*  针对表【inv_stock_compare】的数据库操作Mapper
 */
 public interface StockCompareMapper extends BaseMapperPlus<StockCompareMapper,StockCompareEntity,StockCompareEntity> {
 

src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java

@@ -25,6 +25,11 @@ public class FilterMenuRequest extends ListPageRequest {
      */
     private String menuName;
 
+    /**
+     * 菜单名称
+     */
+    private String eqMenuName;
+
     /**
      * 显示顺序
      */

src/main/java/com/glxp/api/service/auth/CustomerService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.auth;
 
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.auth.UpdateUserRequset;
 import lombok.val;
@@ -18,9 +19,17 @@ public class CustomerService {
     @Resource
     private AuthAdminService authAdminService;
 
+    @Resource
+    private DeptService deptService;
+
     public AuthAdmin getUserBean() {
         Long userId = getUserId();
         AuthAdmin authAdmin = authAdminService.findById(userId.longValue());
+        if (authAdmin != null) {
+            DeptEntity dept = deptService.selectByCode(authAdmin.getLocDeptCode());
+            authAdmin.setDeptName(dept.getName());
+        }
+
         return authAdmin;
     }
 

src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java

@@ -304,7 +304,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
 
         FilterMenuRequest filterMenuRequest = new FilterMenuRequest();
         filterMenuRequest.setParentId(menu.getParentId());
-        filterMenuRequest.setMenuName(menu.getMenuName());
+        filterMenuRequest.setEqMenuName(menu.getMenuName());
         filterMenuRequest.setNeMenuId(menu.getMenuId() + "");
         List<SysMenu> menuList = sysMenuDao.selectMenuList(filterMenuRequest);
         if (CollUtil.isEmpty(menuList)) {

src/main/java/com/glxp/api/util/SnowflakeUtil.java

@@ -9,7 +9,7 @@ public class SnowflakeUtil {
     /**
      * 获取雪花id
      */
-    public static Long getId() {
+    public static synchronized Long getId() {
         int workId = RandomUtil.randomInt(0, 31);
         int dataCenterId = RandomUtil.randomInt(0, 31);
         return IdUtil.getSnowflake(workId, dataCenterId).nextId();

src/main/java/com/glxp/api/util/gs1/Session.java

@@ -16,7 +16,7 @@ final class Session {
 
   public Session(SessionType type, int length, boolean varied) {
     this.type = Validate.notNull(type);
-    Validate.isTrue(length > 0, "Session invalid lenght");
+    Validate.isTrue(length > 0, "Session invalid length");
     this.length = length;
     this.varied = varied;
   }

src/main/resources/mybatis/mapper/auth/SysMenuDao.xml

@@ -109,6 +109,9 @@
             <if test="menuName != null and menuName != '' ">
                 AND menu_name LIKE CONCAT('%',#{menuName},'%')
             </if>
+            <if test="eqMenuName != null and eqMenuName != '' ">
+                AND menu_name = #{eqMenuName}
+            </if>
             <if test="parentName != null and parentName != '' ">
                 AND `parent_name` = #{parentName}
             </if>