| 15 hours ago | Administrator | ![]() |
| 16 hours ago | Administrator | ![]() |
| 16 hours ago | Administrator | ![]() |
| 16 hours ago | Administrator | ![]() |
| 16 hours ago | Administrator | ![]() |
| 17 hours ago | Administrator | ![]() |
| src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/yinhe/entity/YHSysCompanyLevel.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/yinhe/res/YHMemberVo.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-dev.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-prod.yml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/application-test.yml | ●●●●● patch | view | raw | blame | history |
src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java
@@ -38,9 +38,9 @@ @Bean("mvcTaskExecutor") public ThreadPoolTaskExecutor mvcTaskExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setCorePoolSize(10); executor.setMaxPoolSize(50); executor.setQueueCapacity(300); executor.setCorePoolSize(20); executor.setMaxPoolSize(100); executor.setQueueCapacity(500); executor.setThreadNamePrefix("mvc-async-"); executor.setWaitForTasksToCompleteOnShutdown(true); executor.setAwaitTerminationSeconds(60); @@ -52,9 +52,9 @@ @Bean(FebsConstant.ASYNC_POOL) public ThreadPoolTaskExecutor asyncThreadPoolTaskExecutor(){ ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setCorePoolSize(5); executor.setMaxPoolSize(20); executor.setQueueCapacity(200); executor.setCorePoolSize(10); executor.setMaxPoolSize(50); executor.setQueueCapacity(300); executor.setKeepAliveSeconds(30); executor.setThreadNamePrefix("Febs-Async-Thread"); executor.setWaitForTasksToCompleteOnShutdown(true); src/main/java/cc/mrbird/febs/yinhe/entity/YHSysCompanyLevel.java
@@ -7,9 +7,13 @@ @TableName("sys_company_level") public class YHSysCompanyLevel extends YhBaseEntity { private String id; private String name; private String code; private Integer agentNum; private Integer token; private Integer memberNum; //是否允许换LOGO,banner 0-允许 1-不允许 private Integer limitLogo; } src/main/java/cc/mrbird/febs/yinhe/res/YHMemberVo.java
@@ -34,6 +34,9 @@ @ApiModelProperty(value = "公司ID") private String companyId; @ApiModelProperty(value = "是否允许换LOGO,banner 0-允许 1-不允许") private Integer limitLogo; @ApiModelProperty(value = "公司") private String companyName; src/main/java/cc/mrbird/febs/yinhe/service/impl/YhAiServiceImpl.java
@@ -86,6 +86,13 @@ yhMemberVo.setCompanyId(yhAiCompany.getId()); yhMemberVo.setCompanyName(yhAiCompany.getName()); yhMemberVo.setPhone(yhAiMember.getPhone()); String levelCode = yhAiCompany.getLevelCode(); YHSysCompanyLevel yhSysCompanyLevel = yhSysCompanyLevelMapper.selectOne( Wrappers.lambdaQuery(YHSysCompanyLevel.class) .eq(YHSysCompanyLevel::getCode, levelCode) ); yhMemberVo.setLimitLogo(yhSysCompanyLevel.getLimitLogo()); } return new FebsResponse().success().data(yhMemberVo); } @@ -542,7 +549,38 @@ YhAiMember yhAiMember = yhAiMemberMapper.selectOne(Wrappers.lambdaQuery(YhAiMember.class).eq(YhAiMember::getMemberUuid, memberUuid)); String companyId = yhAiMember.getCompanyId(); List<YHBannerVo> vos = new ArrayList<>(); YHAiCompany yhAiCompany = yhAiCompanyMapper.selectById(companyId); String levelCode = yhAiCompany.getLevelCode(); if (StrUtil.isNotEmpty(levelCode)){ YHSysCompanyLevel sysCompanyLevel = yhSysCompanyLevelMapper.selectOne( Wrappers.lambdaQuery(YHSysCompanyLevel.class) .eq(YHSysCompanyLevel::getCode, levelCode) ); Integer limitLogo = sysCompanyLevel.getLimitLogo(); if (1 == limitLogo){ List<YHAiBanner> list = yhAiBannerMapper.selectList( Wrappers.lambdaQuery(YHAiBanner.class) .eq(YHAiBanner::getState, 1) .isNull(YHAiBanner::getCompanyId) .orderByDesc(YHAiBanner::getSort) ); if (CollUtil.isNotEmpty(list)){ for (YHAiBanner aiBanner : list){ YHBannerVo vo = new YHBannerVo(); vo.setName(aiBanner.getName()); vo.setImageUrl(aiBanner.getImageUrl()); vo.setSort(aiBanner.getSort()); vos.add(vo); } } return new FebsResponse().success().data(vos); } } List<YHAiBanner> list = yhAiBannerMapper.selectList( Wrappers.lambdaQuery(YHAiBanner.class) .eq(YHAiBanner::getState, 1) @@ -569,6 +607,32 @@ YHLogoVo yhLogoVo = new YHLogoVo(); YHAiCompany yhAiCompany = yhAiCompanyMapper.selectById(companyId); String levelCode = yhAiCompany.getLevelCode(); if (StrUtil.isNotEmpty(levelCode)){ YHSysCompanyLevel sysCompanyLevel = yhSysCompanyLevelMapper.selectOne( Wrappers.lambdaQuery(YHSysCompanyLevel.class) .eq(YHSysCompanyLevel::getCode, levelCode) ); Integer limitLogo = sysCompanyLevel.getLimitLogo(); if (1 == limitLogo){ List<YHAiLogo> yhAiLogos = yhAiLogoMapper.selectList( Wrappers.lambdaQuery(YHAiLogo.class) .eq(YHAiLogo::getState, 1) .isNull(YHAiLogo::getCompanyId) ); if (CollUtil.isNotEmpty(yhAiLogos)){ YHAiLogo yhAiLogo = yhAiLogos.get(0); yhLogoVo.setName(yhAiLogo.getName()); yhLogoVo.setImageUrl(yhAiLogo.getImageUrl()); yhLogoVo.setDesription(yhAiLogo.getDesription()); } return new FebsResponse().success().data(yhLogoVo); } } List<YHAiLogo> yhAiLogos = yhAiLogoMapper.selectList( Wrappers.lambdaQuery(YHAiLogo.class) .eq(YHAiLogo::getState, 1) src/main/resources/application-dev.yml
@@ -6,8 +6,8 @@ hikari: connection-timeout: 30000 max-lifetime: 1800000 max-pool-size: 15 min-idle: 5 max-pool-size: 50 min-idle: 10 connection-test-query: select 1 pool-name: FebsHikariCP # 配置默认数据源 src/main/resources/application-prod.yml
@@ -6,8 +6,8 @@ hikari: connection-timeout: 30000 max-lifetime: 1800000 max-pool-size: 15 min-idle: 5 max-pool-size: 50 min-idle: 10 connection-test-query: select 1 pool-name: FebsHikariCP # 配置默认数据源 src/main/resources/application-test.yml
@@ -6,8 +6,8 @@ hikari: connection-timeout: 30000 max-lifetime: 1800000 max-pool-size: 15 min-idle: 5 max-pool-size: 50 min-idle: 10 connection-test-query: select 1 pool-name: FebsHikariCP # 配置默认数据源