From e0f80c905e3408bc5d0c6723e5cd16df58352ab5 Mon Sep 17 00:00:00 2001 From: wxy <1229384355@qq.com> Date: Fri, 22 Jul 2022 15:17:04 +0800 Subject: [PATCH] 去除多余的import --- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/TenantContext.java | 25 ------------------------- 2 files changed, 44 insertions(+), 78 deletions(-) delete mode 100644 juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/TenantContext.java diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java index 98bbb8d..2e4f283 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java @@ -1,35 +1,26 @@ package org.jeecg.modules.system.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.google.common.collect.Sets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.service.*; -import org.jeecg.modules.system.util.DoTaskThread; import org.jeecg.modules.system.util.IDNumberUtil; -import org.jeecg.modules.system.util.MultiThreadUtil; -import org.jeecg.modules.system.util.TaskThreadQuery; -import org.jeecg.modules.system.vo.FamilyVo; import org.jeecg.modules.system.vo.GaPunishVo; import org.jeecg.modules.system.vo.SpecialStudentVo; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; + /** @@ -189,49 +180,49 @@ public class AnalyzeController extends JeecgController queryByThread() { - Map familyMap = new HashMap<>(); - try { - long startTime = System.currentTimeMillis(); - // 数据集合大小，由调用者自己指定 - int listSize = gaDemographicService.count(); - // 开启的线程数 - int runSize = 25; - // 一个线程处理数据条数，如果库中有100条数据，开启20个线程，那么每一个线程执行的条数就是5条 - int count = listSize / runSize;//5 - // 创建一个线程池，数量和开启线程的数量一样 - ExecutorService executor = MultiThreadUtil.createThread(runSize); - // 计算sql语句中每个分页查询的起始和结束数据下标 - // 循环创建线程 - //此处调用具体的查询方法 - List>> taskList = new ArrayList>>();//创建任务 - System.out.println("开始查询线程总数" + runSize); - for (int i = 0; i < runSize; i++) { - int index = i * count; - int num = count; - Callable> task= new DoTaskThread(gaDemographicService,index, num);//条件查询，name没有就给null - taskList.add(task); - } - List>> futureList = executor.invokeAll(taskList); - System.out.println(futureList.size()); - if (futureList != null && futureList.size() > 0){ - for (Future> future:futureList) { - if(future.get() != null) { - familyMap.putAll(future.get()); - } - } - } - executor.shutdown();//关闭线程 - long endTime = System.currentTimeMillis(); - long s = ((endTime - startTime) / 1000); - System.out.println(runSize + "个线程查询花了" + s + "秒" ); - System.out.println("总条数"+familyMap.size() ); - } catch (Exception e) { - e.printStackTrace(); - log.info(String.valueOf(e)); - } - return familyMap; - } +// public Map queryByThread() { +// Map familyMap = new HashMap<>(); +// try { +// long startTime = System.currentTimeMillis(); +// // 数据集合大小，由调用者自己指定 +// int listSize = gaDemographicService.count(); +// // 开启的线程数 +// int runSize = 25; +// // 一个线程处理数据条数，如果库中有100条数据，开启20个线程，那么每一个线程执行的条数就是5条 +// int count = listSize / runSize;//5 +// // 创建一个线程池，数量和开启线程的数量一样 +// ExecutorService executor = MultiThreadUtil.createThread(runSize); +// // 计算sql语句中每个分页查询的起始和结束数据下标 +// // 循环创建线程 +// //此处调用具体的查询方法 +// List>> taskList = new ArrayList>>();//创建任务 +// System.out.println("开始查询线程总数" + runSize); +// for (int i = 0; i < runSize; i++) { +// int index = i * count; +// int num = count; +// Callable> task= new DoTaskThread(gaDemographicService,index, num);//条件查询，name没有就给null +// taskList.add(task); +// } +// List>> futureList = executor.invokeAll(taskList); +// System.out.println(futureList.size()); +// if (futureList != null && futureList.size() > 0){ +// for (Future> future:futureList) { +// if(future.get() != null) { +// familyMap.putAll(future.get()); +// } +// } +// } +// executor.shutdown();//关闭线程 +// long endTime = System.currentTimeMillis(); +// long s = ((endTime - startTime) / 1000); +// System.out.println(runSize + "个线程查询花了" + s + "秒" ); +// System.out.println("总条数"+familyMap.size() ); +// } catch (Exception e) { +// e.printStackTrace(); +// log.info(String.valueOf(e)); +// } +// return familyMap; +// } /** * 来源数据 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/TenantContext.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/TenantContext.java deleted file mode 100644 index ddd5379..0000000 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/TenantContext.java +++ /dev/null @@ -1,25 +0,0 @@ -//package org.jeecg.modules.system.util; -// -//import lombok.extern.slf4j.Slf4j; -// -///** -// * 多租户 tenant_id存储器 -// */ -//@Slf4j -//public class TenantContext { -// -// private static ThreadLocal currentTenant = new ThreadLocal<>(); -// -// public static void setTenant(String tenant) { -// log.debug(" setting tenant to " + tenant); -// currentTenant.set(tenant); -// } -// -// public static String getTenant() { -// return currentTenant.get(); -// } -// -// public static void clear(){ -// currentTenant.remove(); -// } -//} -- libgit2 0.21.4