Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade' into upgrade

Browse Source 
# Conflicts:
#	src/main/resources/templates/populationinfo/list.html
This commit is contained in:
java_cuibaocheng@163.com 2023-11-26 23:02:01 +08:00
commit a8ad839ab7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/cm/population/config/AuthClientSecurityConfig.java
View File

@ -41,6 +41,7 @@ public class AuthClientSecurityConfig extends WebSecurityConfigurerAdapter {
.and() .and()
.logout().logoutSuccessUrl(authServer.getOauthLogout()) .logout().logoutSuccessUrl(authServer.getOauthLogout())
.and() .and()
// .authorizeRequests().antMatchers("/app/**", "/resource/**", "/route/file/**", "/assets/**","/route/bigdata/**", "/route/populationinfo-data/**",
.authorizeRequests().antMatchers("/app/**", "/resource/**", "/route/file/**", "/assets/**","/route/bigdata/**", .authorizeRequests().antMatchers("/app/**", "/resource/**", "/route/file/**", "/assets/**","/route/bigdata/**",
"/api/**").permitAll() "/api/**").permitAll()
.and() .and()
@ -48,7 +49,7 @@ public class AuthClientSecurityConfig extends WebSecurityConfigurerAdapter {
.anyRequest() .anyRequest()
.access("@clientRbacService.hasPermission(request, authentication)") .access("@clientRbacService.hasPermission(request, authentication)")
.and() .and()
.headers().frameOptions().sameOrigin() .headers().frameOptions().disable()
.and() .and()
.cors() .cors()
.and() .and()

3
src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
View File

@ -470,11 +470,14 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
List<PopulationInfoBaseDTO> populationInfoBaseDTOs = new ArrayList<>(); List<PopulationInfoBaseDTO> populationInfoBaseDTOs = new ArrayList<>();
int size = populationInfoIds.size(); int size = populationInfoIds.size();
int numThreads = size / 2 + (size % 2 == 0 ? 0 : 1); // 计算需要的线程数 int numThreads = size / 2 + (size % 2 == 0 ? 0 : 1); // 计算需要的线程数
numThreads = numThreads == 0 ? 1 : numThreads;
ExecutorService executorService = Executors.newFixedThreadPool(numThreads); ExecutorService executorService = Executors.newFixedThreadPool(numThreads);
List<Future<List<PopulationInfoBaseDTO>>> futures = new ArrayList<>(); List<Future<List<PopulationInfoBaseDTO>>> futures = new ArrayList<>();
// 将populationInfoIds分割成多个子列表，每个子列表由一个任务处理 // 将populationInfoIds分割成多个子列表，每个子列表由一个任务处理
int chunkSize = (int) Math.ceil((double) populationInfoIds.size() / numThreads); int chunkSize = (int) Math.ceil((double) populationInfoIds.size() / numThreads);
chunkSize = chunkSize == 0? 1 : chunkSize;
List<List<String>> chunks = Lists.partition(populationInfoIds, chunkSize); List<List<String>> chunks = Lists.partition(populationInfoIds, chunkSize);
for (List<String> chunk : chunks) { for (List<String> chunk : chunks) {

6
src/main/resources/templates/populationinfo/list.html
View File

@ -79,9 +79,9 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="petitionEvent"> <button type="button" class="layui-btn layui-btn-sm" lay-event="petitionEvent">
重点上访户 重点上访户
</button> </button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="tiaoshiEvent" style="display: none"> <!-- <button type="button" class="layui-btn layui-btn-sm" lay-event="tiaoshiEvent">-->
调试 <!-- 调试-->
</button> <!-- </button>-->
</div> </div>
</script> </script>
</div> </div>