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

 Conflicts:

	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java

	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java

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

@@ -95,8 +95,18 @@ public class FactOriginExtractController {
 
     @PostMapping("project")
     public Result projectData(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        if (null != extractOriginFormDTO) {
-            projectExtractService.saveOriginProjectDaily(extractOriginFormDTO);
+        if (StringUtils.isNotBlank(extractOriginFormDTO.getCustomerId())) {
+            List<String> daysBetween;
+            if (StringUtils.isBlank(extractOriginFormDTO.getDateId())) {
+                daysBetween = DateUtils.getDaysBetween(extractOriginFormDTO.getStartDate(), extractOriginFormDTO.getEndDate());
+                daysBetween.forEach(dateId -> {
+                    extractOriginFormDTO.setDateId(dateId);
+                    projectExtractService.saveOriginProjectDaily(extractOriginFormDTO);
+                });
+            } else{
+                projectExtractService.saveOriginProjectDaily(extractOriginFormDTO);
+            }
+
         } else {
             List<String> customerIds = dimCustomerService.selectCustomerIdPage(1, 100);
             customerIds.forEach(customerId -> {

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

@@ -5,9 +5,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 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.group.form.GroupTotalFormDTO;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
-import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 import com.epmet.service.StatsGroupService;
 import com.epmet.service.StatsTopicService;
 import com.epmet.service.evaluationindex.extract.todata.*;
@@ -94,6 +92,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     }
 
     private void submitJob(ExtractOriginFormDTO param) {
+        CountDownLatch countDownLatch = new CountDownLatch(NumConstant.FIVE);
         boolean isRange = StringUtils.isBlank(param.getDateId());
         List<String> daysBetween = null;
         if (isRange) {
@@ -101,139 +100,159 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
         }
         List<String> finalDaysBetween = daysBetween;
         threadPool.submit(() -> {
-            CustomerIdAndDateIdFormDTO formDTO = new CustomerIdAndDateIdFormDTO();
-            formDTO.setCustomerId(param.getCustomerId());
-            if (!isRange) {
-                try {
-                    formDTO.setDateId(param.getDateId());
-                    dimCustomerPartymemberService.statsPartyMember(formDTO);
-                } catch (Exception e) {
-                    log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(formDTO), e);
-                }
-            } else {
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        formDTO.setDateId(dateDimId);
+            try {
+                CustomerIdAndDateIdFormDTO formDTO = new CustomerIdAndDateIdFormDTO();
+                formDTO.setCustomerId(param.getCustomerId());
+                if (!isRange) {
+                    try {
+                        formDTO.setDateId(param.getDateId());
                         dimCustomerPartymemberService.statsPartyMember(formDTO);
+                    } catch (Exception e) {
+                        log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(formDTO), e);
+                    }
+                } else {
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            formDTO.setDateId(dateDimId);
+                            dimCustomerPartymemberService.statsPartyMember(formDTO);
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(param), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【党员数据】发生异常,参数:" + JSON.toJSONString(param), e);
                 }
+            } finally {
+                countDownLatch.countDown();
             }
         });
         threadPool.submit(() -> {
-            ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
-            if (!isRange) {
-                try {
-                    groupExtractService.extractGroupData(paramNew);
-                } catch (Exception e) {
-                    log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
-                }
-            } else {
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        paramNew.setDateId(dateDimId);
+            try {
+                ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
+                if (!isRange) {
+                    try {
                         groupExtractService.extractGroupData(paramNew);
+                    } catch (Exception e) {
+                        log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
+                    }
+                } else {
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            paramNew.setDateId(dateDimId);
+                            groupExtractService.extractGroupData(paramNew);
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
+            } finally {
+                countDownLatch.countDown();
             }
         });
         threadPool.submit(() -> {
-            log.debug("extractAll start param:{}", JSON.toJSONString(param));
-            ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
-            if (!isRange) {
-                try {
-                    factOriginTopicMainDailyService.topicCleaning(paramNew);
-                } catch (Exception e) {
-                    log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
-                }
-            } else {
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        paramNew.setDateId(dateDimId);
-                        log.info("extractAll cal param:{}", JSON.toJSONString(paramNew));
+            try {
+                log.debug("extractAll start param:{}", JSON.toJSONString(param));
+                ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
+                if (!isRange) {
+                    try {
                         factOriginTopicMainDailyService.topicCleaning(paramNew);
+                    } catch (Exception e) {
+                        log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
+                    }
+                } else {
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            paramNew.setDateId(dateDimId);
+                            log.info("extractAll cal param:{}", JSON.toJSONString(paramNew));
+                            factOriginTopicMainDailyService.topicCleaning(paramNew);
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
+                log.debug("extractAll end param:{}", JSON.toJSONString(paramNew));
+            } finally {
+                countDownLatch.countDown();
             }
-            log.debug("extractAll end param:{}", JSON.toJSONString(paramNew));
         });
         threadPool.submit(() -> {
-            ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
-            if (!isRange) {
-                try {
-                    issueExtractService.issueExtractMain(paramNew);
-                } catch (Exception e) {
-                    log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
-                }
-                try {
-                    issueExtractService.issueExtractLog(paramNew);
-                } catch (Exception e) {
-                    log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
-                }
-            } else {
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        paramNew.setDateId(dateDimId);
+            try {
+                ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
+                if (!isRange) {
+                    try {
                         issueExtractService.issueExtractMain(paramNew);
+                    } catch (Exception e) {
+                        log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
-                }
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        paramNew.setDateId(dateDimId);
+                    try {
                         issueExtractService.issueExtractLog(paramNew);
+                    } catch (Exception e) {
+                        log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
+                    }
+                } else {
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            paramNew.setDateId(dateDimId);
+                            issueExtractService.issueExtractMain(paramNew);
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【议题数据主表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
+                    }
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            paramNew.setDateId(dateDimId);
+                            issueExtractService.issueExtractLog(paramNew);
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【议题数据附表】发生异常,参数:" + JSON.toJSONString(paramNew), e);
                 }
+            } finally {
+                countDownLatch.countDown();
             }
         });
         //小组活动
         threadPool.submit(() -> {
-            ExtractOriginFormDTO extractOriginFormDTO = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
-            if (!isRange) {
-                //截止到当前dateId
-                try {
-                    factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
-                } catch (Exception e) {
-                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
-                }
-                try {
-                    factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
-                } catch (Exception e) {
-                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
-                }
-            } else {
-                //参数指定日期内，比如startDate=20210501,endDate=20210513;依次计算截止到20210501的数据.....截止到20210513的数据
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        extractOriginFormDTO.setDateId(dateDimId);
+            try {
+                ExtractOriginFormDTO extractOriginFormDTO = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
+                if (!isRange) {
+                    //截止到当前dateId
+                    try {
                         factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                    } catch (Exception e) {
+                        log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
-                }
-                try {
-                    for (int i = 0; i < finalDaysBetween.size(); i++) {
-                        String dateDimId = finalDaysBetween.get(i);
-                        extractOriginFormDTO.setDateId(dateDimId);
+                    try {
                         factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                    } catch (Exception e) {
+                        log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
+                    }
+                } else {
+                    //参数指定日期内，比如startDate=20210501,endDate=20210513;依次计算截止到20210501的数据.....截止到20210513的数据
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            extractOriginFormDTO.setDateId(dateDimId);
+                            factGroupActDailyService.extractGridGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
+                    }
+                    try {
+                        for (int i = 0; i < finalDaysBetween.size(); i++) {
+                            String dateDimId = finalDaysBetween.get(i);
+                            extractOriginFormDTO.setDateId(dateDimId);
+                            factGroupActDailyService.extractAgencyGroupActDaily(extractOriginFormDTO.getCustomerId(), extractOriginFormDTO.getDateId());
+                        }
+                    } catch (Exception e) {
+                        log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
                     }
-                } catch (Exception e) {
-                    log.error("抽取【fact_group_act_daily】发生异常,参数:" + JSON.toJSONString(extractOriginFormDTO), e);
                 }
+            } finally {
+                countDownLatch.countDown();
             }
         });
 
@@ -297,7 +316,18 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
             }
         });*/
 
-        submitProjectRelationData(param, finalDaysBetween);
+        Future<?> future = submitProjectRelationData(param, finalDaysBetween);
+        try {
+            future.get();
+        } catch (Exception e) {
+            log.error("submitProjectRelationData exception:{}",e);
+        }
+        try {
+            countDownLatch.await();
+            log.info("extractAll submitJob execute end,param:{}",JSON.toJSONString(param));
+        } catch (InterruptedException e) {
+            log.error("extractAll daily InterruptedException:{}", e);
+        }
     }
 
     @Override

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

@@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
@@ -166,7 +165,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
      * @param logDailyEntityList
      * @author yinzuomei
      * @description  批量插入fact_origin_topic_log_daily
-     * @Date 2020/9/16 12:53 
+     * @Date 2020/9/16 12:53
      **/
     private void saveFactOriginTopicLogDailyEntity(List<FactOriginTopicLogDailyEntity> logDailyEntityList) {
         //批量插入
@@ -175,7 +174,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             factOriginTopicLogDailyDao.insertBatchEntity(list);
         });
     }
-    
+
     /**
      * @return java.util.Map<java.lang.String,java.lang.Object>
      * @param topicOriginInfoList
@@ -195,8 +194,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             GridInfoDTO gridInfoDTO=gridMap.get(topicOriginInfoDTO.getGridId());
             if(null==gridInfoDTO){
                 log.warn("没有找到 gridId="+topicOriginInfoDTO.getGridId()+" 的基本信息");
-//                continue;
-                throw new RenException("gridInfoDTO is null gridId="+topicOriginInfoDTO.getGridId());
+                continue;
+                //throw new RenException("gridInfoDTO is null gridId="+topicOriginInfoDTO.getGridId());
             }
             // 一年的第几周
             String weekId = DateUtils.format(topicOriginInfoDTO.getOriginalBusinessTime(), DateUtils.DATE_PATTERN_YYYY).concat("W").concat(String.valueOf(DateUtils.getWeekOfYear(topicOriginInfoDTO.getOriginalBusinessTime())));
@@ -419,4 +418,4 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     }
 
 
-}
+}

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

@@ -121,7 +121,7 @@ public class IssueExtractServiceImpl implements IssueExtractService {
             });
         });
         // 5. 查询pid
-        List<String> agencyIds = result.stream().map(r -> r.getAgencyId()).distinct().collect(Collectors.toList());
+        List<String> agencyIds = result.stream().map(IssueMainDailyFormDTO::getAgencyId).distinct().collect(Collectors.toList());
         List<AgencyInfoResultDTO> agencyInfoList = dimAgencyDao.selectAgencyInfo(agencyIds);
         if (CollectionUtils.isEmpty(agencyInfoList)){
             throw new RenException(ExtractConstant.PARENT_AGENCY_ID_LIST);
@@ -138,7 +138,9 @@ public class IssueExtractServiceImpl implements IssueExtractService {
                 }
             });
         });
-        delAndInsertMain(customerId,dateId,result);
+        //过滤掉pids为空的数据
+        List<IssueMainDailyFormDTO> collect = result.stream().filter(o -> StringUtils.isNotBlank(o.getPids())).collect(Collectors.toList());
+        delAndInsertMain(customerId,dateId,collect);
         return true;
     }
 
@@ -244,7 +246,9 @@ public class IssueExtractServiceImpl implements IssueExtractService {
                 }
             });
         });
-        delAndInsertLog(customerId,dateId,result);
+        //去除pids 为空的数据
+        List<IssueLogDailyFormDTO> collect = result.stream().filter(o -> StringUtils.isNotBlank(o.getPids())).collect(Collectors.toList());
+        delAndInsertLog(customerId,dateId,collect);
         return true;
     }
 

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

@@ -224,7 +224,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			}));
 			//插入数据
 			if (!list.isEmpty()) {
-				factOriginProjectMainDailyService.saveOrUpdateBatch(list);
+				factOriginProjectMainDailyService.insertBatch(list);
 			}
 
 		}

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

@@ -0,0 +1,189 @@
+package com.epmet.service.evaluationindex.extract.toscreen;
+
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/7 10:43
+ */
+public interface OrgRankStatisticsService {
+    /**
+     * 网格被吹哨项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getGridProjectCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 部门被吹哨项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getDeptProjectCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 组织被吹哨项目数（含下级组织网格部门）
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyProjectCount(String customerId, String monthId, String dateId);
+
+
+    /**
+     * 网格被吹哨项目中已结案项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getGridProjectClosedCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 部门被吹哨项目中已结案项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getDeptProjectClosedCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 组织被吹哨项目中已结案项目数（含下级组织网格部门）
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 网格被吹哨项目中自己办结项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getGridProjectResolvedCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 部门被吹哨项目中自己办结项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getDeptProjectResolvedCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 组织被吹哨项目中自己办结项目数（含下级组织网格部门）
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyProjectResolvedCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 网格自治项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getGridProjectSelfCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 部门自治项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getDeptProjectSelfCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 组织自治项目数（含下级组织网格部门）
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyProjectSelfCount(String customerId, String monthId, String dateId);
+
+    /**
+     * 网格产生的项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getGridProjectTotal(String customerId, String monthId, String dateId);
+
+    /**
+     * 组织产生的项目数（含下级组织网格部门）
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyProjectTotal(String customerId, String monthId, String dateId);
+
+    /**
+     * 网格产生的项目数中结案的项目数
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getGridProjectClosedTotal(String customerId, String monthId, String dateId);
+
+    /**
+     * 组织产生的项目数中结案的项目数（含下级组织网格部门）
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedTotal(String customerId, String monthId, String dateId);
+}

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

@@ -0,0 +1,306 @@
+package com.epmet.service.evaluationindex.extract.toscreen.impl;
+
+import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
+import com.epmet.service.evaluationindex.extract.toscreen.OrgRankStatisticsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/12/7 10:43
+ */
+@Service
+@Slf4j
+public class OrgRankStatisticsServiceImpl implements OrgRankStatisticsService {
+
+    /**
+     * 网格被吹哨项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map < String,  OrgStatisticsResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGridProjectCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 部门被吹哨项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getDeptProjectCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 组织被吹哨项目数（含下级组织网格部门）
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyProjectCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 网格被吹哨项目中已结案项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGridProjectClosedCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 部门被吹哨项目中已结案项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getDeptProjectClosedCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 组织被吹哨项目中已结案项目数（含下级组织网格部门）
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 网格被吹哨项目中自己办结项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGridProjectResolvedCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 部门被吹哨项目中自己办结项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getDeptProjectResolvedCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 组织被吹哨项目中自己办结项目数（含下级组织网格部门）
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyProjectResolvedCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 网格自治项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGridProjectSelfCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 部门自治项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getDeptProjectSelfCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 组织自治项目数（含下级组织网格部门）
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyProjectSelfCount(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 网格产生的项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGridProjectTotal(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 组织产生的项目数（含下级组织网格部门）
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyProjectTotal(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 网格产生的项目数中结案的项目数
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getGridProjectClosedTotal(String customerId, String monthId, String dateId) {
+        return null;
+    }
+
+    /**
+     * 组织产生的项目数中结案的项目数（含下级组织网格部门）
+     *
+     * @param customerId
+     * @param monthId
+     * @param dateId
+     * @Param customerId
+     * @Param monthId
+     * @Param dateId
+     * @Return {@link Map< String, OrgStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/12/7 10:52
+     */
+    @Override
+    public Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedTotal(String customerId, String monthId, String dateId) {
+        return null;
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java

@@ -173,6 +173,7 @@ public class DimCustomerPartymemberServiceImpl extends BaseServiceImpl<DimCustom
                         }
                     });
                 });
+                partyMemberList = partyMemberList.stream().filter(item -> StringUtils.isNotBlank(item.getAgencyId())).collect(Collectors.toList());
                 delAndInsertParty(partyMemberList,customerId,dateId);
             });
         });

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -198,7 +198,7 @@
     </select>
     <select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
             SELECT
