diff --git a/src/main/java/com/glxp/api/config/TaskPoolConfig.java b/src/main/java/com/glxp/api/config/TaskPoolConfig.java index 06f722079..53e1beaaa 100644 --- a/src/main/java/com/glxp/api/config/TaskPoolConfig.java +++ b/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(); diff --git a/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java b/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java index d1acaf051..bb45e5925 100644 --- a/src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java +++ b/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 { diff --git a/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java b/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java index 1d550b91d..4a17eddcd 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java +++ b/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; + /** * 显示顺序 */ diff --git a/src/main/java/com/glxp/api/service/auth/CustomerService.java b/src/main/java/com/glxp/api/service/auth/CustomerService.java index 4ac834d2f..fe8717a14 100644 --- a/src/main/java/com/glxp/api/service/auth/CustomerService.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java index 4962b7ac2..c119e76af 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java +++ b/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 menuList = sysMenuDao.selectMenuList(filterMenuRequest); if (CollUtil.isEmpty(menuList)) { diff --git a/src/main/java/com/glxp/api/util/SnowflakeUtil.java b/src/main/java/com/glxp/api/util/SnowflakeUtil.java index 77a7f381d..393fab88b 100644 --- a/src/main/java/com/glxp/api/util/SnowflakeUtil.java +++ b/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(); diff --git a/src/main/java/com/glxp/api/util/gs1/Session.java b/src/main/java/com/glxp/api/util/gs1/Session.java index 116d3b517..06daa68ff 100644 --- a/src/main/java/com/glxp/api/util/gs1/Session.java +++ b/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; } diff --git a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index 4ef79b4ab..527cf5927 100644 --- a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -109,6 +109,9 @@ AND menu_name LIKE CONCAT('%',#{menuName},'%') + + AND menu_name = #{eqMenuName} + AND `parent_name` = #{parentName}