Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-auth/src/main/java/com/epmet/StringRandomUtils.java

@@ -0,0 +1,32 @@
+package com.epmet;
+
+import com.epmet.commons.tools.constant.StrConstant;
+
+/**
+ * desc:随机生成字母
+ *
+ * @author: LiuJanJun
+ * @date: 2022/3/1 5:16 下午
+ * @version: 1.0
+ */
+public class StringRandomUtils {
+
+    public static String getRandomStr(int length){
+        String result = StrConstant.EPMETY_STR;
+        //小写字母范围: 97～122
+        for (int i = 0; i < length; i++) {
+                int randomNumber = 97 + (int) (Math.random()* (122+1-97));
+                result +=   (char)randomNumber;
+        }
+        return result;
+    }
+
+    public static void main(String[] args) {
+        StringRandomUtils test = new StringRandomUtils();
+        //测试
+        for (int i = 0; i < 1000000; i++) {
+            System.out.println(getRandomStr(5));
+        }
+    }
+
+}

epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@@ -68,30 +68,6 @@ public class LoginController {
 		}
 	}
 
-	/**
-	 * @description 基层治理平台登录验证码
-	 *
-	 * @param response
-	 * @return
-	 * @author wxz
-	 * @date 2021.10.25 14:19:40
-	 */
-	@GetMapping("ic-login-captcha")
-	public void icLoginCaptcha(HttpServletResponse response, String uuid) throws IOException {
-		try {
-			//生成图片验证码
-			BufferedImage image = captchaService.createIcLoginCaptcha(uuid);
-			response.reset();
-			response.setHeader("Cache-Control", "no-store, no-cache");
-			response.setContentType("image/jpeg");
-			ServletOutputStream out = response.getOutputStream();
-			ImageIO.write(image, "jpg", out);
-			out.close();
-		} catch (IOException e) {
-			log.error("获取登陆验证码异常", e);
-		}
-	}
-
 	/**
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result<java.lang.String>

epmet-auth/src/main/java/com/epmet/service/CaptchaService.java

@@ -23,16 +23,6 @@ public interface CaptchaService {
      */
     BufferedImage create(String uuid);
 
