去掉外部应用认证相关的注解和类，

epmet-module/data-report/data-report-server/pom.xml

@@ -62,11 +62,11 @@
             <version>0.3.1</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-extapp-auth</artifactId>
             <version>2.0.0</version>
-        </dependency>
+        </dependency>-->
         <!--动态数据源-->
         <dependency>
             <groupId>com.epmet</groupId>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.fact;
 
-import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@@ -1,21 +1,13 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
 import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * 组织相关api
@@ -36,14 +28,9 @@ public class AgencyController {
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("tree")
-    public Result<TreeResultDTO> tree(HttpServletRequest request, ExternalAppRequestParam externalAppRequestParam){
+    public Result<TreeResultDTO> tree(@RequestHeader("CustomerId") String customerId){
-        String customerId = request.getHeader("CustomerId");
+        return new Result<TreeResultDTO>().ok(agencyService.tree(customerId));
-        if(StringUtils.isBlank(externalAppRequestParam.getCustomerId())){
-            externalAppRequestParam.setCustomerId(customerId);
-        }
-        return new Result<TreeResultDTO>().ok(agencyService.tree(externalAppRequestParam));
     }
 
     /**
@@ -52,7 +39,6 @@ public class AgencyController {
      * @author zxc
      * @date 2020/8/18 2:33 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("compartment")
     public Result<CompartmentResultDTO> compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){
         ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.DistributionService;
@@ -33,7 +32,6 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/18 10:59 上午
      */
-    @ExternalAppRequestAuth
     @PostMapping("branch")
     public Result<List<BranchResultDTO>> branch(@RequestBody BranchFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
@@ -46,7 +44,6 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/18 11:10 上午
      */
-    @ExternalAppRequestAuth
     @PostMapping("user")
     public Result<UserResultDTO> user(@RequestBody UserFormDTO userFormDTO){
         ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class);
@@ -59,7 +56,6 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/18 11:20 上午
      */
-    @ExternalAppRequestAuth
     @PostMapping("parymember")
     public Result<ParymemberResultDTO> parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){
         ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class);
@@ -72,7 +68,6 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/19 1:29 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("project")
     public Result<List<ProjectResultDTO>> project(@RequestBody ProjectFormDTO projectFormDTO){
         ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class);
@@ -85,7 +80,6 @@ public class DistributionController {
      * @author zxc
      * @date 2020/8/19 1:52 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("topprofile")
     public Result<TopProfileResultDTO> topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){
         ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassRootsGovernController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.GrassRootsGovernService;
@@ -39,7 +38,6 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 11:16
      **/
-    @ExternalAppRequestAuth
     @PostMapping("userpointrank")
     public Result<UserPointRankResultDTO> userPointRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -54,7 +52,6 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 13:55
      **/
-    @ExternalAppRequestAuth
     @PostMapping("difficultprojects")
     public Result<List<DifficultProjectResultDTO>> difficultProject(@RequestBody AgencyNumTypeParamFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyNumTypeParamFormDTO.AgencyNumTypeParamGroup.class);
@@ -69,7 +66,6 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 14:37
      **/
-    @ExternalAppRequestAuth
     @PostMapping("publicpartiprofile")
     public Result<PublicPartiProfileResultDTO> publicPartiProfile(@RequestBody AgencyFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -84,7 +80,6 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 15:32
      **/
-    @ExternalAppRequestAuth
     @PostMapping("publicpartirank")
     public Result<List<PublicPartiRankResultDTO>> publicPartiRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -99,7 +94,6 @@ public class GrassRootsGovernController {
      * @author wangc
      * @date 2020.08.20 17:46
      **/
-    @ExternalAppRequestAuth
     @PostMapping("governcapacityrank")
     public Result<List<GovernCapacityRankResultDTO>> governCapacityRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/GrassrootsPartyDevController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.GrassrootsPartyDevService;
@@ -38,7 +37,6 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.18 16:59
     **/
-    @ExternalAppRequestAuth
     @PostMapping("basicinfo")
     public Result<PartymemberPercentResultDTO> baseInfo(@RequestBody ParymemberFormDTO param){
         ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
@@ -53,7 +51,6 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.18 17:54
      **/
-    @ExternalAppRequestAuth
     @PostMapping("ageinfo")
     public Result<PartymemberAgeDistributionResultDTO> ageInfo(@RequestBody ParymemberFormDTO param){
         ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
@@ -68,7 +65,6 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.19 11:02
      **/
-    @ExternalAppRequestAuth
     @PostMapping("branchbuildtrend")
     public Result<BranchBuildTrendResultDTO> branchBuildTrend(@RequestBody BranchBuildTrendFormDTO param){
         ValidatorUtils.validateEntity(param, BranchBuildTrendFormDTO.branchBuildTrendGroup.class);
@@ -83,7 +79,6 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.19 15:25
      **/
-    @ExternalAppRequestAuth
     @PostMapping("branchbuildrank")
     public Result<BranchBuildRankResultDTO> branchBuildRank(@RequestBody BranchBuildRankFormDTO param){
         ValidatorUtils.validateEntity(param, BranchBuildRankFormDTO.BranchBuildRankGroup.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -1,8 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
-import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.eum.OrgTypeEnum;
@@ -10,10 +7,7 @@ import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -36,7 +30,6 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/19 2:53 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("yearaverageindex")
     public Result<YearAverageIndexResultDTO> yearAverageIndex(@RequestBody YearAverageIndexFormDTO yearAverageIndexFormDTO){
         ValidatorUtils.validateEntity(yearAverageIndexFormDTO, YearAverageIndexFormDTO.YearAverageIndex.class);
@@ -49,7 +42,6 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/19 3:17 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("monthindexanalysis/piechart")
     public Result<MonthPieChartResultDTO> monthPieChart(@RequestBody MonthPieChartFormDTO monthPieChartFormDTO){
         ValidatorUtils.validateEntity(monthPieChartFormDTO, MonthPieChartFormDTO.MonthPieChart.class);
@@ -62,7 +54,6 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/19 5:27 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("monthindexanalysis/barchart")
     public Result<MonthBarchartResultDTO> monthBarchart(@RequestBody MonthBarchartFormDTO monthBarchartFormDTO){
         ValidatorUtils.validateEntity(monthBarchartFormDTO, MonthBarchartFormDTO.MonthBarchart.class);
@@ -75,7 +66,6 @@ public class IndexController {
      * @author zxc
      * @date 2020/8/20 10:02 上午
      */
-    @ExternalAppRequestAuth
     @PostMapping("subagencyindexrank")
     public Result<List<SubAgencyIndexRankResultDTO>> subAgencyIndexRank(@RequestBody SubAgencyIndexRankFormDTO subAgencyIndexRankFormDTO){
         ValidatorUtils.validateEntity(subAgencyIndexRankFormDTO, SubAgencyIndexRankFormDTO.SubAgencyIndexRank.class);
@@ -90,8 +80,6 @@ public class IndexController {
      * @Author zhangyong
      * @Date 13:39 2020-09-11
      **/
-    @InternalAppRequestAuth
-    @ExternalAppRequestAuth
     @PostMapping("dataclient/subagencyindexrank")
     public Result<List<AnNingSubAgencyIndexRankResultDTO>> getSubAgencyIndexRank(@RequestBody SubAgencyIndexRankYMFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, SubAgencyIndexRankYMFormDTO.SubAgencyIndexRank.class);
@@ -104,10 +92,9 @@ public class IndexController {
      * @author jianjun.liu
      * @date 2020/8/20 10:02 上午
      */
-    @ExternalAppRequestAuth
     @PostMapping("gridindexrank")
-    public Result<List<SubAgencyIndexRankResultDTO>> gridIndexRank(ExternalAppRequestParam extParam, @RequestBody GridIndexRankFormDTO formDTO) {
+    public Result<List<SubAgencyIndexRankResultDTO>> gridIndexRank(@RequestHeader("CustomerId") String customerId, @RequestBody GridIndexRankFormDTO formDTO) {
-        formDTO.setCustomerId(extParam.getCustomerId());
+        formDTO.setCustomerId(customerId);
         ValidatorUtils.validateEntity(formDTO);
         formDTO.setOrgType(OrgTypeEnum.GRID.getCode());
         return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.selectIndexRankByOrgType(formDTO));

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java

@@ -1,8 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
-import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.KcScreenService;
@@ -17,10 +14,7 @@ import com.epmet.dto.result.issue.KcIssueSummary;
 import com.epmet.dto.result.issue.KcPartiTrendResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -39,42 +33,37 @@ public class KcScreenController {
 
 
     /**
-     *  @param externalAppRequestParam
      * @Description  首页-平台各类总数
      * @author sun
      */
     @PostMapping("homepage/summary")
-    public Result<HomepageSummaryResultDTO> homepageSummary(ExternalAppRequestParam externalAppRequestParam){
+    public Result<HomepageSummaryResultDTO> homepageSummary(@RequestHeader("CustomerId") String customerId){
-        return new Result<HomepageSummaryResultDTO>().ok(kcScreenService.homepageSummary(externalAppRequestParam));
+        return new Result<HomepageSummaryResultDTO>().ok(kcScreenService.homepageSummary(customerId));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-各类总数汇总
      * @author sun
      */
     @PostMapping("heart/summary")
-    public Result<HeartSummaryResultDTO> heartSummary(ExternalAppRequestParam externalAppRequestParam){
+    public Result<HeartSummaryResultDTO> heartSummary(@RequestHeader("CustomerId") String customerId){
-        return new Result<HeartSummaryResultDTO>().ok(kcScreenService.heartSummary(externalAppRequestParam));
+        return new Result<HeartSummaryResultDTO>().ok(kcScreenService.heartSummary(customerId));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-公益活动次数
      * @author sun
      */
     @PostMapping("heart/actcounttrend")
-    public Result<HeartActcounttrendResultDTO> heartActcounttrend(ExternalAppRequestParam externalAppRequestParam){
+    public Result<HeartActcounttrendResultDTO> heartActcounttrend(@RequestHeader("CustomerId") String customerId){
-        return new Result<HeartActcounttrendResultDTO>().ok(kcScreenService.heartActcounttrend(externalAppRequestParam));
+        return new Result<HeartActcounttrendResultDTO>().ok(kcScreenService.heartActcounttrend(customerId));
     }
     /**
      * 议题分析-各类总数
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("issue/summary")
-    public Result getIssueSummary(ExternalAppRequestParam externalAppRequestParam) {
+    public Result getIssueSummary(@RequestHeader("CustomerId") String customerId) {
-        String customerId = externalAppRequestParam.getCustomerId();
         //String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
         KcIssueSummary issueSummary = kcScreenService.getIssueSummary(customerId);
         return new Result().ok(issueSummary);
@@ -82,300 +71,247 @@ public class KcScreenController {
 
     /**
      * 参与趋势
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("issue/partitrend")
-    public Result getIssuePartiTrend(ExternalAppRequestParam externalAppRequestParam) {
+    public Result getIssuePartiTrend(@RequestHeader("CustomerId") String customerId) {
-        String customerId = externalAppRequestParam.getCustomerId();
-        //String customerId = "b09527201c4409e19d1dbc5e3c3429a1";
         KcPartiTrendResultDTO trendResultDTO = kcScreenService.getIssuePartiTrend(customerId);
         return new Result().ok(trendResultDTO);
     }
 
     /**
      * 按照议题数量排名
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("issue/gridtotalrank")
-    public Result getIssueGridTotalRank(ExternalAppRequestParam externalAppRequestParam) {
+    public Result getIssueGridTotalRank(@RequestHeader("CustomerId") String customerId) {
-        String customerId = externalAppRequestParam.getCustomerId();
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
         return new Result().ok(kcScreenService.getIssueGridTotalRank(customerId));
     }
 
     /**
      * 议题分析-审核效率排名
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("issue/avgaudittimerank")
-    public Result getAvgAuditTimeRank(ExternalAppRequestParam externalAppRequestParam) {
+    public Result getAvgAuditTimeRank(@RequestHeader("CustomerId") String customerId) {
-        String customerId = externalAppRequestParam.getCustomerId();
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
         return new Result().ok(kcScreenService.getAvgAuditTimeRank(customerId));
     }
 
     /**
      * 议题分析-议题效率
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("issue/effective")
-    public Result getIssueEffective(ExternalAppRequestParam externalAppRequestParam) {
+    public Result getIssueEffective(@RequestHeader("CustomerId") String customerId) {
-        String customerId = externalAppRequestParam.getCustomerId();
         //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
         return new Result().ok(kcScreenService.getIssueEffective(customerId));
     }
 
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-志愿者画像
      * @author sun
      */
     @PostMapping("heart/volunteerportrayal")
-    public Result<HeartVolunteerportrayalResultDTO> heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam){
+    public Result<HeartVolunteerportrayalResultDTO> heartVolunteerportrayal(@RequestHeader("CustomerId") String customerId){
-        return new Result<HeartVolunteerportrayalResultDTO>().ok(kcScreenService.heartVolunteerportrayal(externalAppRequestParam));
+        return new Result<HeartVolunteerportrayalResultDTO>().ok(kcScreenService.heartVolunteerportrayal(customerId));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-个人（志愿者）公益时长排名
      * @author sun
      */
     @PostMapping("heart/volunteerrank")
-    public Result<List<HeartVolunteerrankResultDTO>> heartVolunteerrank(ExternalAppRequestParam externalAppRequestParam, @RequestBody HeartVolunteerrankFormDTO formDTO){
+    public Result<List<HeartVolunteerrankResultDTO>> heartVolunteerrank(@RequestHeader("CustomerId") String customerId, @RequestBody HeartVolunteerrankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, HeartVolunteerrankFormDTO.AddUserInternalGroup.class);
-        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
+        formDTO.setCustomerId(customerId);
         return new Result<List<HeartVolunteerrankResultDTO>>().ok(kcScreenService.heartVolunteerrank(formDTO));
     }
 
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-各类总数
      * @author sun
      */
     @PostMapping("group/summary")
-    public Result<GroupSummaryResultDTO> groupSummary(ExternalAppRequestParam externalAppRequestParam){
+    public Result<GroupSummaryResultDTO> groupSummary(@RequestHeader("CustomerId") String customerId){
-        return new Result<GroupSummaryResultDTO>().ok(kcScreenService.groupSummary(externalAppRequestParam));
+        return new Result<GroupSummaryResultDTO>().ok(kcScreenService.groupSummary(customerId));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-话题参与趋势
      * @author sun
      */
     @PostMapping("group/partitopictrend")
-    public Result<GroupPartitopictrendResultDTO> groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam){
+    public Result<GroupPartitopictrendResultDTO> groupPartitopictrend(@RequestHeader("CustomerId") String customerId){
-        return new Result<GroupPartitopictrendResultDTO>().ok(kcScreenService.groupPartitopictrend(externalAppRequestParam));
+        return new Result<GroupPartitopictrendResultDTO>().ok(kcScreenService.groupPartitopictrend(customerId));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-社群数量排名
      * @author sun
      */
     @PostMapping("group/gridgroupcountrank")
-    public Result<GroupGridgroupcountrankResultDTO> groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam){
+    public Result<GroupGridgroupcountrankResultDTO> groupGridgroupcountrank(@RequestHeader("CustomerId") String customerId){
-        return new Result<GroupGridgroupcountrankResultDTO>().ok(kcScreenService.groupGridgroupcountrank(externalAppRequestParam));
+        return new Result<GroupGridgroupcountrankResultDTO>().ok(kcScreenService.groupGridgroupcountrank(customerId));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-社群数量排名
      * @author sun
      */
     @PostMapping("group/usercountrank")
-    public Result<List<GroupUserCountRankResultDTO>> groupUserCountRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody GroupUserCountRankFormDTO formDTO){
+    public Result<List<GroupUserCountRankResultDTO>> groupUserCountRank(@RequestHeader("CustomerId") String customerId, @RequestBody GroupUserCountRankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, GroupUserCountRankFormDTO.AddUserInternalGroup.class);
-        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
+        formDTO.setCustomerId(customerId);
         return new Result<List<GroupUserCountRankResultDTO>>().ok(kcScreenService.groupUserCountRank(formDTO));
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-话题转化率排名
      * @author sun
      */
     @PostMapping("group/topicshiftissueratiorank")
-    public Result<List<GroupTopicShiftIssueRatioRankResultDTO>> groupTopicShiftIssueRatioRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody GroupTopicShiftIssueRatioRankFormDTO formDTO){
+    public Result<List<GroupTopicShiftIssueRatioRankResultDTO>> groupTopicShiftIssueRatioRank(@RequestHeader("CustomerId") String customerId, @RequestBody GroupTopicShiftIssueRatioRankFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, GroupTopicShiftIssueRatioRankFormDTO.AddUserInternalGroup.class);
-        formDTO.setCustomerId(externalAppRequestParam.getCustomerId());
+        formDTO.setCustomerId(customerId);
         return new Result<List<GroupTopicShiftIssueRatioRankResultDTO>>().ok(kcScreenService.groupTopicShiftIssueRatioRank(formDTO));
     }
 
     /**
      * 项目各类总数汇总
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("project/summary")
-    public Result<ProjectSummaryResultDTO> getProjectSummary(ExternalAppRequestParam externalAppRequestParam){
+    public Result<ProjectSummaryResultDTO> getProjectSummary(@RequestHeader("CustomerId") String customerId){
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<ProjectSummaryResultDTO>().ok(kcScreenService.getProjectSummary(customerId));
     }
 
     /**
      * 项目分析-网格下项目数量排名
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("project/gridcountrank")
-    public Result<GridProjectCountRankResultDTO> getProjectGridCountRank(ExternalAppRequestParam externalAppRequestParam){
+    public Result<GridProjectCountRankResultDTO> getProjectGridCountRank(@RequestHeader("CustomerId") String customerId){
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<GridProjectCountRankResultDTO>().ok(kcScreenService.getGridProjectCountRank(customerId));
     }
 
     /**
      * 项目分析-项目类别
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("project/categoryanalysis")
-    public Result<List<ProjectCategoryAnalysisResultDTO>> getProjectCategoryAnalysis(ExternalAppRequestParam externalAppRequestParam){
+    public Result<List<ProjectCategoryAnalysisResultDTO>> getProjectCategoryAnalysis(@RequestHeader("CustomerId") String customerId){
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<List<ProjectCategoryAnalysisResultDTO>>().ok(kcScreenService.getProjectCategoryAnalysis(customerId));
     }
 
     /**
      * 网格项目平均结案时间
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("project/avgclosedtimeanalysis")
-    public Result<List<ProjectAvgClosedTimeResultDTO>> getGridProjectAvgClosedTimeAnalysis(ExternalAppRequestParam externalAppRequestParam){
+    public Result<List<ProjectAvgClosedTimeResultDTO>> getGridProjectAvgClosedTimeAnalysis(@RequestHeader("CustomerId") String customerId){
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<List<ProjectAvgClosedTimeResultDTO>>().ok(kcScreenService.getGridProjectAvgClosedTimeAnalysis(customerId));
     }
 
     /**
      * 项目分析-居民满意度
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("project/statis")
-    public Result<ProjectSatisfactionResultDTO> getProjectSatisfactionAnalyze(ExternalAppRequestParam externalAppRequestParam){
+    public Result<ProjectSatisfactionResultDTO> getProjectSatisfactionAnalyze(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<ProjectSatisfactionResultDTO>().ok(kcScreenService.getProjectSatisfactionAnalyze(customerId));
     }
 
     /**
      * 用户-summary
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("user/summary")
-    public Result<UserSummaryResultDTO> getUserSummary(ExternalAppRequestParam externalAppRequestParam){
+    public Result<UserSummaryResultDTO> getUserSummary(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
-        //String customerId = "2fe0065f70ca0e23ce4c26fca5f1d933";
         return new Result<UserSummaryResultDTO>().ok(kcScreenService.getUserSummary(customerId));
     }
 
     /**
      * 用户量趋势
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("user/trend")
-    public Result<KcUserTrendResultDTO> getUserTrend(ExternalAppRequestParam externalAppRequestParam){
+    public Result<KcUserTrendResultDTO> getUserTrend(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<KcUserTrendResultDTO>().ok(kcScreenService.getUserTrend(customerId));
     }
 
     /**
      * 网格用户数量排名
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("user/griduserrank")
-    public Result<KcUserRankResultDTO> getUserRank(ExternalAppRequestParam externalAppRequestParam){
+    public Result<KcUserRankResultDTO> getUserRank(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<KcUserRankResultDTO>().ok(kcScreenService.getUserRank(customerId));
     }
 
     /**
      * 用户画像
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("user/userportrayal")
-    public Result<KcUserPortrayalResultDTO> getUserPortrayal(ExternalAppRequestParam externalAppRequestParam){
+    public Result<KcUserPortrayalResultDTO> getUserPortrayal(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<KcUserPortrayalResultDTO>().ok(kcScreenService.getUserPortrayal(customerId));
     }
 
     /**
      * 用户积分排名
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("user/pointsrank")
-    public Result<KcUserPointRankResultDTO> getUserPointsRank(ExternalAppRequestParam externalAppRequestParam,
+    public Result<KcUserPointRankResultDTO> getUserPointsRank(@RequestHeader("CustomerId") String customerId,
                                                               @RequestBody PageFormDTO form) {
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<KcUserPointRankResultDTO>().ok(kcScreenService.getUserPointsRank(customerId, form.getPageNo(), form.getPageSize()));
     }
 
     /**
      * 党建声音-各类总数
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("news/summary")
-    public Result<ScreenKcNewsSummaryResultDTO> getNewsSummary(ExternalAppRequestParam externalAppRequestParam){
+    public Result<ScreenKcNewsSummaryResultDTO> getNewsSummary(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<ScreenKcNewsSummaryResultDTO>().ok(kcScreenService.getNewsSummary(customerId));
     }
 
     /**
      * 新闻阅读参与趋势
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("news/partitrend")
-    public Result<ScreenKcNewsPartiTrendResultDTO> getNewsPartiTrend(ExternalAppRequestParam externalAppRequestParam){
+    public Result<ScreenKcNewsPartiTrendResultDTO> getNewsPartiTrend(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<ScreenKcNewsPartiTrendResultDTO>().ok(kcScreenService.getNewsPartiTrend(customerId));
     }
 
     /**
      * 党建声音-分类的news数量
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("news/category")
-    public Result<List<ScreenKcCategoryNewsCountResultDTO>> getNewsCountGroupByCategory(ExternalAppRequestParam externalAppRequestParam){
+    public Result<List<ScreenKcCategoryNewsCountResultDTO>> getNewsCountGroupByCategory(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<List<ScreenKcCategoryNewsCountResultDTO>>().ok(kcScreenService.getNewsCountOfCategory(customerId));
     }
 
     /**
      * 党建声音-分类的用户参与数排行
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("news/userparticategoryrank")
-    public Result<ScreenKcCategoryNewsRankResultDTO> getNewsPartiCategoryRank(ExternalAppRequestParam externalAppRequestParam){
+    public Result<ScreenKcCategoryNewsRankResultDTO> getNewsPartiCategoryRank(@RequestHeader("CustomerId") String customerId){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<ScreenKcCategoryNewsRankResultDTO>().ok(kcScreenService.getNewsPartiCategoryRank(customerId));
     }
 
     /**
      * 党建声音-热点新闻排行
-     * @param externalAppRequestParam
      * @return
      */
     @PostMapping("news/hotrank")
-    public Result<List<ScreenKcNewsHotRankResultDTO>> listNewsHotRank(ExternalAppRequestParam externalAppRequestParam,
+    public Result<List<ScreenKcNewsHotRankResultDTO>> listNewsHotRank(@RequestHeader("CustomerId") String customerId,
                                                                       @RequestBody PageFormDTO form){
-        String customerId = externalAppRequestParam.getCustomerId();
         return new Result<List<ScreenKcNewsHotRankResultDTO>>().ok(kcScreenService.getNewsHotRank(customerId, form.getPageNo(), form.getPageSize()));
     }
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/PartyMemberLeadController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.PartyMemberLeadService;
@@ -33,7 +32,6 @@ public class PartyMemberLeadController {
      * @author zxc
      * @date 2020/8/20 1:56 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("fineexample")
     public Result<FineExampleResultDTO> fineExample(@RequestBody FineExampleFormDTO fineExampleFormDTO){
         ValidatorUtils.validateEntity(fineExampleFormDTO, FineExampleFormDTO.FineExample.class);
@@ -46,7 +44,6 @@ public class PartyMemberLeadController {
      * @author zxc
      * @date 2020/8/20 2:35 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("contactmasslinechart")
     public Result<ContactMassLineChartResultDTO> contactMassLineChart(@RequestBody ContactMassLineChartFormDTO contactMassLineChartFormDTO){
         ValidatorUtils.validateEntity(contactMassLineChartFormDTO, ContactMassLineChartFormDTO.ContactMassLineChart.class);
@@ -59,7 +56,6 @@ public class PartyMemberLeadController {
      * @author zxc
      * @date 2020/8/20 3:19 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("volunteerservice")
     public Result<VolunteerServiceResultDTO> volunteerService(@RequestBody VolunteerServiceFormDTO volunteerServiceFormDTO){
         ValidatorUtils.validateEntity(volunteerServiceFormDTO, VolunteerServiceFormDTO.VolunteerService.class);
@@ -74,7 +70,6 @@ public class PartyMemberLeadController {
      * @author wangc
      * @date 2020.08.21 11:05
      **/
-    @ExternalAppRequestAuth
     @PostMapping("advancedbranchrank")
     Result<List<AdvanceBranchRankResultDTO>> advancedBranchRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
@@ -89,7 +84,6 @@ public class PartyMemberLeadController {
      * @author wangc
      * @date 2020.08.21 14:22
      **/
-    @ExternalAppRequestAuth
     @PostMapping("advancedpartymemberrank")
     Result<List<PartyUserPointResultDTO>> advancedPartymemberRank(@RequestBody AgencyAndNumFormDTO param){
         ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectService;
@@ -31,7 +30,6 @@ public class ScreenProjectController {
      * @author zxc
      * @date 2020/8/19 4:36 下午
      */
-    @ExternalAppRequestAuth
     @PostMapping("detail")
     public Result<ProjectDetailResultDTO> projectDetail(@RequestBody ProjectDetailFormDTO projectDetailFormDTO){
         ValidatorUtils.validateEntity(projectDetailFormDTO, ProjectDetailFormDTO.ProjectDetail.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenUserController.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.controller.screen;
 
-import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -35,7 +34,6 @@ public class ScreenUserController {
      * @Description  热心市民积分排行列表
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("userpointrank")
     public Result<List<UserPointRankListResultDTO>> userPointRank(@LoginUser TokenDto tokenDTO, @RequestBody UserPointRankFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, UserPointRankFormDTO.AddUserInternalGroup.class);
@@ -47,7 +45,6 @@ public class ScreenUserController {
      * @Description  党员（指标得分）排行
      * @author sun
      */
-    @InternalAppRequestAuth
     @PostMapping("partindexscroerank")
     public Result<List<PartIndexScroeRankResultDTO>> partIndexScroeRank(@LoginUser TokenDto tokenDTO, @RequestBody PartIndexScroeRankFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, PartIndexScroeRankFormDTO.AddUserInternalGroup.class);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
@@ -19,7 +18,7 @@ public interface AgencyService {
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
-    TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam);
+    TreeResultDTO tree(String customerId);
 
     /**
      * @Description  2、组织区域查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java

@@ -1,6 +1,5 @@
 package com.epmet.datareport.service.evaluationindex.screen;
 
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.dto.result.issue.*;
 import com.epmet.dto.result.project.*;
 import com.epmet.dto.result.user.*;
@@ -22,32 +21,28 @@ import com.epmet.evaluationindex.screen.dto.result.HomepageSummaryResultDTO;
 public interface KcScreenService {
 
     /**
-     *  @param externalAppRequestParam
      * @Description  首页-平台各类总数
      * @author sun
      */
-    HomepageSummaryResultDTO homepageSummary(ExternalAppRequestParam externalAppRequestParam);
+    HomepageSummaryResultDTO homepageSummary(String customerId);
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-各类总数汇总
      * @author sun
      */
-    HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam);
+    HeartSummaryResultDTO heartSummary(String customerId);
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-公益活动次数
      * @author sun
      */
-    HeartActcounttrendResultDTO heartActcounttrend(ExternalAppRequestParam externalAppRequestParam);
+    HeartActcounttrendResultDTO heartActcounttrend(String customerId);
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-志愿者画像
      * @author sun
      */
-    HeartVolunteerportrayalResultDTO heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam);
+    HeartVolunteerportrayalResultDTO heartVolunteerportrayal(String customerId);
 
     /**
      *  @param formDTO
@@ -67,25 +62,22 @@ public interface KcScreenService {
 
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-各类总数
      * @author sun
      */
-    GroupSummaryResultDTO groupSummary(ExternalAppRequestParam externalAppRequestParam);
+    GroupSummaryResultDTO groupSummary(String customerId);
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-话题参与趋势
      * @author sun
      */
-    GroupPartitopictrendResultDTO groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam);
+    GroupPartitopictrendResultDTO groupPartitopictrend(String customerId);
 
     /**
-     *  @param externalAppRequestParam
      * @Description  邻里党群-社群数量排名
      * @author sun
      */
-    GroupGridgroupcountrankResultDTO groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam);
+    GroupGridgroupcountrankResultDTO groupGridgroupcountrank(String customerId);
 
     /**
      *  @param formDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -1,7 +1,6 @@
 package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.constant.DataSourceConstant;
@@ -43,9 +42,8 @@ public class AgencyServiceImpl implements AgencyService {
      */
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
-    public TreeResultDTO tree(ExternalAppRequestParam externalAppRequestParam) {
+    public TreeResultDTO tree(String customerId) {
         // 1. 查询客户根组织ID
-        String customerId = externalAppRequestParam.getCustomerId();
 
         TreeResultDTO rootAgency = null;
         try {

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java

@@ -1,7 +1,6 @@
 package com.epmet.datareport.service.evaluationindex.screen.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenPartyUserRankDataDao;
@@ -99,37 +98,34 @@ public class KcScreenServiceImpl implements KcScreenService {
     private ScreenKcNewsRankDao screenKcNewsRankDao;
 
     /**
-     * @param externalAppRequestParam
      * @Description 首页-平台各类总数
      * @author sun
      */
     @Override
-    public HomepageSummaryResultDTO homepageSummary(ExternalAppRequestParam externalAppRequestParam) {
+    public HomepageSummaryResultDTO homepageSummary(String customerId) {
-        return screenKcPlatformSummaryDailyDao.selectSummaryDaily(externalAppRequestParam.getCustomerId());
+        return screenKcPlatformSummaryDailyDao.selectSummaryDaily(customerId);
     }
 
     /**
-     * @param externalAppRequestParam
      * @Description 公益互助-各类总数汇总
      * @author sun
      */
     @Override
-    public HeartSummaryResultDTO heartSummary(ExternalAppRequestParam externalAppRequestParam) {
+    public HeartSummaryResultDTO heartSummary(String customerId) {
-        return screenKcActSummaryDailyDao.selectHeartSummary(externalAppRequestParam.getCustomerId());
+        return screenKcActSummaryDailyDao.selectHeartSummary(customerId);
     }
 
     /**
-     * @param externalAppRequestParam
      * @Description 公益互助-公益活动次数
      * @author sun
      */
     @Override
-    public HeartActcounttrendResultDTO heartActcounttrend(ExternalAppRequestParam externalAppRequestParam) {
+    public HeartActcounttrendResultDTO heartActcounttrend(String customerId) {
         HeartActcounttrendResultDTO resultDTO = new HeartActcounttrendResultDTO();
         LinkedList<String> xAxis = new LinkedList<>();
         LinkedList<String> actCountDataList = new LinkedList<>();
         //1.按客户查询最近十二个月数据
-        List<ActTrendMonthlyResultDTO> list = screenKcActTrendMonthlyDao.selectActTrendMonthly(externalAppRequestParam.getCustomerId());
+        List<ActTrendMonthlyResultDTO> list = screenKcActTrendMonthlyDao.selectActTrendMonthly(customerId);
         //2.倒序遍历封装数据
         for (int i = list.size() - 1; i >= 0; i--) {
             xAxis.add(list.get(i).getMonthId());
@@ -142,16 +138,15 @@ public class KcScreenServiceImpl implements KcScreenService {
     }
 
     /**
-     *  @param externalAppRequestParam
      * @Description  公益互助-志愿者画像
      * @author sun
      */
     @Override
-    public HeartVolunteerportrayalResultDTO heartVolunteerportrayal(ExternalAppRequestParam externalAppRequestParam) {
+    public HeartVolunteerportrayalResultDTO heartVolunteerportrayal(String customerId) {
         HeartVolunteerportrayalResultDTO resultDTO = new HeartVolunteerportrayalResultDTO();
         GenderDistributionResultDTO genderDistribution = new GenderDistributionResultDTO();
         //1.根据客户Id查询最近日期志愿者统计数据
-        AgeDistributionResultDTO ageDistribution = screenKcVolunteerSummaryDailyDao.selectVolunteerSummaryDaily(externalAppRequestParam.getCustomerId());
+        AgeDistributionResultDTO ageDistribution = screenKcVolunteerSummaryDailyDao.selectVolunteerSummaryDaily(customerId);
         //2.封装数据并返回
         if (null == ageDistribution) {
             resultDTO.setAgeDistribution(new AgeDistributionResultDTO());
@@ -219,14 +214,13 @@ public class KcScreenServiceImpl implements KcScreenService {
     }
 
     /**
-     * @param externalAppRequestParam
      * @Description 邻里党群-各类总数
      * @author sun
      */
     @Override
-    public GroupSummaryResultDTO groupSummary(ExternalAppRequestParam externalAppRequestParam) {
+    public GroupSummaryResultDTO groupSummary(String customerId) {
         //1.按客户查询最近一天各网格各项数据的汇总值
-        GroupSummaryResultDTO resultDTO = screenKcGroupSummaryGridDailyDao.selectGroupSummaryDaily(externalAppRequestParam.getCustomerId());
+        GroupSummaryResultDTO resultDTO = screenKcGroupSummaryGridDailyDao.selectGroupSummaryDaily(customerId);
         if (null == resultDTO) {
             return new GroupSummaryResultDTO();
         }
@@ -246,17 +240,16 @@ public class KcScreenServiceImpl implements KcScreenService {
     }
 
     /**
-     * @param externalAppRequestParam
      * @Description 邻里党群-话题参与趋势
      * @author sun
      */
     @Override
-    public GroupPartitopictrendResultDTO groupPartitopictrend(ExternalAppRequestParam externalAppRequestParam) {
+    public GroupPartitopictrendResultDTO groupPartitopictrend(String customerId) {
         GroupPartitopictrendResultDTO resultDTO = new GroupPartitopictrendResultDTO();
         LinkedList<String> xAxis = new LinkedList<>();
         LinkedList<Integer> actCountDataList = new LinkedList<>();
         //1.按客户查询最近十二个月所有网格汇总数据
-        List<KcTopicTrendGridMonthlyResultDTO> list = screenKcTopicTrendGridMonthlyDao.selectActTrendMonthly(externalAppRequestParam.getCustomerId());
+        List<KcTopicTrendGridMonthlyResultDTO> list = screenKcTopicTrendGridMonthlyDao.selectActTrendMonthly(customerId);
         //2.倒序遍历封装数据
         for (int i = list.size() - 1; i >= 0; i--) {
             xAxis.add(list.get(i).getMonthId());
@@ -269,17 +262,16 @@ public class KcScreenServiceImpl implements KcScreenService {
     }
 
     /**
-     * @param externalAppRequestParam
      * @Description 邻里党群-社群数量排名
      * @author sun
      */
     @Override
-    public GroupGridgroupcountrankResultDTO groupGridgroupcountrank(ExternalAppRequestParam externalAppRequestParam) {
+    public GroupGridgroupcountrankResultDTO groupGridgroupcountrank(String customerId) {
         GroupGridgroupcountrankResultDTO resultDTO = new GroupGridgroupcountrankResultDTO();
         LinkedList<String> gridNameDataList = new LinkedList<>();
         LinkedList<Integer> groupCountDataList = new LinkedList<>();
         //1.按日期降序，查询客户最近一天所有网格数据，按每个网格的社区总数降序排列
-        LinkedList<GridNameGroupCountResultDTO> list = screenKcGroupSummaryGridDailyDao.selectGridDailyList(externalAppRequestParam.getCustomerId());
+        LinkedList<GridNameGroupCountResultDTO> list = screenKcGroupSummaryGridDailyDao.selectGridDailyList(customerId);
         //2.封装数据
         list.forEach(l -> {
             gridNameDataList.add(l.getGridName());