外部接口鉴权 加强 🈲️乱调用

epmet-gateway/src/main/resources/bootstrap.yml

@@ -476,14 +476,24 @@ epmet:
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:
     - /data/report/**
-    - /data/stats/**
     - /epmet/ext/**
     - /epmetuser/customerstaff/customerlist
     - /message/template/**
     - /data/aggregator/project/projectdistribution
     - /data/aggregator/epmetuser/open-staffdetail
+    #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个
     - /data/stats/statsuser/gm-uploadevent
     - /data/stats/statsuser/gm-uploaddata
+    - /data/stats/indexcalculate/all
+    - /data/stats/kcscreencoll/**
+    - /data/stats/indexcollect/**
+    - /data/stats/anscreencoll/**
+    - /data/stats/plugin/**
+    - /data/stats/screencoll/**
+    - /data/stats/project/**
+    - /data/stats/basereport/**
+    - /data/stats/governance/**
+
 
   # 对外开放接口认证白名单
   externalAuthUrlsWhiteList:

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.indexcollect.form.*;

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.AgencyGovernDailyFormDTO;
@@ -8,7 +8,6 @@ import com.epmet.service.GovernanceDataReportService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.sql.ResultSet;
 
 /**
  * 治理能力数据上报

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -27,13 +27,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_platform_summary_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("homepage/platformsummary")
     public Result platFormSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -48,13 +48,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_issue_summary_grid_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("issue/summary")
     public Result issueSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -69,13 +69,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:  screen_kc_issue_trend_grid_monthly
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("issue/trend")
     public Result issueTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -90,13 +90,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_user_summary_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("user/summary")
     public Result userSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -111,13 +111,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_volunteer_heat_rank_grid_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("volunteer/heartrank")
     public Result volunteerHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -132,13 +132,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_user_trend_grid_monthly
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("user/userheartrank")
     public Result userHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -153,13 +153,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_act_summary_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("act/summary")
     public Result actSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -174,13 +174,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_act_trend_monthly
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("act/trend")
     public Result actTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -195,13 +195,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_volunteer_summary_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("act/volunteersummary")
     public Result volunteerSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -216,13 +216,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_project_summary_grid_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("project/summary")
     public Result projectSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -237,13 +237,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_project_category_grid_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("project/categorysummary")
     public Result categorySummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -258,13 +258,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_project_satis_grid_monthly
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("project/satisanalysis")
     public Result projectSatisanalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -279,13 +279,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_news_summary_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("news/summary")
     public Result newsSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -300,13 +300,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_news_trend_monthly
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("news/trend")
     public Result newsTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -321,13 +321,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_news_rank
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("news/hotrank")
     public Result newsHotRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -342,13 +342,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_news_category_analysis
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("news/categoryanalysis")
     public Result newsCategoryAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -363,13 +363,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_group_summary_grid_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("group/summary")
     public Result groupSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -384,13 +384,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_group_detail_grid_daily
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("group/detail")
     public Result groupDetail(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);
@@ -405,13 +405,13 @@ public class KcScreenCollController {
      *      所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
      *      table:screen_kc_topic_trend_grid_monthly
      *
-     * 
+     *
      * @param formDTO
      * @return void
      * @Author zhangyong
      * @Date 15:57 2020-09-09
      **/
-    
+
     @PostMapping("group/topictrend")
     public Result groupTopicTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
         formDTO.setCustomerId(customerId);

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;

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

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -30,6 +30,7 @@ public class StatsUserController {
      * @param formDTO
      * @description 工作端数据一期，用户分析：参与用户、注册用户分析
      * @Date 2021/3/26 13:27
+     * 自用的方法 不暴漏
      **/
     @RequestMapping("execute")
     public Result execute(@RequestBody StatsFormDTO formDTO) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/OfsController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller.plugins;
+package com.epmet.controller.external.plugins;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -19,16 +19,16 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("plugins/ofs")
 public class OfsController {
-    
+
     @Autowired
     private OfsService ofsService;
-    
+
     /**
      * @param customerId
      * @param formDTO
      * @author yinzuomei
      * @description 【146】一张清单 isFirst=true时,根据customerId先删除后增加
-     * @Date 2021/1/22 10:19 
+     * @Date 2021/1/22 10:19
      **/
     @PostMapping("onelist-daily")
     public Result collOneList(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<OneListFormDTO> formDTO){

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/WorkRecordColController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller.plugins;
+package com.epmet.controller.external.plugins;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -35,7 +35,7 @@ public class WorkRecordColController {
 	 * 按月上传工作日志统计数据时，同步调用此接口上传字典信息
 	 * @param customerId
 	 * @param data
-	 * @return com.epmet.commons.tools.utils.Result   
+	 * @return com.epmet.commons.tools.utils.Result
 	 * @author wangc
 	 * @date 2021.02.04 16:16
 	*/