-    /**
-     * @description 基层治理平台登录验证码
-     *
-     * @param
-     * @return
-     * @author wxz
-     * @date 2021.10.25 14:15:30
-     */
-    BufferedImage createIcLoginCaptcha(String uuid);
-
     /**
      * 验证码效验
      * @param uuid  uuid

epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java

@@ -8,16 +8,17 @@
 
 package com.epmet.service.impl;
 
-import com.google.code.kaptcha.Producer;
+import com.epmet.StringRandomUtils;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.redis.CaptchaRedis;
 import com.epmet.service.CaptchaService;
+import com.google.code.kaptcha.Producer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.awt.image.BufferedImage;
-import java.util.UUID;
 
 /**
  * 验证码
@@ -35,8 +36,8 @@ public class CaptchaServiceImpl implements CaptchaService {
 
     @Override
     public BufferedImage create(String uuid) {
-        //生成验证码
+        //生成验证码 //producer.createText();
-        String captcha = producer.createText();
+        String captcha = StringRandomUtils.getRandomStr(NumConstant.FIVE);
         //logger.info("uuid:"+uuid+",生成的验证码:"+captcha);
         //保存验证码
         captchaRedis.set(uuid, captcha);
@@ -44,17 +45,6 @@ public class CaptchaServiceImpl implements CaptchaService {
         return producer.createImage(captcha);
     }
 
-    @Override
-    public BufferedImage createIcLoginCaptcha(String uuid) {
-        //生成验证码
-        String captchaText = producer.createText();
-        //logger.info("uuid:"+uuid+",生成的验证码:"+captcha);
-        //保存验证码
-        captchaRedis.setIcLoginCaptcha(uuid, captchaText);
-
-        return producer.createImage(captchaText);
-    }
-
     @Override
     public boolean validate(String uuid, String code) {
         String captcha = captchaRedis.get(uuid);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -1098,12 +1098,6 @@ public class DemoController {
         return new Result();
     }
 
-    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("ScreenExtractServiceImpl-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(3, 6,
-            10L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
-
     @Autowired
     private ScreenProjectCategoryGridAndOrgDailyService screenProjectCategoryGridAndOrgDailyService;
 
@@ -1118,20 +1112,20 @@ public class DemoController {
         if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
             List<String> daysBetween = DateUtils.getDaysBetween(startDate, endDate);
             daysBetween.forEach(d -> {
-                threadPool.submit(() -> {
+                executorService.submit(() -> {
                     screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,d);
                 });
-                threadPool.submit(() -> {
+                executorService.submit(() -> {
                     screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,d);
                 });
                 result.add(d);
                 redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("gridandorgdailynew"),customerId,result,3*24*60*60L);
             });
         }else {
-            threadPool.submit(() -> {
+            executorService.submit(() -> {
                 screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,dateId);
             });
-            threadPool.submit(() -> {
+            executorService.submit(() -> {
                 screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,dateId);
             });
             result.add(dateId);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java

@@ -5,7 +5,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
 
 /**
  * @Author zxc
@@ -23,13 +22,10 @@ import java.util.concurrent.*;
 @RestController
 @RequestMapping("screenextract")
 public class ScreenExtractDailyController {
-    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("ScreenExtractDailyController-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
-            10L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
     @Autowired
     private ScreenExtractService screenExtractService;
+    @Autowired
+    private ExecutorService executorService;
 
     /**
      * @param extractOriginFormDTO
@@ -39,7 +35,7 @@ public class ScreenExtractDailyController {
      */
     @PostMapping("extractdailyall")
     public Result screenExtractDaily(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        threadPool.submit(() -> {
+        executorService.submit(() -> {
             log.info("screenExtractDaily start,param:{}", JSON.toJSONString(extractOriginFormDTO));
             try {
                 screenExtractService.extractDailyAll(extractOriginFormDTO);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/IndexCalculateController.java

@@ -17,7 +17,6 @@ import com.epmet.model.CalculateFlagModel;
 import com.epmet.service.evaluationindex.indexcal.CpcIndexCalculateService;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.util.DimIdGenerator;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 /**
  * 指标计算controller
@@ -40,13 +40,6 @@ import java.util.concurrent.*;
 @RestController
 @RequestMapping("indexcalculate")
 public class IndexCalculateController {
-    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("manual_execute_indexcal-pool-%d").build();
-    ExecutorService singleThreadPool = new ThreadPoolExecutor(1, 1,
-            0L, TimeUnit.MILLISECONDS,
-            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-
-
     @Autowired
     private IndexCalculateService indexCalculateService;
 
@@ -55,6 +48,9 @@ public class IndexCalculateController {
 
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private ExecutorService executorService;
+
 
     // 计算同步锁
     private Object statsCalLock = new Object();
@@ -172,7 +168,7 @@ public class IndexCalculateController {
      * @return
      */
     private void submitCalculate(CalculateCommonFormDTO formDTO) {
-        Future<?> future = singleThreadPool.submit(() -> {
+        Future<?> future = executorService.submit(() -> {
             try {
                 long start = System.currentTimeMillis();
                 Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java

@@ -21,7 +21,6 @@ import com.epmet.service.stats.DimCustomerService;
 import com.epmet.service.user.StatsStaffPatrolService;
 import com.epmet.service.user.UserService;
 import com.epmet.util.DimIdGenerator;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -34,7 +33,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -47,11 +45,6 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class BizDataStatsServiceImpl implements BizDataStatsService {
-    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("bizDataStats-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(3, 6,
-            10L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
     @Autowired
     private CustomerStaffService customerStaffService;
     @Autowired

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java

@@ -311,7 +311,7 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
             //1、查询当前党员建了多少个组
             List<String> groupIdList = userCreatedGroups.get(partyMember.getUserId());
             if (CollectionUtils.isEmpty(groupIdList)) {
-                log.info("当前党员userId="+partyMember.getUserId()+"没有创建过小组, 【党员相关-党员自建群活跃群众人数】赋值0");
+                log.warn("当前党员userId="+partyMember.getUserId()+"没有创建过小组, 【党员相关-党员自建群活跃群众人数】赋值0");
                 map.put(partyMember.getUserId(), NumConstant.ZERO);
                 continue;
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java

@@ -30,11 +30,6 @@ import java.util.concurrent.ExecutorService;
 @Slf4j
 @Service
 public class IndexOriginExtractServiceImpl implements IndexOriginExtractService {
-    /*ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("indexOriginExtractAndCal-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
-            10L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());*/
     @Autowired
     private ExecutorService executorService;
     @Autowired
@@ -107,7 +102,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             try {
                 long startCpc = System.currentTimeMillis();
                 calCpcIndexService.calCpcPartyAbility(customerId, monthId);
-                log.error("党员相关-党建能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startCpc, param.getCustomerId());
+                log.info("党员相关-党建能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startCpc, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【党员相关数据】发生异常,参数:" + JSON.toJSONString(param), e);
             } finally {
@@ -118,21 +113,21 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             try {
                 long startGridGovern = System.currentTimeMillis();
                 calGridIndexService.calGridIndexGovernAbility(customerId, monthId);
-                log.error("网格相关-治理能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startGridGovern, param.getCustomerId());
+                log.info("网格相关-治理能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startGridGovern, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【网格治理能力数据】发生异常,参数:" + JSON.toJSONString(param), e);
             }
             try {
                 long startGridParty = System.currentTimeMillis();
                 calGridIndexService.calGridIndexPartyAbility(customerId, monthId);
-                log.error("网格相关-党建能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startGridParty, param.getCustomerId());
+                log.info("网格相关-党建能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startGridParty, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【网格党建能力数据】发生异常,参数:" + JSON.toJSONString(param), e);
             }
             try {
                 long startGridService = System.currentTimeMillis();
                 calGridIndexService.calGridIndexServiceAbility(customerId, monthId);
-                log.error("网格相关-服务能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startGridService, param.getCustomerId());
+                log.info("网格相关-服务能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startGridService, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【网格服务能力数据】发生异常,参数:" + JSON.toJSONString(param), e);
             }
@@ -142,7 +137,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             try {
                 long startCommunity = System.currentTimeMillis();
                 indexCollCommunityService.saveCommunityAbility(customerId, monthId);
-                log.error("社区相关-三大能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startCommunity, param.getCustomerId());
+                log.info("社区相关-三大能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startCommunity, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【社区治理能力-社区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
@@ -152,7 +147,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             try {
                 long startStreet = System.currentTimeMillis();
                 indexCollStreetService.saveStreetAbility(customerId, monthId);
-                log.error("街道相关-三大能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startStreet, param.getCustomerId());
+                log.info("街道相关-三大能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startStreet, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【街道治理能力-街道党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
@@ -162,7 +157,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             try {
                 long startDept = System.currentTimeMillis();
                 indexCollDistrictDepartmentService.saveDepartmentAbility(customerId, monthId);
-                log.error("区直部门相关-治理能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startDept, param.getCustomerId());
+                log.info("区直部门相关-治理能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startDept, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【区直部门治理能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
@@ -172,13 +167,13 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
             try {
                 long startDistrict = System.currentTimeMillis();
                 indexCollDistrictService.saveDistrictAbility(customerId, monthId);
-                log.error("全区相关-三大能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startDistrict, param.getCustomerId());
+                log.info("全区相关-三大能力执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - startDistrict, param.getCustomerId());
             } catch (Exception e) {
                 log.error("抽取【全区治理能力-全区党建能力-服务能力】发生异常,参数:" + JSON.toJSONString(param), e);
             }
             countDownLatch.countDown();
         });
-
+        log.info("indexOriginExtractAll======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - start, param.getCustomerId());
         try {
             //等前面都执行完 再执行计算指标得分
             countDownLatch.await();
@@ -197,6 +192,5 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
         } catch (InterruptedException e) {
             log.error("indexOriginExtractAll countDownLatch exception", e);
         }
-        log.info("indexOriginExtractAll及指标计算执行完毕======总耗时:{}ms，customerId:{}", System.currentTimeMillis() - start, param.getCustomerId());
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java

@@ -7,13 +7,10 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
-import com.epmet.service.StatsGroupService;
-import com.epmet.service.StatsTopicService;
 import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import com.epmet.service.stats.DimCustomerService;
 import com.epmet.util.DimIdGenerator;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +20,9 @@ import org.springframework.util.CollectionUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 
 /**
  * desc：抽取业务数据 到 统计库  汇聚类
@@ -31,12 +30,6 @@ import java.util.concurrent.*;
 @Slf4j
 @Service
 public class FactOriginExtractServiceImpl implements FactOriginExtractService {
-    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("factOriginExtract-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(3, 6,
-            10L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
-
     @Autowired
     private IssueExtractService issueExtractService;
     @Autowired
@@ -54,9 +47,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     @Autowired
     private  FactGroupActDailyService factGroupActDailyService;
     @Autowired
-    private StatsGroupService statsGroupService;
+    private ExecutorService executorService;
-    @Autowired
-    private StatsTopicService statsTopicService;
 
 
     @Override
@@ -106,7 +97,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
         }
         List<String> finalDaysBetween = daysBetween;
-        threadPool.submit(() -> {
+        executorService.submit(() -> {
             try {
                 CustomerIdAndDateIdFormDTO formDTO = new CustomerIdAndDateIdFormDTO();
                 formDTO.setCustomerId(param.getCustomerId());
@@ -132,7 +123,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 countDownLatch.countDown();
             }
         });
-        threadPool.submit(() -> {
+        executorService.submit(() -> {
             try {
                 ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
                 if (!isRange) {
@@ -156,7 +147,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 countDownLatch.countDown();
             }
         });
-        threadPool.submit(() -> {
+        executorService.submit(() -> {
             try {
                 log.debug("extractAll start param:{}", JSON.toJSONString(param));
                 ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
@@ -183,7 +174,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
                 countDownLatch.countDown();
             }
         });
-        threadPool.submit(() -> {
+        executorService.submit(() -> {
             try {
                 ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
                 if (!isRange) {
@@ -222,7 +213,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             }
         });
         //小组活动
-        threadPool.submit(() -> {
+        executorService.submit(() -> {
             try {
                 ExtractOriginFormDTO extractOriginFormDTO = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
                 if (!isRange) {
@@ -339,7 +330,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
 
     @Override
     public Future<?> submitProjectRelationData(ExtractOriginFormDTO param, List<String> finalDaysBetween) {
-        Future<?> submit = threadPool.submit(() -> {
+        Future<?> submit = executorService.submit(() -> {
             ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
             if (CollectionUtils.isEmpty(finalDaysBetween)) {
                 try {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -7,22 +7,17 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.distributedlock.LockConstants;
-import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
-import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactAgencyGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.todata.FactGridMemberStatisticsDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
-import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.service.evaluationindex.screen.*;
 import com.epmet.service.stats.DimCustomerService;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
@@ -33,7 +28,9 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author zxc
@@ -42,12 +39,6 @@ import java.util.concurrent.*;
 @Service
 @Slf4j
 public class ScreenExtractServiceImpl implements ScreenExtractService {
-    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("ScreenExtractServiceImpl-pool-%d").build();
-    ExecutorService threadPool = new ThreadPoolExecutor(3, 6,
-            10L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
-
     @Autowired
     private DimCustomerService dimCustomerService;
     @Autowired
@@ -65,8 +56,6 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     @Autowired
     private PublicPartiTotalDataExtractService publicPartiTotalDataExtractService;
     @Autowired
-    private IndexCalculateService indexCalculateService;
-    @Autowired
     private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
     @Autowired
     private ScreenGrassrootsGovernDataAbsorptionService screenGrassrootsGovernDataAbsorptionService;
@@ -81,10 +70,6 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     @Autowired
     private ScreenProjectSettleService screenProjectSettleService;
     @Autowired
-    private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
-    @Autowired
-    private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
-    @Autowired
     private FactGridGovernDailyService factGridGovernDailyService;
     @Autowired
     private FactAgencyGovernDailyService factAgencyGovernDailyService;
@@ -94,6 +79,9 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private ScreenProjectCategoryGridAndOrgDailyService screenProjectCategoryGridAndOrgDailyService;
     @Autowired
     private DistributedLock distributedLock;
+    @Autowired
+    private ExecutorService executorService;
+
 
     /**
      * @param extractOriginFormDTO
@@ -183,7 +171,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             lock = distributedLock.getLock(LockConstants.SCREEN_DAILY, NumConstant.SIX_HUNDRED_L, NumConstant.TEN_L, TimeUnit.SECONDS);
             //等待3个线程执行完毕后再 继续执行下一个客户的 避免死锁
             final CountDownLatch latch = new CountDownLatch(NumConstant.FOUR);
-            threadPool.submit(() -> {
+            executorService.submit(() -> {
                 //党员基本情况screen_cpc_base_data
                 try {
                     try {
@@ -215,7 +203,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 }
 
             });
-            threadPool.submit(() -> {
+            executorService.submit(() -> {
                 //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
                 try {
 
@@ -263,7 +251,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                     log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
             });
-            threadPool.submit(() -> {
+            executorService.submit(() -> {
                 try {
 
                     try {
@@ -283,7 +271,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                     log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
                 }
             });
-            threadPool.submit(() -> {
+            executorService.submit(() -> {
                 //治理能力排行screen_govern_rank_data
                 try {
                     try {
@@ -447,16 +435,6 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         } catch (Exception e) {
             log.error("党建引领抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
-        //已经挪到天抽取的抽取里了
-       /* try {
-            //基层治理 - 热心市民 screen_party_user_rank_data
-            ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-            param.setCustomerId(customerId);
-            param.setDateId(monthId);
-            screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
-        } catch (Exception e) {
-            log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + JSON.toJSONString(formDTO), e);
-        }*/
         try {
             // 项目(事件)数量分析按网格_按月统计
             screenProjectQuantityGridMonthlyService.extractionProjectGridMonthly(customerId, monthId);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.epmet.modules.topic.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -25,8 +24,8 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -37,19 +36,18 @@ import com.epmet.commons.tools.scan.result.AsyncScanTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.scan.result.VoiceResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
-import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.CommonDataFilterResultDTO;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.dto.result.UserInfoResultDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.commons.tools.enums.AchievementTypeEnum;
-import com.epmet.modules.feign.EpmetUserFeignClient;
-import com.epmet.modules.group.dao.GroupMessageDao;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.dao.GroupMessageDao;
 import com.epmet.modules.group.dao.ResiGroupDao;
@@ -58,7 +56,6 @@ import com.epmet.modules.group.entity.GroupMessageEntity;
 import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.entity.ResiGroupStatisticalEntity;
 import com.epmet.modules.group.redis.ResiGroupRedis;
-import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.topic.dao.ResiTopicAttachmentDao;
@@ -84,7 +81,6 @@ import com.epmet.resi.group.dto.topic.result.MyAuditingListResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicAuditResultDTO;
 import com.epmet.send.SendMqMsgUtil;
 import com.google.common.base.CharMatcher;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -97,7 +93,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -111,11 +106,6 @@ import java.util.stream.Collectors;
 public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicDraftEntity> implements TopicDraftService {
     private static Logger logger = LoggerFactory.getLogger(TopicDraftServiceImpl.class);
 
-    private ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("TopicDraftService-pool-%d").build();
-    private ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
-            1L, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
     @Autowired
@@ -125,12 +115,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
     @Autowired
     private ResiTopicOperationDao resiTopicOperationDao;
     @Autowired
-    private EpmetUserFeignClient epmetUserFeignClient;
-    @Autowired
     private ResiGroupDao resiGroupDao;
     @Autowired
-    private ResiGroupMemberDao resiGroupMemberDao;
-    @Autowired
     private ResiGroupStatisticalDao resiGroupStatisticalDao;
     @Autowired
     private ResiTopicDao resiTopicDao;