From 8a1ef47d12bd70d0d555c7c6e2b46c2bef4e5585 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 12 Feb 2020 09:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=80=81=E9=BE=84=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E5=85=9A=E5=91=98=E5=B9=B4=E8=BD=BB=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/user/form/MemberRankFormDTO.java | 43 +++++++++++++ .../user/result/OldMemberRankResultDTO.java | 34 ++++++++++ .../user/result/YoungMemberRankResultDTO.java | 34 ++++++++++ .../controller/UserAnalysisController.java | 44 +++++++++++++ .../modules/user/dao/OldMemberRankDao.java | 28 +++++++++ .../modules/user/dao/YoungMemberRankDao.java | 29 +++++++++ .../user/service/OldMemberRankService.java | 24 +++++++ .../user/service/YoungMemberRankService.java | 24 +++++++ .../impl/OldMemberRankServiceImpl.java | 34 ++++++++++ .../impl/YoungMemberRankServiceImpl.java | 35 +++++++++++ .../mapper/user/OldMemberRankDao.xml | 63 +++++++++++++++++++ .../mapper/user/YoungMemberRankDao.xml | 63 +++++++++++++++++++ .../controller/ApiAnalysisUserController.java | 17 +++++ .../epdc/feign/AnalysisUserFeignClient.java | 28 ++++++++- .../AnalysisUserFeignClientFallback.java | 15 +++++ .../epdc/service/AnalysisUserService.java | 25 +++++++- .../service/impl/AnalysisUserServiceImpl.java | 17 +++++ 17 files changed, 555 insertions(+), 2 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java new file mode 100644 index 000000000..34739213e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @author songyunpeng + * @Description 党员老龄化和年轻化排名查询表单 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class MemberRankFormDTO { + + /** + * 页码 + */ + @NotNull(message = "页码不能为空") + private Integer pageIndex; + /** + * 页容量 + */ + @NotNull(message = "分页数量不能为空") + private Integer pageSize; + /** + * 时间戳(yyyy-MM-dd HH:mm:ss) + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + /** + * 排序状态（1：降序，2升序） + */ + @NotBlank(message = "排序状态不能为空") + private String sortState; + /** + * 部门Id + */ + @NotBlank(message = "部门ID不能为空") + private String deptId; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java new file mode 100644 index 000000000..f10d6d845 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description 党员老龄化排名结果 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class OldMemberRankResultDTO implements Serializable { + /** + * 部门ID + */ + private String deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 党员数 + */ + private Integer partyMemberCount; + /** + * 超过50岁党员数 + */ + private Integer oldMemberCount; + /** + * 比例 + */ + private String proportion; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java new file mode 100644 index 000000000..ec567d6f1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description 党员年轻化排名结果 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class YoungMemberRankResultDTO implements Serializable { + /** + * 部门ID + */ + private String deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 党员数 + */ + private Integer partyMemberCount; + /** + * 超过50岁党员数 + */ + private Integer youngMemberCount; + /** + * 比例 + */ + private String proportion; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java index 337fc2650..366574934 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java @@ -1,5 +1,17 @@ package com.elink.esua.epdc.modules.user.controller; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; +import com.elink.esua.epdc.modules.user.service.OldMemberRankService; +import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; @@ -13,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 数据端，用户数据分析相关接口 * @@ -27,6 +41,12 @@ public class UserAnalysisController { @Autowired private UserAnalysisService userAnalysisService; + @Autowired + private OldMemberRankService oldMemberRankService; + + @Autowired + private YoungMemberRankService youngMemberRankService; + /** * PC端用户数据分析，用户注册排行，党员排行 * @@ -52,4 +72,28 @@ public class UserAnalysisController { PageData page = userAnalysisService.listPageGridOpening(params); return new Result>().ok(page); } + /** + * @Description 党员老龄化列表 + * @Author songyunpeng + * @Date 2020/2/11 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("partyMemberOldSort") + public Result> listOldMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.oldMemberRankService.listOldMemberRankByDeptId(formDto); + } + /** + * @Description 党员年轻化列表 + * @Author songyunpeng + * @Date 2020/2/11 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("partyMemberyoungSort") + public Result> listYoungMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return this.youngMemberRankService.listYoungMemberRankByDeptId(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java new file mode 100644 index 000000000..6fadc2758 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/OldMemberRankDao.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.modules.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @author songyunpeng + * @Description + * @create 2020-02-11 + */ + +@Mapper +public interface OldMemberRankDao extends BaseMapper { + + /** + * 移动端党员老龄化排名列表 + * @Params: [formDTO] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/9 15:13 + */ + List selectListOfOldMemberRank(MemberRankFormDTO formDto,List deptIdList); + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java new file mode 100644 index 000000000..aa4c704db --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/YoungMemberRankDao.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.modules.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @author songyunpeng + * @Description + * @create 2020-02-11 + */ + +@Mapper +public interface YoungMemberRankDao extends BaseMapper { + + /** + * 移动端党员年轻化化排名列表 + * @Params: [formDTO] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/9 15:13 + */ + List selectListOfYoungMemberRank(MemberRankFormDTO formDto, List deptIdList); + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java new file mode 100644 index 000000000..54bf49b24 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/OldMemberRankService.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.modules.user.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; + +import java.util.List; + +/** + * @author songyunpeng + * @Description 党员老龄化排名 + * @create 2020-02-11 12:42 下午 + */ + +public interface OldMemberRankService { + + /** + * 党员老龄化排名列表-移动app端用 + * @Params: [formDto] + * @Return: OldMemberRankResultDTO + */ + Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java new file mode 100644 index 000000000..0b8f749fc --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/YoungMemberRankService.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.modules.user.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; + +import java.util.List; + +/** + * @author songyunpeng + * @Description 党员年轻化化排名 + * @create 2020-02-11 12:42 下午 + */ + +public interface YoungMemberRankService { + + /** + * 党员年轻化排名列表-移动app端用 + * @Params: [formDto] + * @Return: YoungMemberRankResultDTO + */ + Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java new file mode 100644 index 000000000..d94cf4e37 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/OldMemberRankServiceImpl.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.modules.user.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.modules.user.dao.OldMemberRankDao; +import com.elink.esua.epdc.modules.user.service.OldMemberRankService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author songyunpeng + * @Description + * @create 2020-02-11 12:48 下午 + */ + +@Slf4j +@Service +public class OldMemberRankServiceImpl extends BaseServiceImpl implements OldMemberRankService { + + + @Override + public Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.selectListOfOldMemberRank(formDto, SecurityUser.getUser().getDeptIdList()); + return new Result>().ok(data); } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java new file mode 100644 index 000000000..6ed6561cb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/YoungMemberRankServiceImpl.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.modules.user.service.impl; + +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; +import com.elink.esua.epdc.modules.user.dao.OldMemberRankDao; +import com.elink.esua.epdc.modules.user.dao.YoungMemberRankDao; +import com.elink.esua.epdc.modules.user.service.OldMemberRankService; +import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author songyunpeng + * @Description + * @create 2020-02-11 12:48 下午 + */ +@Slf4j +@Service +public class YoungMemberRankServiceImpl extends BaseServiceImpl implements YoungMemberRankService { + + + @Override + public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.selectListOfYoungMemberRank(formDto, SecurityUser.getUser().getDeptIdList()); + return new Result>().ok(data); } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml new file mode 100644 index 000000000..1748fa04a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml new file mode 100644 index 000000000..61ef24947 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java index 831ead245..32f4beac7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisUserController.java @@ -3,6 +3,12 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.service.AnalysisItemService; import com.elink.esua.epdc.service.AnalysisUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -10,6 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 移动端接口-数据分析模块(项目) * @Author LPF @@ -34,4 +42,13 @@ public class ApiAnalysisUserController { public Result test(@LoginUser TokenDto tokenDto) { return analysisUserService.test(); } + + @GetMapping("/partyMemberOldSort") + public Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto) { + return analysisUserService.listOldMemberRankByDeptId(formDto); + } + @GetMapping("/partyMemberyoungSort") + public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { + return analysisUserService.listYoungMemberRankByDeptId(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java index d452a7470..c3ad9e5c2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisUserFeignClient.java @@ -3,14 +3,21 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; +import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback; import com.elink.esua.epdc.feign.fallback.AnalysisUserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import java.util.List; + /** - * 评价模块调用-移动app端 + * 数据分析模块调用-移动app端 * @Author LPF * @Date 2019/11/18 16:39 */ @@ -29,5 +36,24 @@ public interface AnalysisUserFeignClient { Result test(); + /** + * @Description 党员老龄化排名列表 + * @Author songyunpeng + * @Date 2020/2/11 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "analysis/user/partyMemberOldSort", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto); + /** + * @Description 党员年轻化化排名列表 + * @Author songyunpeng + * @Date 2020/2/11 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "analysis/user/partyMemberyoungSort", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java index 1c6bedd49..0be69b21c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisUserFeignClientFallback.java @@ -3,10 +3,15 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; import com.elink.esua.epdc.feign.AnalysisUserFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author LPF * @Date 2019/11/18 16:39 @@ -20,4 +25,14 @@ public class AnalysisUserFeignClientFallback implements AnalysisUserFeignClient return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test"); } + @Override + public Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listOldMemberRankByDeptId",formDto); + } + + @Override + public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "listYoungMemberRankByDeptId",formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java index 0efffa65d..d155937d1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisUserService.java @@ -1,6 +1,14 @@ package com.elink.esua.epdc.service; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; + +import java.util.List; /** * 项目模块-数据分析移动端 @@ -17,6 +25,21 @@ public interface AnalysisUserService { * @Date: 2019/11/19 16:37 */ Result test(); - + /** + * @Description 获取党员老龄化排名列表 + * @Author songyunpeng + * @Date 2020/2/11 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listOldMemberRankByDeptId(MemberRankFormDTO formDto); + /** + * @Description 获取党员年轻化排名列表 + * @Author songyunpeng + * @Date 2020/2/11 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java index 24658ce1f..4acd8ba71 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java @@ -1,7 +1,12 @@ package com.elink.esua.epdc.service.impl; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.user.form.MemberRankFormDTO; +import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; +import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; import com.elink.esua.epdc.feign.AnalysisUserFeignClient; import com.elink.esua.epdc.service.AnalysisIssueService; @@ -9,6 +14,8 @@ import com.elink.esua.epdc.service.AnalysisUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 项目模块-移动app端 * @Author LPF @@ -26,4 +33,14 @@ public class AnalysisUserServiceImpl implements AnalysisUserService { public Result test() { return analysisUserFeignClient.test(); } + + @Override + public Result> listOldMemberRankByDeptId( MemberRankFormDTO formDto) { + return analysisUserFeignClient.listOldMemberRankByDeptId(formDto); + } + + @Override + public Result> listYoungMemberRankByDeptId(MemberRankFormDTO formDto) { + return analysisUserFeignClient.listYoungMemberRankByDeptId(formDto); + } }