From 2b5358886dd4f70d19ca07cf1d5182a5a4b8486d Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 27 Dec 2021 18:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=AB=E6=8F=8F=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=20=E9=AB=98=E7=BA=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java    | 4 ++--
 .../dataaggre/service/impl/QuestionnaireServiceImpl.java     | 1 +
 .../com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java  | 1 +
 .../epmet/service/impl/ComponentVerifyTicketServiceImpl.java | 1 +
 .../com/epmet/service/impl/BlockChainUploadServiceImpl.java  | 5 +++--
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java    | 3 ++-
 .../notice/service/impl/NoticeCommentServiceImpl.java        | 3 ++-
 .../com/epmet/handler/ExcelDiceAddressListHandlerImpl.java   | 1 +
 .../java/com/epmet/service/impl/VolunteerServiceImpl.java    | 2 +-
 9 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index a77e2be2ad..a2bf983121 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -410,7 +410,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                             //单选
                             if(originalData.containsKey(key)){
                                 Integer answer = (Integer) originalData.get(key);
-                                if (null != answer && optionDTO.getValue() == answer) {
+                                if (null != answer && optionDTO.getValue().equals(answer)) {
                                     currentCount += 1;
                                 }
                             }
@@ -442,7 +442,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                         //单选
                         if(originalData.containsKey(key)){
                             Integer answer = (Integer) originalData.get(key);
-                            if (null != answer && optionDTO.getValue() == answer) {
+                            if (null != answer && optionDTO.getValue().equals(answer)) {
                                 currentCount += 1;
                             }
                         }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
index 7beb020f3b..9c5d9a3968 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/QuestionnaireServiceImpl.java
@@ -61,6 +61,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService, ResultDat
      * @author wxz
      * @date 2021.09.23 17:45:25
      */
+    @Override
     public PermissionValidateResultDTO resiPermissionValidate(String projectKey, String userId, String gridId) {
 
         PrUserProjectEntity project = prUserProjectService.getProjectEntityBykey(projectKey);
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java
index 7330d1e3ae..b16637127f 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/externalapp/ExtAppJwtAuthProcessor.java
@@ -20,6 +20,7 @@ public class ExtAppJwtAuthProcessor extends ExtAppAuthProcessor {
     @Autowired
     private ExtAppJwtTokenUtils jwtTokenUtils;
 
+    @Override
     public ExternalAppAuthResultDTO auth(String appId, String token, Long ts) {
         String secret;
         if (StringUtils.isBlank(secret = getTokenByAppId(appId))) {
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
index cf8bd2ffc6..0598e6e43d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@@ -266,6 +266,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
      * @author wxz
      * @date 2021.08.30 17:12:15
      */
+    @Override
     public void pushComponentAccessToken2PrivateEpmetPlatforms(ComponentAccessTokenFormDTO input) {
         List<ThirdPlatformActionsResultDTO> platforms = thirdPlatformService.listPlatformsByActionKey(ThirdPlatformActions.PUSH_COMPONENT_ACCESS_TOKEN);
         platforms.stream().forEach(p -> {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
index 9a8837f120..c3afaa5341 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/BlockChainUploadServiceImpl.java
@@ -34,12 +34,13 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
      * @param processEntity 处理进展entity
      * @param assignedStaffEntities 指派给的工作人员entity
      */
+    @Override
     public void send2BlockChain(ProjectEntity projectEntity, ProjectProcessEntity processEntity, List<ProjectStaffEntity> assignedStaffEntities, String projectStaffId) {
 
         if (true) {
             return;
         }
-        
+
         // 1.项目主信息
         BlockChainProjectFormDTO project = null;
 
@@ -131,7 +132,7 @@ public class BlockChainUploadServiceImpl implements BlockChainUploadService {
             handledStaff.setOrgIdPath(handledStaffEntity.getOrgIdPath());
             handledStaff.setProjectId(handledStaffEntity.getProjectId());
         }
-        
+
         if (project == null) {
             // 处理
             BlockChainProcessProjectFormDTO processForm = new BlockChainProcessProjectFormDTO();
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index ab54bfd340..a64b74ee99 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -233,6 +233,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
      * @param formDTO
      * @return
      */
+    @Override
     public EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO){
         return getEventDetailResultDTO(formDTO.getResiEventId());
     }
@@ -767,4 +768,4 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
index cc56eb670d..ed086cd426 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -243,6 +243,7 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
      * @Author sun
      * @Description 文字、图片安全校验
      **/
+    @Override
     public void safetyCheck(List<String> wordList, List<String> imageList) {
         if (imageList.size() != NumConstant.ZERO) {
             wordList.forEach(word -> {
@@ -286,4 +287,4 @@ public class NoticeCommentServiceImpl extends BaseServiceImpl<NoticeCommentDao,
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/handler/ExcelDiceAddressListHandlerImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/handler/ExcelDiceAddressListHandlerImpl.java
index b03634c761..1a84ac79e9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/handler/ExcelDiceAddressListHandlerImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/handler/ExcelDiceAddressListHandlerImpl.java
@@ -21,6 +21,7 @@ public class ExcelDiceAddressListHandlerImpl implements IExcelDictHandler {
      * @param dict 字典Key
      * @return
      */
+    @Override
     public List<Map> getList(String dict) {
         List<Map>           list    = new ArrayList<>();
         Map<String, String> dictMap = new HashMap<>();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
index edc1149e6f..715c280a55 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java
@@ -17,7 +17,6 @@ import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.VolunteerService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,6 +53,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
      * @param customerId
      * @return
      */
+    @Override
     public VolunteerDistributionResultDTO getVolunteerDistributionAndLegends(String customerId) {
 
         // 1.查询分布