-                da.ID,
+                da.ID  AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -252,7 +252,7 @@
     </select>
     <select id="getResolveProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
             SELECT
-                da.ID,
+                da.ID  AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -899,43 +899,8 @@
             ON a.GRID_ID = b.GRID_ID
     </select>
     <select id="getSelfProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
-        SELECT
-            a.AGENCY_ID,
-            a.count AS "sum",
-            IFNULL(b.count,0) AS "count"
-        FROM
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.DATE_ID &lt;= #{dateId}
-             GROUP BY
-                 da.ID) a
-                LEFT JOIN
-            (SELECT
-                 da.ID AS AGENCY_ID,
-                 COUNT( fm.ID ) AS "count"
-             FROM
-                 fact_origin_project_main_daily fm
-                     INNER JOIN dim_agency da ON fm.PIDS LIKE CONCAT( '%', da.ID, '%' )
-                     AND da.`LEVEL` = #{level}
-             WHERE
-                 fm.PROJECT_STATUS = 'closed'
-               AND fm.CUSTOMER_ID = #{customerId}
-               AND fm.DATE_ID &lt;= #{dateId}
-               AND fm.FINISH_ORG_IDS LIKE CONCAT('%', fm.AGENCY_ID,'%')
-             GROUP BY
-                 da.ID) b
-            ON a.AGENCY_ID = b.AGENCY_ID
-
             SELECT
