elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

去掉外部应用鉴权依赖，去掉相关注解和类的引用

dev_shibei_match
wxz 5 years ago
parent
b9bdbfae7d
commit
5e129bc5fa
5 changed files with 132 additions and 204 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  2. 55
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java
  3. 12
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
  4. 159
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java
  5. 108
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java

2
epmet-module/data-statistical/data-statistical-server/pom.xml
View File

@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-extapp-auth</artifactId>
<artifactId>common-service-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>

55
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java
View File

@ -1,15 +1,10 @@
package com.epmet.controller;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.indexcollect.form.*;
import com.epmet.service.evaluationindex.indexcoll.FactIndexCollectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* 指标采集相关api
@ -27,128 +22,112 @@ public class FactIndexCollectController {
/**
* 1、党建能力-党员相关指标上报(按照月份)
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("gridpartymemberdata")
public Result gridPartyMemberData(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridPartyMemberDataFormDTO formDTO) {
factIndexCollectService.insertGridPartyMemberData(formDTO,externalAppRequestParam.getCustomerId() );
public Result gridPartyMemberData(@RequestHeader("CustomerId") String customerId, @RequestBody GridPartyMemberDataFormDTO formDTO) {
factIndexCollectService.insertGridPartyMemberData(formDTO, customerId);
return new Result();
}
/**
* 2、党建能力-网格相关指标上报(按照月份)
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("gridpartyability")
public Result gridPartyAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridPartyAbilityDataFormDTO formDTO) {
factIndexCollectService.insertGridPartyAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result gridPartyAbility(@RequestHeader("CustomerId") String customerId, @RequestBody GridPartyAbilityDataFormDTO formDTO) {
factIndexCollectService.insertGridPartyAbility(formDTO, customerId);
return new Result();
}
/**
* 3、党建能力-街道及社区相关指标
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("orgpartyability")
public Result orgPartyAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgPartyAbilityDataFormDTO formDTO) {
factIndexCollectService.insertOrgPartyAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result orgPartyAbility(@RequestHeader("CustomerId") String customerId, @RequestBody OrgPartyAbilityDataFormDTO formDTO) {
factIndexCollectService.insertOrgPartyAbility(formDTO, customerId);
return new Result();
}
/**
* 4、服务能力-网格相关指标
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("gridserviceability")
public Result gridServiceAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridServiceAbilityDataFormDTO formDTO) {
factIndexCollectService.insertGridServiceAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result gridServiceAbility(@RequestHeader("CustomerId") String customerId, @RequestBody GridServiceAbilityDataFormDTO formDTO) {
factIndexCollectService.insertGridServiceAbility(formDTO, customerId);
return new Result();
}
/**
* 5、服务能力-组织（街道|社区|全区）相关指标
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("orgserviceability")
public Result orgServiceAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgServiceAbilityDataFormDTO formDTO) {
factIndexCollectService.insertOrgServiceAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result orgServiceAbility(@RequestHeader("CustomerId") String customerId, @RequestBody OrgServiceAbilityDataFormDTO formDTO) {
factIndexCollectService.insertOrgServiceAbility(formDTO, customerId);
return new Result();
}
/**
* 6、治理能力-网格相关指标
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("gridgovrnability")
public Result gridGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody GridGovrnAbilityDataFormDTO formDTO) {
factIndexCollectService.insertGridGovrnAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result gridGovrnAbility(@RequestHeader("CustomerId") String customerId, @RequestBody GridGovrnAbilityDataFormDTO formDTO) {
factIndexCollectService.insertGridGovrnAbility(formDTO, customerId);
return new Result();
}
/**
* 7、治理能力-街道及社区相关指标
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("orggovrnability")
public Result orgGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgGovrnAbilityDataFormDTO formDTO) {
factIndexCollectService.insertOrgGovrnAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result orgGovrnAbility(@RequestHeader("CustomerId") String customerId, @RequestBody OrgGovrnAbilityDataFormDTO formDTO) {
factIndexCollectService.insertOrgGovrnAbility(formDTO, customerId);
return new Result();
}
/**
* 8、治理能力-部门相关指标
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("deptgovrnability")
public Result deptGovrnAbility(ExternalAppRequestParam externalAppRequestParam, @RequestBody DeptGovrnAbilityDataFormDTO formDTO) {
factIndexCollectService.insertDeptGovrnAbility(formDTO, externalAppRequestParam.getCustomerId());
public Result deptGovrnAbility(@RequestHeader("CustomerId") String customerId, @RequestBody DeptGovrnAbilityDataFormDTO formDTO) {
factIndexCollectService.insertDeptGovrnAbility(formDTO, customerId);
return new Result();
}
}

12
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java
View File

@ -1,7 +1,5 @@
package com.epmet.controller;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.enums.EnvEnum;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.redis.RedisKeys;
@ -20,10 +18,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import lombok.extern.slf4j.Slf4j;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.PreDestroy;
import java.util.Date;
@ -103,11 +98,8 @@ public class IndexCalculateController {
* @Author zhangyongç
* @Date 10:52 2020-08-20
**/
@ExternalAppRequestAuth
@PostMapping("all")
public Result<Boolean> indexCalculate(ExternalAppRequestParam externalAppRequestParam, @RequestBody CalculateCommonFormDTO formDTO) {
String customerId = externalAppRequestParam.getCustomerId();
//String customerId = "epmettest";
public Result<Boolean> indexCalculate(@RequestHeader("CustomerId") String customerId, @RequestBody CalculateCommonFormDTO formDTO) {
formDTO.setCustomerId(customerId);
indexCalculate(formDTO);
return new Result<Boolean>().ok(true);

159
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java
View File

@ -1,16 +1,11 @@
package com.epmet.controller;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.ScreenCollFormDTO;
import com.epmet.dto.screencoll.form.*;
import com.epmet.service.evaluationindex.screen.KcScreenCollService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* 孔村大屏数据采集api
@ -31,16 +26,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_platform_summary_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("homepage/platformsummary")
public Result platFormSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
kcScreenCollService.insertPlatFormSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result platFormSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcHomePageFormDTO> formDTO) {
kcScreenCollService.insertPlatFormSummary(formDTO, customerId);
return new Result();
}
@ -50,16 +45,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_issue_summary_grid_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("issue/summary")
public Result issueSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
kcScreenCollService.insertIssueSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result issueSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcIssueSummaryFormDTO> formDTO) {
kcScreenCollService.insertIssueSummary(formDTO, customerId);
return new Result();
}
@ -69,16 +64,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table: screen_kc_issue_trend_grid_monthly
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("issue/trend")
public Result issueTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
kcScreenCollService.insertIssueTrend(formDTO, externalAppRequestParam.getCustomerId());
public Result issueTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcIssueTrendFormDTO> formDTO) {
kcScreenCollService.insertIssueTrend(formDTO, customerId);
return new Result();
}
@ -88,16 +83,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_user_summary_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("user/summary")
public Result userSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
kcScreenCollService.insertUserSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result userSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcUserSummaryFormDTO> formDTO) {
kcScreenCollService.insertUserSummary(formDTO, customerId);
return new Result();
}
@ -107,16 +102,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_volunteer_heat_rank_grid_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("volunteer/heartrank")
public Result volunteerHeartRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
kcScreenCollService.insertVolunteerHeartRank(formDTO, externalAppRequestParam.getCustomerId());
public Result volunteerHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcVolunteerHeartRankFormDTO> formDTO) {
kcScreenCollService.insertVolunteerHeartRank(formDTO, customerId);
return new Result();
}
@ -126,16 +121,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_user_trend_grid_monthly
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("user/userheartrank")
public Result userHeartRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
kcScreenCollService.insertUserHeartRank(formDTO, externalAppRequestParam.getCustomerId());
public Result userHeartRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcUserHeartRankFormDTO> formDTO) {
kcScreenCollService.insertUserHeartRank(formDTO, customerId);
return new Result();
}
@ -145,16 +140,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_act_summary_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("act/summary")
public Result actSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
kcScreenCollService.insertActSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result actSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcActSummaryFormDTO> formDTO) {
kcScreenCollService.insertActSummary(formDTO, customerId);
return new Result();
}
@ -164,16 +159,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_act_trend_monthly
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("act/trend")
public Result actTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
kcScreenCollService.insertActTrend(formDTO, externalAppRequestParam.getCustomerId());
public Result actTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcActTrendFormDTO> formDTO) {
kcScreenCollService.insertActTrend(formDTO, customerId);
return new Result();
}
@ -183,16 +178,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_volunteer_summary_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("act/volunteersummary")
public Result volunteerSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
kcScreenCollService.insertVolunteerSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result volunteerSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcVolunteerSummaryFormDTO> formDTO) {
kcScreenCollService.insertVolunteerSummary(formDTO, customerId);
return new Result();
}
@ -202,16 +197,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_project_summary_grid_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("project/summary")
public Result projectSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
kcScreenCollService.insertProjectSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result projectSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcProjectSummaryFormDTO> formDTO) {
kcScreenCollService.insertProjectSummary(formDTO, customerId);
return new Result();
}
@ -221,16 +216,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_project_category_grid_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("project/categorysummary")
public Result categorySummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
kcScreenCollService.insertCategorySummary(formDTO, externalAppRequestParam.getCustomerId());
public Result categorySummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcCategorySummaryFormDTO> formDTO) {
kcScreenCollService.insertCategorySummary(formDTO, customerId);
return new Result();
}
@ -240,16 +235,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_project_satis_grid_monthly
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("project/satisanalysis")
public Result projectSatisanalysis(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
kcScreenCollService.insertProjectSatisanalysis(formDTO, externalAppRequestParam.getCustomerId());
public Result projectSatisanalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcProjectSatisanalysisFormDTO> formDTO) {
kcScreenCollService.insertProjectSatisanalysis(formDTO, customerId);
return new Result();
}
@ -259,16 +254,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_news_summary_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("news/summary")
public Result newsSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
kcScreenCollService.insertNewsSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result newsSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsSummaryFormDTO> formDTO) {
kcScreenCollService.insertNewsSummary(formDTO, customerId);
return new Result();
}
@ -278,16 +273,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_news_trend_monthly
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("news/trend")
public Result newsTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
kcScreenCollService.insertNewsTrend(formDTO, externalAppRequestParam.getCustomerId());
public Result newsTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsTrendFormDTO> formDTO) {
kcScreenCollService.insertNewsTrend(formDTO, customerId);
return new Result();
}
@ -297,16 +292,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_news_rank
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("news/hotrank")
public Result newsHotRank(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
kcScreenCollService.insertNewsHotRank(formDTO, externalAppRequestParam.getCustomerId());
public Result newsHotRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsHotRankFormDTO> formDTO) {
kcScreenCollService.insertNewsHotRank(formDTO, customerId);
return new Result();
}
@ -316,16 +311,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_news_category_analysis
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("news/categoryanalysis")
public Result newsCategoryAnalysis(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
kcScreenCollService.insertNewsCategoryAnalysis(formDTO, externalAppRequestParam.getCustomerId());
public Result newsCategoryAnalysis(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcNewsCategoryAnalysisFormDTO> formDTO) {
kcScreenCollService.insertNewsCategoryAnalysis(formDTO, customerId);
return new Result();
}
@ -335,16 +330,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_group_summary_grid_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("group/summary")
public Result groupSummary(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
kcScreenCollService.insertGroupSummary(formDTO, externalAppRequestParam.getCustomerId());
public Result groupSummary(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupSummaryFormDTO> formDTO) {
kcScreenCollService.insertGroupSummary(formDTO, customerId);
return new Result();
}
@ -354,16 +349,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_group_detail_grid_daily
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("group/detail")
public Result groupDetail(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
kcScreenCollService.insertGroupDetail(formDTO, externalAppRequestParam.getCustomerId());
public Result groupDetail(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupDetailFormDTO> formDTO) {
kcScreenCollService.insertGroupDetail(formDTO, customerId);
return new Result();
}
@ -373,16 +368,16 @@ public class KcScreenCollController {
* 所以如果项目上是分批上传，第一次为isFirst=true,后面isFirst应为false
* table:screen_kc_topic_trend_grid_monthly
*
* @param externalAppRequestParam
*
* @param formDTO
* @return void
* @Author zhangyong
* @Date 15:57 2020-09-09
**/
@ExternalAppRequestAuth
@PostMapping("group/topictrend")
public Result groupTopicTrend(ExternalAppRequestParam externalAppRequestParam, @RequestBody ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
kcScreenCollService.insertGroupTopicTrend(formDTO, externalAppRequestParam.getCustomerId());
public Result groupTopicTrend(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<KcGroupTopicTrendFormDTO> formDTO) {
kcScreenCollService.insertGroupTopicTrend(formDTO, customerId);
return new Result();
}
}

108
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java
View File

@ -1,15 +1,10 @@
package com.epmet.controller;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import com.epmet.service.evaluationindex.screen.ShiBeiScreenCollService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
@ -28,144 +23,126 @@ public class ShiBeiScreenCollController {
/**
* 9、党建引领|基层治理-居民（党员）积分排行榜
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("partyuserrankdata")
public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PartyUserRankDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPartyUserRankData(formDTO, externalAppRequestParam.getCustomerId());
public Result partyUserRankData(@RequestHeader("CustomerId") String customerId, @RequestBody PartyUserRankDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPartyUserRankData(formDTO, customerId);
return new Result();
}
/**
* 8、党建引领-党员联系群众数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("partylinkmassesdata")
public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PartyLinkMassesDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
public Result partyLinkMassesData(@RequestHeader("CustomerId") String customerId, @RequestBody PartyLinkMassesDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPartyLinkMassesData(formDTO, customerId);
return new Result();
}
/**
* 7、基层党建-建设情况数据（支部、联建、志愿）
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("meetdata")
public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PartyBranchDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
public Result meetData(@RequestHeader("CustomerId") String customerId, @RequestBody PartyBranchDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPartyBranchData(formDTO, customerId);
return new Result();
}
/**
* 6、党建引领-组织排行
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("orgrankdata")
public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody OrgRankDataListFormDTO formDTO) {
shiBeiScreenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
public Result orgRankData(@RequestHeader("CustomerId") String customerId, @RequestBody OrgRankDataListFormDTO formDTO) {
shiBeiScreenCollService.insertOrgRankData(formDTO, customerId);
return new Result();
}
/**
* 5、基层治理-治理能力数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("governrankdata")
public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody GovernRankDataListFormDTO formDTO) {
shiBeiScreenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
public Result governRankData(@RequestHeader("CustomerId") String customerId, @RequestBody GovernRankDataListFormDTO formDTO) {
shiBeiScreenCollService.insertGovernRankData(formDTO, customerId);
return new Result();
}
/**
* 4、事件数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("eventdata")
public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody EventDataListFormDTO formDTO) {
shiBeiScreenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
public Result eventData(@RequestHeader("CustomerId") String customerId, @RequestBody EventDataListFormDTO formDTO) {
shiBeiScreenCollService.insertEventData(formDTO, customerId);
return new Result();
}
/**
* 3、难点赌点
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("difficultydata")
public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody DifficultyDataFormDTO formDTO) {
shiBeiScreenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
public Result difficultyData(@RequestHeader("CustomerId") String customerId, @RequestBody DifficultyDataFormDTO formDTO) {
shiBeiScreenCollService.insertDifficultyData(formDTO, customerId);
return new Result();
}
/**
* 2、党员基本情况
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("cpcbasedata")
public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody CpcBaseDataListFormDTO formDTO) {
shiBeiScreenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
public Result cpcbaseData(@RequestHeader("CustomerId") String customerId, @RequestBody CpcBaseDataListFormDTO formDTO) {
shiBeiScreenCollService.insertCpcbaseData(formDTO, customerId);
return new Result();
}
/**
* 1、指数_按月统计
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("indexdatamonthly")
public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody IndexDataListMonthlyFormDTO formDTO) {
shiBeiScreenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
public Result indexDataMonthly(@RequestHeader("CustomerId") String customerId, @RequestBody IndexDataListMonthlyFormDTO formDTO) {
shiBeiScreenCollService.insertIndexDataMonthly(formDTO, customerId);
return new Result();
}
@ -174,112 +151,98 @@ public class ShiBeiScreenCollController {
/**
* 17、指数_按年统计
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("indexdatayearly")
public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody IndexDataListYearlyFormDTO formDTO) {
shiBeiScreenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
public Result indexDataYearly(@RequestHeader("CustomerId") String customerId, @RequestBody IndexDataListYearlyFormDTO formDTO) {
shiBeiScreenCollService.insertIndexDataYearly(formDTO, customerId);
return new Result();
}
/**
* 16、部门信息上传
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("customerdept")
public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody CustomerDeptListFormDTO formDTO) {
shiBeiScreenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
public Result customerDept(@RequestHeader("CustomerId") String customerId, @RequestBody CustomerDeptListFormDTO formDTO) {
shiBeiScreenCollService.insertCustomerDept(formDTO, customerId);
return new Result();
}
/**
* 15、网格信息上传
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("customergrid")
public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody CustomerGridListFormDTO formDTO) {
shiBeiScreenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
public Result customerGrid(@RequestHeader("CustomerId") String customerId, @RequestBody CustomerGridListFormDTO formDTO) {
shiBeiScreenCollService.insertCustomerGrid(formDTO, customerId);
return new Result();
}
/**
* 14、组织层级
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("customeragency")
public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody CustomerAgencyListFormDTO formDTO) {
shiBeiScreenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
public Result customerAgency(@RequestHeader("CustomerId") String customerId, @RequestBody CustomerAgencyListFormDTO formDTO) {
shiBeiScreenCollService.insertCustomerAgency(formDTO, customerId);
return new Result();
}
/**
* 12、中央区各类总数
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("usertotaldata")
public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody UserTotalDataListFormDTO formDTO) {
shiBeiScreenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
public Result userTotalData(@RequestHeader("CustomerId") String customerId, @RequestBody UserTotalDataListFormDTO formDTO) {
shiBeiScreenCollService.insertUserTotalData(formDTO, customerId);
return new Result();
}
/**
* 11、基层治理-公众参与
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("userjoin")
public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody UserJoinListFormDTO formDTO) {
shiBeiScreenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
public Result userJoin(@RequestHeader("CustomerId") String customerId, @RequestBody UserJoinListFormDTO formDTO) {
shiBeiScreenCollService.insertUserJoin(formDTO, customerId);
return new Result();
}
/**
* 10、党建引领-先锋模范数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("pioneerdata")
public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PioneerDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
public Result pioneerData(@RequestHeader("CustomerId") String customerId, @RequestBody PioneerDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPioneerData(formDTO, customerId);
return new Result();
}
@ -293,10 +256,9 @@ public class ShiBeiScreenCollController {
* @Author zhangyong
* @Date 09:44 2020-08-25
**/
@ExternalAppRequestAuth
@PostMapping("publicpartitotaldata")
public Result publicPartiTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody PublicPartiTotalDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPublicPartiTotalData(formDTO, externalAppRequestParam.getCustomerId());
public Result publicPartiTotalData(@RequestHeader("CustomerId") String customerId, @RequestBody PublicPartiTotalDataListFormDTO formDTO) {
shiBeiScreenCollService.insertPublicPartiTotalData(formDTO, customerId);
return new Result();
}
}

Write Preview
Loading…
Cancel
Save