大屏数据接口修改

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

@@ -1,8 +1,21 @@
 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.screen.GrassRootsGovernService;
+import com.epmet.screen.dto.form.AgencyAndNumFormDTO;
+import com.epmet.screen.dto.form.AgencyFormDTO;
+import com.epmet.screen.dto.form.AgencyNumTypeParamFormDTO;
+import com.epmet.screen.dto.result.*;
+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 java.util.List;
+
 /**
  * 基层治理相关各指标查询
  *
@@ -12,4 +25,85 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/screen/grassrootsgovern")
 public class GrassRootsGovernController {
+
+    @Autowired
+    private GrassRootsGovernService grassRootsGovernService;
+
+
+
+    /**
+     * @Description 1、热心市民积分排行
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321544
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.20 11:16
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("userpointrank")
+    public Result<UserPointRankResultDTO> userPointRank(@RequestBody AgencyAndNumFormDTO param){
+        ValidatorUtils.validateEntity(param,AgencyFormDTO.CommonAgencyIdGroup.class);
+        return new Result<UserPointRankResultDTO>().ok(grassRootsGovernService.userPointRank(param));
+    }
+
+    /**
+     * @Description 2、难点赌点-耗时最长|涉及部门最多|处理次数
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
+     * @param param
+     * @return
+     * @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);
+        return new Result<List<DifficultProjectResultDTO>>().ok(grassRootsGovernService.difficultProject(param));
+    }
+
+    /**
+     * @Description 3、公众参与概况
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321975
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.20 14:37
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("publicpartiprofile")
+    public Result<PublicPartiProfileResultDTO> publicPartiProfile(@RequestBody AgencyFormDTO param){
+        ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
+        return new Result<PublicPartiProfileResultDTO>().ok(grassRootsGovernService.publicPartiProfile(param));
+    }
+
+    /**
+     * @Description 4、公众参与-排行榜
+     * @NEI https://nei.netease.com/interface/detail/?pid=57068&id=321978
+     * @param param
+     * @return
+     * @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);
+        return new  Result<List<PublicPartiRankResultDTO>>().ok(grassRootsGovernService.publicPartiRank(param));
+    }
+
+    /**
+     * @Description 5、治理能力榜单
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321627
+     * @param param
+     * @return
+     * @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);
+        return new  Result<List<GovernCapacityRankResultDTO>>().ok(grassRootsGovernService.governCapacityRank(param));
+    }
+
 }

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

@@ -1,13 +1,20 @@
 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.dao.screen.ScreenUserTotalDataDao;
 import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
+import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
+import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
 import com.epmet.screen.dto.form.ParymemberFormDTO;
+import com.epmet.screen.dto.result.BranchBuildRankResultDTO;
+import com.epmet.screen.dto.result.BranchBuildTrendResultDTO;
+import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO;
 import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
 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;
 
@@ -32,10 +39,56 @@ public class GrassrootsPartyDevController {
      * @author wangc
      * @date 2020.08.18 16:59
     **/
+    @ExternalAppRequestAuth
     @PostMapping("basicinfo")
-    Result<PartymemberPercentResultDTO> partymemberBaseInfo(ParymemberFormDTO param){
+    public Result<PartymemberPercentResultDTO> baseInfo(@RequestBody ParymemberFormDTO param){
         ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
         return new Result<PartymemberPercentResultDTO>().ok(grassrootsPartyDevService.partymemberBaseInfo(param));
     }
 
+    /**
+     * @Description 2、党员基本情况-年龄分布
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321980
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.18 17:54
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("ageinfo")
+    public Result<PartymemberAgeDistributionResultDTO> ageInfo(@RequestBody ParymemberFormDTO param){
+        ValidatorUtils.validateEntity(param, ParymemberFormDTO.Parymember.class);
+        return new Result<PartymemberAgeDistributionResultDTO>().ok(grassrootsPartyDevService.partymemberAgeDistribution(param));
+    }
+
+    /**
+     * @Description 3、支部建设情况|联建共建情况-折线图
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321981
+     * @param param
+     * @return BranchBuildTrendResultDTO
+     * @author wangc
+     * @date 2020.08.19 11:02
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("branchbuildtrend")
+    public Result<BranchBuildTrendResultDTO> branchBuildTrend(@RequestBody BranchBuildTrendFormDTO param){
+        ValidatorUtils.validateEntity(param, BranchBuildTrendFormDTO.branchBuildTrendGroup.class);
+        return new Result<BranchBuildTrendResultDTO>().ok(grassrootsPartyDevService.branchBuildTrend(param));
+    }
+
+    /**
+     * @Description 4、支部建设情况|联建共建情况-排行
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.19 15:25
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("branchbuildrank")
+    public Result<BranchBuildRankResultDTO> branchBuildRank(@RequestBody BranchBuildRankFormDTO param){
+        ValidatorUtils.validateEntity(param, BranchBuildRankFormDTO.BranchBuildRankGroup.class);
+        return new Result<BranchBuildRankResultDTO>().ok(grassrootsPartyDevService.branchBuildRank(param));
+    }
+
 }

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

@@ -4,18 +4,16 @@ 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.screen.PartyMemberLeadService;
-import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
+import com.epmet.screen.dto.form.*;
-import com.epmet.screen.dto.form.FineExampleFormDTO;
+import com.epmet.screen.dto.result.*;
-import com.epmet.screen.dto.form.VolunteerServiceFormDTO;
-import com.epmet.screen.dto.result.ContactMassLineChartResultDTO;
-import com.epmet.screen.dto.result.FineExampleResultDTO;
-import com.epmet.screen.dto.result.VolunteerServiceResultDTO;
 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 java.util.List;
+
 /**
  * 党建引领相关各指标查询
  *
@@ -68,4 +66,34 @@ public class PartyMemberLeadController {
         return new Result<VolunteerServiceResultDTO>().ok(partyMemberLeadService.volunteerService(volunteerServiceFormDTO));
     }
 
+    /**
+     * @Description 4、先进排行榜单-先进支部排行
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321539
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.08.21 11:05
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("advancedbranchrank")
+    Result<List<AdvanceBranchRankResultDTO>> advancedBranchRank(@RequestBody AgencyAndNumFormDTO param){
+        ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
+        return new Result<List<AdvanceBranchRankResultDTO>>().ok(partyMemberLeadService.advancedBranchRank(param));
+    }
+
+    /**
+     * @Description 5、先进排行榜单-先进党员排行
+     * @NEI https://nei.netease.com/interface/detail/req/?pid=57068&id=321624
+     * @param param
+     * @return List<PartyUserPointResultDTO>
+     * @author wangc
+     * @date 2020.08.21 14:22
+     **/
+    @ExternalAppRequestAuth
+    @PostMapping("advancedpartymemberrank")
+    Result<List<PartyUserPointResultDTO>> advancedPartymemberRank(@RequestBody AgencyAndNumFormDTO param){
+        ValidatorUtils.validateEntity(param, AgencyFormDTO.CommonAgencyIdGroup.class);
+        return new Result<List<PartyUserPointResultDTO>>().ok(partyMemberLeadService.advancedPartymemberRank(param));
+    }
+
 }