-                da.ID,
+                da.ID AS "agencyId",
                 SUM( sum ) AS "sum",
                 SUM( count ) AS "count"
             FROM
@@ -989,7 +954,7 @@
     </select>
     <select id="getResolveProjectDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
-            da.ID,
+            da.ID  AS "agencyId",
             SUM( sum ) AS "sum",
             SUM( count ) AS "count"
         FROM

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalCustomerController.java

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -44,6 +45,7 @@ public class ExternalCustomerController {
      * @param formDTO
      * @return
      */
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result<ExternalCustomerResultDTO> add(@RequestBody ExternalCustomerFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ExternalCustomerFormDTO.AddExternalCustomerGroup.class);
@@ -57,6 +59,7 @@ public class ExternalCustomerController {
      * @param formDTO
      * @return
      */
+    @NoRepeatSubmit
     @PostMapping("update")
     public Result<ExternalCustomerResultDTO> update(@RequestBody ExternalCustomerFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ExternalCustomerFormDTO.UpdateExternalCustomerGroup.class);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ActCustomizedController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -42,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("actcustomized")
 public class ActCustomizedController {
-    
+
     @Autowired
     private ActCustomizedService actCustomizedService;
 
@@ -68,6 +69,7 @@ public class ActCustomizedController {
      * @description 保存自定义配置
      * @Date 2020/7/20 17:25
      **/
+    @NoRepeatSubmit
     @RequirePermission(requirePermission = RequirePermissionEnum.MORE_HEART_CUSTOMIZED_SAVE)
     @PostMapping("save")
     public Result saveConfigs(@RequestBody SaveActCustomizedFormDTO formDTO){
@@ -89,4 +91,4 @@ public class ActCustomizedController {
         CustomerHeartConfigsResultDTO resultDTO = actCustomizedService.getCustomerHeartConfigs(formDTO);
         return new Result<CustomerHeartConfigsResultDTO>().ok(resultDTO);
     }
-}
+}

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -34,6 +35,7 @@ public class PartyBranchManageController {
      * @description 添加党支部
      * @Date 2020/6/17 12:47
      **/
+    @NoRepeatSubmit
     @PostMapping("add")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_ADD)
     public Result<PartyBranchAddResultDTO> addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) {
@@ -107,7 +109,7 @@ public class PartyBranchManageController {
      * @param formDTO
      * @author yinzuomei
      * @description 6、党员列表查询
-     * @Date 2020/6/18 0:17 
+     * @Date 2020/6/18 0:17
      **/
     @PostMapping("/partymember/list")
     public Result<List<PartyMemberInfoResultDTO>> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -127,6 +128,7 @@ public class IssueCategoryController {
      * @Description 议题：保存/修改分类
      * @Author sun
      **/
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody IssueSaveCategoryFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
@@ -135,4 +137,4 @@ public class IssueCategoryController {
         return new Result();
     }
 
-}
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSuggestionController.java

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IssueSuggestionDTO;
@@ -43,7 +44,7 @@ import java.util.List;
 @RestController
 @RequestMapping("issuesuggestion")
 public class IssueSuggestionController {
-    
+
     @Autowired
     private IssueSuggestionService issueSuggestionService;
 
@@ -66,6 +67,7 @@ public class IssueSuggestionController {
      * @description 保存居民端用户对议题的建议或意见
      * @Date 2020/11/18 13:15
      **/
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result<SaveIssueSuggestionResultDTO> saveIssueSuggestion(@RequestBody IssueSuggestionDTO dto) {
         SaveIssueSuggestionResultDTO resultDTO = issueSuggestionService.saveIssueSuggestion(dto);
@@ -84,4 +86,4 @@ public class IssueSuggestionController {
         List<IssueSuggestionResDTO> list = issueSuggestionService.listIssueSug(formDTO);
         return new Result<List<IssueSuggestionResDTO>>().ok(list);
     }
-}
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -50,7 +51,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("issuetags")
 public class IssueTagsController {
-    
+
     @Autowired
     private IssueTagsService issueTagsService;
 
@@ -102,6 +103,7 @@ public class IssueTagsController {
      * @author zxc
      * @date 2020/12/9 下午3:29
      */
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result<AddTagResultDTO> addTag(@RequestBody AddTagFormDTO form, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(form, AddTagFormDTO.AddTag.class);
@@ -116,6 +118,7 @@ public class IssueTagsController {
      * @author zxc
      * @date 2020/12/10 上午9:37
      */
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result issueTagSave(@RequestBody IssueTagsSaveFormDTO form,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(form, IssueTagsSaveFormDTO.IssueTagsSaveForm.class);
@@ -123,4 +126,4 @@ public class IssueTagsController {
         return new Result();
     }
 
-}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -50,7 +51,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerpartybranch")
 public class CustomerPartyBranchController {
-    
+
     @Autowired
     private CustomerPartyBranchService customerPartyBranchService;
 
@@ -66,6 +67,7 @@ public class CustomerPartyBranchController {
         return new Result<CustomerPartyBranchDTO>().ok(data);
     }
 
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result<String> save(@RequestBody CustomerPartyBranchDTO dto){
         //效验数据
@@ -142,4 +144,4 @@ public class CustomerPartyBranchController {
     public Result<List<OptionResultDTO>> getBranchOption(@RequestBody CustomerPartyBranchDTO formDTO){
         return new Result<List<OptionResultDTO>>().ok(customerPartyBranchService.getBranchOption(formDTO.getGridId()));
     }
-}
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java

@@ -18,8 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -53,7 +52,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projectcategory")
 public class ProjectCategoryController {
-    
+
     @Autowired
     private ProjectCategoryService projectCategoryService;
 
@@ -118,6 +117,7 @@ public class ProjectCategoryController {
      * @Description 项目：保存/修改分类
      * @Author sun
      **/
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody ProjectSaveCategoryFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
@@ -136,4 +136,4 @@ public class ProjectCategoryController {
         return new Result<List<ProjectCategoryDTO>>().ok(projectCategoryService.getProjectCategoryList(formDTO));
     }
 
-}
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java

@@ -18,15 +18,15 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectTagsDTO;
 import com.epmet.dto.form.ProjectTagHookFormDTO;
 import com.epmet.excel.ProjectTagsExcel;
@@ -48,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("projecttags")
 public class ProjectTagsController {
-    
+
     @Autowired
     private ProjectTagsService projectTagsService;
 
@@ -72,6 +72,7 @@ public class ProjectTagsController {
      * @author wangc
      * @date 2021.03.20 02:34
     */
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){
         dto.setCustomerId(token.getCustomerId());
@@ -104,4 +105,4 @@ public class ProjectTagsController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProjectTagsExcel.class);
     }
 
-}
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -1,9 +1,11 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -19,6 +21,7 @@ import com.epmet.constant.*;
 import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessAttachmentDao;
 import com.epmet.dao.ProjectProcessDao;
+import com.epmet.dao.ResiEventReportOrgDao;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.IssueProjectTagDictDTO;
 import com.epmet.dto.ProjectStaffDTO;
@@ -91,6 +94,8 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 	private LoginUserUtil loginUserUtil;
 	@Autowired
 	private ResiEventService resiEventService;
+	@Autowired
+	private ResiEventReportOrgDao resiEventReportOrgDao;
 
 	@Override
 	public List<PendProjectListResultDTO> getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -637,6 +642,12 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		if (!CollectionUtils.isEmpty(projectEntityList)) {
 			throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(), EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg());
 		}
+		LambdaQueryWrapper<ResiEventReportOrgEntity> tWrapper = new LambdaQueryWrapper<>();
+		tWrapper.eq(ResiEventReportOrgEntity::getResiEventId,formDTO.getEventId());
+		ResiEventReportOrgEntity reportOrgEntity = resiEventReportOrgDao.selectOne(tWrapper);
+		if (reportOrgEntity == null){
+			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+		}
 		List<TickStaffFormDTO> staffList = formDTO.getStaffList();
 		//1.文字内容安全校验
 		List<String> list = new ArrayList<>();
@@ -748,6 +759,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 						entity.setCategoryId(item.getId());
 						entity.setCategoryPids(ca.getPids());
 						entity.setCategoryCode(ca.getCategoryCode());
+						//如果事件上报给 网格 则这个项目是属于网格 设置网格ID˚
+						if (OrgTypeEnum.GRID.getCode().equals(reportOrgEntity.getOrgType())){
+							entity.setGridId(reportOrgEntity.getOrgId());
+						}
 						categoryEntityList.add(entity);
 					}
 				});

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -47,7 +48,7 @@ import java.util.List;
 @RestController
 @RequestMapping("guidecategory")
 public class GuideCategoryController {
-    
+
     @Autowired
     private GuideCategoryService guideCategoryService;
 
@@ -68,10 +69,10 @@ public class GuideCategoryController {
 
     /**
      * 办事指南】可用分类列表 新增、编辑指南时的下拉框：展示未禁用的分类； 查询指南列表：如果禁用的分类下存在指南列表，则展示，不存在直接不展示
-     * 
-     * @param tokenDto 
-     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.GuideDictResDTO>> 
-     * @author yinzuomei 
+     *
+     * @param tokenDto
+     * @return  com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.GuideDictResDTO>>
+     * @author yinzuomei
      * @date 2021/9/8 2:47 下午
      */
     @PostMapping("getcategory")
@@ -143,6 +144,7 @@ public class GuideCategoryController {
      * @author yinzuomei
      * @date 2021/9/8 5:11 下午
      */
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result<GuideCategoryDTO> save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
@@ -160,6 +162,7 @@ public class GuideCategoryController {
      * @author yinzuomei
      * @date 2021/9/8 5:37 下午
      */
+    @NoRepeatSubmit
     @PostMapping("update")
     public Result<GuideCategoryDTO> update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
@@ -168,4 +171,4 @@ public class GuideCategoryController {
     }
 
 
-}
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -113,6 +114,7 @@ public class GuideController {
      * @Author zhaoqifeng
      * @Date 2021/9/7 14:13
      */
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result guideAdd(@LoginUser TokenDto tokenDto, @RequestBody GuideAddFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
@@ -177,4 +179,4 @@ public class GuideController {
     }
 
 
-}
+}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -58,6 +59,7 @@ public class SpecialSubjectController {
      * @description 添加专题
      * @Date 2021/7/15 15:31
      **/
+    @NoRepeatSubmit
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_SPECIAL_PROJECT_ADD)
     @PostMapping("add")
     public Result<AddSpecialSubjectResultDTO> addSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody AddSpecialSubjectFormDTO formDTO) {
@@ -125,4 +127,4 @@ public class SpecialSubjectController {
     public Result<List<PreviewResultDTO>> preview(@RequestBody PreviewFormDTO formDTO) {
         return new Result<List<PreviewResultDTO>>().ok(specialSubjectService.preview(formDTO));
     }
-}
+}

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -87,6 +88,7 @@ public class CustomerController {
 		return new Result<CustomerDTO>().ok(data);
 	}
 
+	@NoRepeatSubmit
 	@PostMapping("save")
 	public Result save(@RequestBody CustomerDTO dto) {
 		//效验数据
@@ -95,6 +97,7 @@ public class CustomerController {
 		return new Result();
 	}
 
+	@NoRepeatSubmit
 	@PutMapping("update")
 	public Result update(@RequestBody CustomerDTO dto) {
 		//效验数据
@@ -183,6 +186,7 @@ public class CustomerController {
 	 * @param form
 	 * @return
 	 */
+	@NoRepeatSubmit
 	@PostMapping("add")
 	public Result<Map<String, String>> addCustomer(@RequestBody CustomerFormDTO form) {
 		ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -50,6 +50,7 @@ public class BadgeController {
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 */
+	@NoRepeatSubmit
 	@PostMapping("add")
 	public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddBadgeFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
@@ -191,7 +192,7 @@ public class BadgeController {
 
 	/**
 	 * @Description
-	 * @return    
+	 * @return
 	 * @author wxz
 	 * @date 2021.08.02 10:27
 	*/