From d6f2b17edd026559a7ec8133c1787b933737d794 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 15 Dec 2021 14:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=20stats=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/DemoController.java | 2 +-
 .../main/java/com/epmet/model/IndexExcelDataListener.java  | 1 -
 .../service/crm/impl/CustomerRelationServiceImpl.java      | 7 ++-----
 .../todata/impl/FactGridGovernDailyServiceImpl.java        | 2 +-
 .../todata/impl/FactOriginTopicMainDailyServiceImpl.java   | 4 ++--
 .../screen/impl/ShiBeiScreenCollServiceImpl.java           | 1 -
 .../com/epmet/service/impl/DataReportingServiceImpl.java   | 4 ++--
 .../java/com/epmet/service/impl/StatsUserServiceImpl.java  | 6 +++---
 .../epmet/service/stats/impl/DimQuarterServiceImpl.java    | 4 ++--
 .../com/epmet/support/normalizing/ScoreCalculator.java     | 5 +----
 10 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 191c03bf7e..ef567e92f1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -158,7 +158,7 @@ public class DemoController {
      */
     @GetMapping("testthreadpool")
     public void testThreadPool() {
-        System.out.println(LocalDateTime.now().getSecond());;
+        System.out.println(LocalDateTime.now().getSecond());
         System.out.println("----------->>");
         Future<Boolean> future1 = executorService.submit(() -> demoService.testThreadPool());
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
index 690543f0d2..687e04e0a7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java
@@ -35,7 +35,6 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
      * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
      */
     private static volatile boolean isGroup = false;
-    ;
     AtomicInteger total = new AtomicInteger(0);
     Map<String, IndexDictEntity> indexDicMap = new HashMap<>();
     Map<String, IndexGroupTemplateEntity> indexGroupMap = new HashMap<>();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
index 06d2b580fc..e199d2f46c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
@@ -67,10 +67,7 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
     @Override
     public boolean haveSubCustomer(String customerId) {
         List<CustomerRelationEntity> list = baseDao.selectListByPids(customerId);
-        if (null == list || list.isEmpty()) {
-            return false;
-        }
-        return true;
+        return null != list && !list.isEmpty();
     }
 
     /**
@@ -86,4 +83,4 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         }
         return baseDao.selectSubCustomer(customerId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
index a5bb954bef..c30fdf0878 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
@@ -307,7 +307,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
             // 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数
             int communityClosedCount= NumConstant.ZERO;
             // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
-            int streetClosedCount=NumConstant.ZERO;;
+            int streetClosedCount=NumConstant.ZERO;
             // 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数
             int districtDeptClosedCount=NumConstant.ZERO;
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
index 72888c5420..1ed3f51ba8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
@@ -215,7 +215,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
                 //判断用户是否是党员，调用相成写的方法
                 //话题发布人是否是党员：1是党员0不是。 默认0
                 if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
-                    mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
+                    mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE);
                 } else {
                     mainDailyEntity.setCreateTopicUserIsParty(false);
                 }
@@ -232,7 +232,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             logDailyEntity.setPids(gridInfoDTO.getPids());
             //判断用户是否是党员，调用相成写的方法
             if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
-                logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
+                logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE);
             } else {
                 logDailyEntity.setOperateUserIsParty(false);
             }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
index 4f0cbb1896..02e4df412b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
@@ -462,7 +462,6 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
         int month = calendar.get(Calendar.MONTH) + NumConstant.ONE;
         date[NumConstant.ZERO] = String.valueOf(year);
         date[NumConstant.ONE] = String.valueOf(month);
-        ;
         if (NumConstant.TEN >= month) {
             date[NumConstant.ONE] = NumConstant.ZERO_STR + month;
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 21a7c06860..82d1a4a0e0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -147,8 +147,8 @@ public class DataReportingServiceImpl implements DataReportingService {
 		if (StringUtils.isNotBlank(parentCustomer.getData())) {
 			epmetCodeMap = customerProjectCategoryDictService.getByCategoryCodeMap(parentCustomer.getData());
 		}
-		Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());;
-		//项目ID不为空时，因为只有一条，可以直接处理
+		Map<String, CustomerProjectCategoryDictEntity> codeMap = customerProjectCategoryDictService.getByCategoryCodeMap(formDTO.getCustomerId());
+        //项目ID不为空时，因为只有一条，可以直接处理
 		Map<String, CustomerProjectCategoryDictEntity> finalEpmetCodeMap = epmetCodeMap;
 		if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) {
 			list = projectList.stream().map(project -> {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
index bdc1999ff7..a3ccd6c5a1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
@@ -178,7 +178,7 @@ public class StatsUserServiceImpl implements StatsUserService {
             while (iterator.hasNext()) {
                 GmUploadEventFormDTO.DataList m = iterator.next();
                 AtomicReference<Boolean> bl = new AtomicReference<>(false);
-                StringBuffer gridPids = new StringBuffer("");
+                StringBuffer gridPids = new StringBuffer();
                 agencyList.forEach(ag -> {
                     if (m.getAgencyId().equals(ag.getId())) {
                         bl.set(true);
@@ -239,8 +239,8 @@ public class StatsUserServiceImpl implements StatsUserService {
             while (iterator.hasNext()) {
                 GmUploadDataFormDTO.DataList m = iterator.next();
                 AtomicReference<Boolean> bl = new AtomicReference<>(false);
-                StringBuffer pid = new StringBuffer("");
-                StringBuffer pids = new StringBuffer("");
+                StringBuffer pid = new StringBuffer();
+                StringBuffer pids = new StringBuffer();
                 agencyList.forEach(ag -> {
                     if (m.getAgencyId().equals(ag.getId())) {
                         bl.set(true);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
index 5bad47d7f0..250a54f690 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimQuarterServiceImpl.java
@@ -122,7 +122,7 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua
 
         Date now = new Date();
 
-        Date endQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM);;//初始化至当季
+        Date endQMonth = DateUtils.integrate(now, DateUtils.DATE_PATTERN_YYYYMM);//初始化至当季
         Date startQMonth;//从该季开始初始化，不包含该季
 
         if (latestDimEntity == null) {
@@ -199,4 +199,4 @@ public class DimQuarterServiceImpl extends BaseServiceImpl<DimQuarterDao, DimQua
         return yyyy.concat("年").concat(quarterName);
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
index 08ca203821..01906d5bae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/ScoreCalculator.java
@@ -159,10 +159,7 @@ public abstract class ScoreCalculator<T> {
      * @return
      */
     protected  <T> boolean validSourceArray(T[] sourceArray) {
-        if (sourceArray == null || sourceArray.length == 0) {
-            return false;
-        }
-        return true;
+        return sourceArray != null && sourceArray.length != 0;
     }
 
     /**