Browse Source

Merge remote-tracking branch 'origin/dev_issue_project' into dev

dev_shibei_match
yinzuomei 5 years ago
parent
commit
faace0dd54
  1. 6
      epmet-auth/pom.xml
  2. 1
      epmet-auth/src/main/java/com/epmet/controller/LoginController.java
  3. 22
      epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
  4. 5
      epmet-gateway/pom.xml
  5. 6
      epmet-module/gov-issue/gov-issue-client/pom.xml
  6. 0
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep
  7. 29
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ClosedProjectIssueListFormDTO.java
  8. 2
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
  9. 31
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/LatestIssueListFormDTO.java
  10. 0
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep
  11. 36
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java
  12. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
  13. 36
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
  14. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
  15. 21
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
  16. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
  17. 7
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
  18. 16
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
  19. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
  20. 70
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  21. 28
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
  22. 18
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml
  23. 11
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
  24. 41
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java
  25. 42
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java
  26. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java
  27. 13
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
  28. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
  29. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  30. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  31. 8
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
  32. 31
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  33. 14
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
  34. 26
      epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java
  35. 22
      epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java
  36. 12
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java
  37. 2
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java
  38. 11
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java
  39. 32
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendedListFormDTO.java
  40. 40
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java
  41. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  42. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
  43. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  44. 16
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  45. 30
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
  46. 2
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java
  47. 12
      epmet-module/resi-home/resi-home-server/pom.xml
  48. 18
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java
  49. 40
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java
  50. 41
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/IssueController.java
  51. 42
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java
  52. 28
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java
  53. 29
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
  54. 17
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
  55. 31
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
  56. 20
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
  57. 10
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
  58. 25
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
  59. 23
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java
  60. 22
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/IssueService.java
  61. 21
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ProjectService.java
  62. 26
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java
  63. 35
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  64. 57
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  65. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
  66. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
  67. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
  68. 3
      epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

6
epmet-auth/pom.xml

@ -98,6 +98,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>oper-access-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

1
epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@ -94,7 +94,6 @@ public class LoginController {
**/
@PostMapping(value = "logout")
public Result logout(@LoginUser TokenDto tokenDto, HttpServletRequest request) {
//String token = request.getParameter(Constant.TOKEN_HEADER);
return loginService.logoutByToken(tokenDto);
}
}

22
epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@ -17,6 +17,7 @@ import com.epmet.dto.form.*;
import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
import com.epmet.dto.result.UserTokenResultDTO;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.OperAccessFeignClient;
import com.epmet.jwt.JwtTokenProperties;
import com.epmet.jwt.JwtTokenUtils;
import com.epmet.service.CaptchaService;
@ -61,6 +62,9 @@ public class LoginServiceImpl implements LoginService {
@Autowired
private CaptchaService captchaService;
@Autowired
private OperAccessFeignClient operAccessFeignClient;
/**
* 居民端微信小程序登录
*
@ -249,7 +253,9 @@ public class LoginServiceImpl implements LoginService {
//1、验证码是否正确
boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
if (!flag) {
return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
logger.error(String.format("用户%s登录,验证码输入错误,暂时放行",formDTO.getPhone()));
//2020-05-21去除验证码校验 TODO
//return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
}
//2、账号是否存在
//获取用户信息
@ -308,12 +314,18 @@ public class LoginServiceImpl implements LoginService {
public Result logoutByToken(TokenDto tokenDto) {
//记录登出日志
//删除redis
if(null == tokenDto){
logger.error("账号不存在");
throw new RenException("当前用户信息获取失败");
if (null == tokenDto) {
logger.error("运营端用户退出系统错误:账号不存在,接口继续执行返回成功");
return new Result();
}
cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId());
cpUserDetailRedis.logout(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
//web端清空菜单栏和权限
Result operAccessResult = operAccessFeignClient.clearOperUserAccess();
if (operAccessResult.success()) {
logger.info(String.format("运营人员%s退出成功,清空菜单和权限redis成功", tokenDto.getUserId()));
} else {
logger.error(String.format("运营人员%s退出成功,清空菜单和权限redis异常", tokenDto.getUserId()));
}
return new Result();
}

5
epmet-gateway/pom.xml

@ -108,8 +108,8 @@
<nacos.ip></nacos.ip>
<!-- gateway routes -->
<!-- 1、认证服务 -->
<!-- <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>-->
<gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
<gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>
<!-- <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>-->
<!-- 2、Admin服务 -->
<gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
<!-- 4、OSS服务 -->
@ -135,6 +135,7 @@
<!-- <gateway.routes.gov-org-server.uri>http://localhost:8092</gateway.routes.gov-org-server.uri>-->
<gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
<!-- 14、#运营端访问权限控制 -->
<!-- <gateway.routes.oper-access-server.uri>http://localhost:8093</gateway.routes.oper-access-server.uri>-->
<gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
<!-- 15、居民端个人信息 -->
<!-- <gateway.routes.resi-mine-server.uri>http://localhost:8094</gateway.routes.resi-mine-server.uri>-->

6
epmet-module/gov-issue/gov-issue-client/pom.xml

@ -23,5 +23,11 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-project-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

0
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep

29
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ClosedProjectIssueListFormDTO.java

@ -0,0 +1,29 @@
package com.epmet.dto.form;
import com.epmet.dto.result.LatestListResultDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 获取客户网格下已转项目切项目已结案的议题列表-接口入参
* @Author sun
*/
@Data
public class ClosedProjectIssueListFormDTO implements Serializable {
private static final long serialVersionUID = 2599592072265715951L;
/**
* 查询条件对象
*/
private LatestListFormDTO latestListForm;
/**
* 客户下已结案项目列表
*/
private List<LatestListResultDTO> latestListResult;
}

2
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java

@ -16,7 +16,7 @@ public class EvaluationListFormDTO implements Serializable {
/**
* 议题Id
*/
private String IssueId;
private String issueId;
/**
* 页码

31
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/LatestIssueListFormDTO.java

@ -0,0 +1,31 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 党建园地-获取最新议题列表-接口入参
* @Author sun
*/
@Data
public class LatestIssueListFormDTO implements Serializable {
private static final long serialVersionUID = -2170063271034172650L;
/**
* 客户Id
*/
@NotBlank(message = "客户id不能为空")
private String customerId;
/**
* 网格Id
*/
@NotBlank(message = "网格Id不能为空")
private String gridId;
/**
* 客户定制化显示几条传入几条
*/
private Integer pageSize = 3;
}

0
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep

36
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java

@ -0,0 +1,36 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* 党建园地-获取最新议题列表-接口入参
* @Author sun
*/
@Data
public class LatestIssueListResultDTO implements Serializable {
private static final long serialVersionUID = 9130115335145168458L;
/**
* 议题id
*/
private String issueId = "";
/**
* 议题标题
*/
private String issueTitle = "";
/**
* 议题发起人XX路-XX先生
*/
private String issuePublisherName = "";
/**
* 话题内容
*/
private String topicContent = "";
/**
* 表达态度总人数
*/
private Integer votedCount = 0;
}

2
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@ -64,4 +64,6 @@ public interface IssueConstant {
String OPPOSE = "opposition";
String REDIS_KEY = "epmet:issue:";
String SELECT_ISSUEPROJECTRELATION_EXCEPTION = "获取议题项目关系数据失败";
}

36
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@ -4,24 +4,15 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.CommonIssueListFormDTO;
import com.epmet.dto.form.*;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.form.IssueDetailFormDTO;
import com.epmet.dto.result.ClosedIssueListResultDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.GridIdResultDTO;
import com.epmet.dto.form.ShiftProjectListFromDTO;
import com.epmet.dto.result.GridVotingIssueCountResultDTO;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.dto.result.IssueResultDTO;
import com.epmet.dto.result.VotingIssueListResultDTO;
import com.epmet.dto.result.*;
import com.epmet.excel.IssueExcel;
import com.epmet.dto.result.ShiftProjectListResultDTO;
import com.epmet.service.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -124,5 +115,28 @@ public class IssueController {
public Result<GridIdResultDTO> selectGridIdByIssueId(@RequestBody IssueIdFormDTO issueId){
return new Result<GridIdResultDTO>().ok(issueService.selectGridIdByIssueId(issueId));
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下已转项目且项目已结案的议题列表
**/
@PostMapping("getclosedprojectissuelist")
public Result<List<LatestListResultDTO>> getClosedProjectIssueList(@RequestBody ClosedProjectIssueListFormDTO formDTO){
return new Result<List<LatestListResultDTO>>().ok(issueService.getClosedProjectIssueList(formDTO));
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下最新议题列表
**/
@PostMapping("getnewestissuelist")
public Result<List<LatestIssueListResultDTO>> getNewestIssueList(@RequestBody LatestIssueListFormDTO formDTO){
return new Result<List<LatestIssueListResultDTO>>().ok(issueService.getNewestIssueList(formDTO));
}
}

2
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@ -160,7 +160,7 @@ public class IssueManageController {
* @Description 议题管理-议题转项目
**/
@PostMapping("shiftproject")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
public Result shiftProject(@LoginUser TokenDto tokenDTO, @RequestBody ShiftProjectFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
ValidatorUtils.validateEntity(formDTO);

21
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@ -19,10 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.form.CommonIssueListFormDTO;
import com.epmet.dto.form.IssueDetailFormDTO;
import com.epmet.dto.form.ShiftProjectListFromDTO;
import com.epmet.dto.form.VoteFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.ClosedIssueListGovResultDTO;
import com.epmet.dto.result.ClosedIssueListResultDTO;
import com.epmet.dto.result.IssueResultDTO;
@ -117,4 +114,20 @@ public interface IssueDao extends BaseDao<IssueEntity> {
* @date 2020.05.19 15:00
**/
List<IssuesToBeCountedResultDTO> getIssueVotingStatistical();
/**
* @param issueIdList,customerId,gridId
* @return
* @Author sun
* @Description 查询客户网格下已结案项目对应的议题列表
**/
List<IssueEntity> selectIssueList(@Param("issueIdList") List<String> issueIdList, LatestListFormDTO latestListForm);
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下最新议题列表
**/
List<IssueEntity> selectNewestIssueList(LatestIssueListFormDTO formDTO);
}

10
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java

@ -22,6 +22,8 @@ import com.epmet.entity.IssueProjectRelationEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 议题项目关系表
*
@ -40,4 +42,12 @@ public interface IssueProjectRelationDao extends BaseDao<IssueProjectRelationEnt
**/
String selectProjectIdByIssueId(@Param("issueId") String issueId);
/**
* @param projectIdList
* @return
* @Author sun
* @Description 根据项目Id批量查询关联表数据
**/
List<IssueProjectRelationEntity> selectRelationList(@Param("projectIdList") List<String> projectIdList);
}

7
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java

@ -66,4 +66,11 @@ public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEnt
*/
List<PolyLineDTO> polyLineData(IssueIdFormDTO issueId);
/**
* @param issueIdList
* @return
* @Author sun
* @Description 根据议题Id查询议题投票情况
**/
List<IssueVoteStatisticalEntity> selectListByissueId(@Param("issueIdList") List<String> issueIdList);
}

16
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@ -197,4 +197,20 @@ public interface IssueService extends BaseService<IssueEntity> {
* @date 2020.05.14 10:33
**/
List<ClosedIssueListGovResultDTO> closedListGov(CommonIssueListFormDTO issueListForm);
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下已转项目切项目已结案的议题列表
**/
List<LatestListResultDTO> getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO);
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下最新议题列表
**/
List<LatestIssueListResultDTO> getNewestIssueList(LatestIssueListFormDTO formDTO);
}

2
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java

@ -159,6 +159,8 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSat
*/
@Override
public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) {
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
return baseDao.evaluationList(formDTO);
}

70
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@ -17,6 +17,7 @@ import com.epmet.constant.UserMessageConstant;
import com.epmet.dao.IssueDao;
import com.epmet.dao.IssueProcessDao;
import com.epmet.dao.IssueProjectRelationDao;
import com.epmet.dao.IssueVoteStatisticalDao;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.IssueVoteStatisticalDTO;
@ -25,6 +26,7 @@ import com.epmet.dto.result.*;
import com.epmet.entity.IssueEntity;
import com.epmet.entity.IssueProcessEntity;
import com.epmet.entity.IssueProjectRelationEntity;
import com.epmet.entity.IssueVoteStatisticalEntity;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.GovProjectFeignClient;
import com.epmet.feign.MessageFeignClient;
@ -79,6 +81,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
private IssueVoteStatisticalService issueVoteStatisticalService;
@Autowired
private IssueProjectRelationService issueProjectRelationService;
@Autowired
private IssueVoteStatisticalDao issueVoteStatisticalDao;
@Override
public PageData<IssueDTO> page(Map<String, Object> params) {
@ -588,4 +592,70 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
return baseDao.selectClosedListGov(issueListForm);
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下已转项目切项目已结案的议题列表
**/
@Override
public List<LatestListResultDTO> getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO) {
List<LatestListResultDTO> resultList = new ArrayList<>();
List<String> projectIdList = formDTO.getLatestListResult().stream().map(LatestListResultDTO::getProjectId).collect(Collectors.toList());
if (null == projectIdList || projectIdList.size() < NumConstant.ONE) {
return resultList;
}
//1:根据已结案项目列表查询对应的议题列表
List<IssueProjectRelationEntity> listRelation = issueProjectRelationDao.selectRelationList(projectIdList);
if(null==listRelation||listRelation.size()<NumConstant.ONE){
throw new RenException(IssueConstant.SELECT_ISSUEPROJECTRELATION_EXCEPTION);
}
List<String> issueIdList = listRelation.stream().map(IssueProjectRelationEntity::getIssueId).collect(Collectors.toList());
//2:根据查询条件筛选出客户网格下已结案项目对应的议题详情列表
List<IssueEntity> entityList = baseDao.selectIssueList(issueIdList, formDTO.getLatestListForm());
//3:遍历封装数据
entityList.forEach(issue->{
listRelation.forEach(relation->{
if(relation.getIssueId().equals(issue.getId())){
formDTO.getLatestListResult().forEach(project->{
if(relation.getProjectId().equals(project.getProjectId())){
LatestListResultDTO latest = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class);
latest.setIssueId(issue.getId());
latest.setIssueTitle(issue.getIssueTitle());
resultList.add(latest);
}
});
}
});
});
return resultList;
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下最新议题列表
**/
@Override
public List<LatestIssueListResultDTO> getNewestIssueList(LatestIssueListFormDTO formDTO) {
List<LatestIssueListResultDTO> returnList = new ArrayList<>();
//1:获取客户网格下最新议题列表
List<IssueEntity> entityList = baseDao.selectNewestIssueList(formDTO);
if (null == entityList || entityList.size() < NumConstant.ONE) {
return returnList;
}
//2:根据议题Id查询议题投票情况
List<String> issueIdList = entityList.stream().map(IssueEntity::getId).collect(Collectors.toList());
List<IssueVoteStatisticalEntity> StatisticalList = issueVoteStatisticalDao.selectListByissueId(issueIdList);
//3:调用epmet-user服务,查询议题发起人基本信息
List<String> userIdList = entityList.stream().map(IssueEntity::getCreatedBy).collect(Collectors.toList());
return null;
}
}

28
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@ -324,5 +324,33 @@
</select>
<select id="selectIssueList" resultType="com.epmet.entity.IssueEntity">
SELECT
*
FROM issue
WHERE del_flag = '0'
AND customer_id = #{customerId}
AND grid_id = #{gridId}
<foreach item="issueId" collection="issueIdList" separator="OR" open="AND (" close=")" index="">
id = #{issueId}
</foreach>
ORDER BY field(
id,
<foreach item="issueId" collection="issueIdList" separator=",">
#{issueId}
</foreach>
LIMIT #{pageNo}, #{pageSize}
</select>
<select id="selectNewestIssueList" resultType="com.epmet.entity.IssueEntity">
SELECT
*
FROM issue
WHERE del_flag = '0'
AND customer_id = #{customerId}
AND grid_id = #{gridId}
ORDER BY created_time DESC
LIMIT #{pageSize}
</select>
</mapper>

18
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml

@ -27,4 +27,22 @@
ISSUE_ID = #{issueId}
</select>
<select id="selectRelationList" resultType="com.epmet.entity.IssueProjectRelationEntity">
SELECT
id,
issue_id,
project_id
FROM
issue_project_relation
WHERE del_flag = '0'
<foreach item="projectId" collection="projectIdList" separator="OR" open="AND (" close=")" index="">
project_id = #{projectId}
</foreach>
ORDER BY field(
project_id,
<foreach item="projectId" collection="projectIdList" separator=",">
#{projectId}
</foreach>
</select>
</mapper>

11
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml

@ -69,4 +69,15 @@
ORDER BY statistical_date ASC
</select>
<select id="selectListByissueId" resultType="com.epmet.entity.IssueVoteStatisticalEntity">
SELECT
*
FROM
issue_vote_statistical_daily
WHERE del_flag = '0'
<foreach item="issueId" collection="issueIdList" separator="OR" open="AND (" close=")" index="">
issue_id = #{issueId}
</foreach>
</select>
</mapper>

41
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java

@ -0,0 +1,41 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 党建园地-结案项目-接口入参
* @Author sun
*/
@Data
public class LatestListFormDTO implements Serializable {
private static final long serialVersionUID = 4859779755214502427L;
/**
* 客户Id
*/
@NotBlank(message = "客户Id不能为空")
private String customerId;
/**
* 网格Id
*/
@NotBlank(message = "网格Id不能为空")
private String gridId;
/**
* 请求页面
*/
@Min(1)
private Integer pageNo;
/**
* 每页多少条数据
*/
private Integer pageSize = 3;
}

42
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description 党建园地-结案项目-接口返参
* @Author sun
*/
@Data
public class LatestListResultDTO implements Serializable {
private static final long serialVersionUID = 5957826616179876849L;
/**
* 议题id
*/
private String issueId = "";
/**
* 议题标题
*/
private String issueTitle = "";
/**
* 项目id
*/
private String projectId = "";
/**
* 结案说明
*/
private String publicReply = "";
/**
* 结案人名称实名显示
*/
private String closeUserName = "";
/**
* 结案人Id
*/
private String closeUserId = "";
}

4
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java

@ -109,4 +109,8 @@ public interface ProjectConstant {
* 政府端
*/
String GOV = "gov";
/**
* 调用epmet-user服务获取工作人员信息失败
*/
String SELECT_STAFF_EXCEPTION = "获取工作人员信息失败";
}

13
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@ -26,9 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.ProjectDTO;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.form.ShiftProjectFormDTO;
import com.epmet.dto.form.ShiftProjectsFromDTO;
import com.epmet.dto.result.IssueProjectResultDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.dto.result.ShiftProjectResultDTO;
import com.epmet.excel.ProjectExcel;
import com.epmet.service.ProjectService;
@ -119,4 +121,15 @@ public class ProjectController {
return new Result<IssueProjectResultDTO>().ok(projectService.issueShiftProject(formDTO));
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户下已结案项目列表按结案时间倒序
**/
@PostMapping("getclosedprojectlist")
public Result<List<LatestListResultDTO>> getClosedProjectList(@RequestBody LatestListFormDTO formDTO) {
return new Result<List<LatestListResultDTO>>().ok(projectService.getClosedProjectList(formDTO));
}
}

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@ -19,8 +19,10 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.ProjectDTO;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.form.ProjectListFromDTO;
import com.epmet.dto.form.ShiftProjectsFromDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.dto.result.ProjectDetailResultDTO;
import com.epmet.entity.ProjectEntity;
import org.apache.ibatis.annotations.Mapper;
@ -94,4 +96,11 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
*/
List<ProjectDTO> selectShiftProjectList(ShiftProjectsFromDTO fromDTO);
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户下已结案项目列表按结案时间倒序
**/
List<LatestListResultDTO> selectClosedProjectList(LatestListFormDTO formDTO);
}

12
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@ -5,10 +5,13 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.CustomerStaffListResultDTO;
import com.epmet.dto.result.StaffInfoResultDTO;
import com.epmet.dto.result.StaffListResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -48,4 +51,13 @@ public interface EpmetUserFeignClient {
**/
@PostMapping(value = "epmetuser/customerstaff/getstaffinfobyuserid")
Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO);
/**
* @param staffIdList
* @return
* @Author sun
* @Description 批量查询工作人员基础信息
**/
@PostMapping(value = "epmetuser/customerstaff/getstafflistbyids", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<List<StaffListResultDTO>> getStaffListByIds(@RequestBody List<String> staffIdList);
}

6
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@ -7,6 +7,7 @@ import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.StaffInfoResultDTO;
import com.epmet.dto.result.StaffListResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component;
@ -34,4 +35,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "CustomerStaffDTO", formDTO);
}
@Override
public Result<List<StaffListResultDTO>> getStaffListByIds(List<String> staffIdList) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffListByIds", staffIdList);
}
}

8
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@ -170,4 +170,12 @@ public interface ProjectService extends BaseService<ProjectEntity> {
* @Description 议题转项目-项目各业务表初始化数据
**/
IssueProjectResultDTO issueShiftProject(ShiftProjectFormDTO formDTO);
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户下已结案项目列表按结案时间倒序
**/
List<LatestListResultDTO> getClosedProjectList(LatestListFormDTO formDTO);
}

31
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -570,4 +570,35 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
return issueProjectResultDTO;
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户下已结案项目列表按结案时间倒序
**/
@Override
public List<LatestListResultDTO> getClosedProjectList(LatestListFormDTO formDTO) {
List<LatestListResultDTO> resultList = new ArrayList<>();
//1:查询客户下已结案项目列表
List<LatestListResultDTO> listProject = baseDao.selectClosedProjectList(formDTO);
if(null==listProject||listProject.size()<NumConstant.ONE){
return resultList;
}
List<String> staffIdList = listProject.stream().map(LatestListResultDTO::getCloseUserId).collect(Collectors.toList());
//2:调用epmet-user服务,查询结案人员真实姓名
Result<List<StaffListResultDTO>> listResult = epmetUserFeignClient.getStaffListByIds(staffIdList);
if (!listResult.success() || null == listResult.getData()) {
throw new RenException(ProjectConstant.SELECT_STAFF_EXCEPTION);
}
List<StaffListResultDTO> staffList = listResult.getData();
resultList = listProject.stream().flatMap(project ->
staffList.stream().filter(staff ->
project.getCloseUserId().equals(staff.getStaffId())).map(latest -> {
LatestListResultDTO resultDTO = ConvertUtils.sourceToTarget(latest, LatestListResultDTO.class);
return resultDTO;
})).collect(Collectors.toList());
return resultList;
}
}

14
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@ -149,5 +149,19 @@
ORDER BY CREATED_TIME ASC
</select>
<select id="selectClosedProjectList" resultType="com.epmet.dto.result.LatestListResultDTO">
SELECT
p.id AS "projectId",
pro.public_reply AS "publicReply",
pro.created_by AS "closeUserId"
FROM project p
INNER JOIN project_process pro ON p.id = pro.project_id
WHERE p.del_flag = '0'
AND pro.del_flag = '0'
AND p.customer_id = #{customerId}
AND p.`status` = 'closed'
AND pro.operation = 'close'
ORDER BY p.created_time DESC
</select>
</mapper>

26
epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java

@ -0,0 +1,26 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.fallback.OperAccessFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
/**
* @Description 运营端权限模块
* @Author yinzuomei
* @Date 2020/5/21 15:17
*/
//, url = "http://localhost:8093"
@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperAccessFeignClientFallback.class)
public interface OperAccessFeignClient {
/**
* @param
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 清空运营人员权限信息菜单信息
* @Date 2020/5/21 17:08
**/
@GetMapping("/oper/access/menu/clearoperuseraccess")
Result clearOperUserAccess();
}

22
epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java

@ -0,0 +1,22 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.OperAccessFeignClient;
import org.springframework.stereotype.Component;
/**
* @Description 运营端权限模块
* @Author yinzuomei
* @Date 2020/5/21 15:47
*/
@Component
public class OperAccessFeignClientFallback implements OperAccessFeignClient {
@Override
public Result clearOperUserAccess() {
return ModuleUtils.feignConError(ServiceConstant.OPER_ACCESS_SERVER, "clearOperUserAccess");
}
}

12
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java

@ -149,4 +149,16 @@ public class OperMenuController {
return new Result<List<OperMenuDTO>>().ok(list);
}
/**
* @param tokenDto
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 运营端用户退出系统清空菜单和操作权限
* @Date 2020/5/21 18:07
**/
@GetMapping("clearoperuseraccess")
public Result clearOperUserAccess(@LoginUser TokenDto tokenDto) {
operMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
return new Result();
}
}

2
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java

@ -141,4 +141,6 @@ public interface OperMenuService extends BaseService<OperMenuEntity> {
* @param pid 父菜单ID
*/
List<OperMenuDTO> getListPid(String pid);
void clearOperUserAccess(String app, String client, String userId);
}

11
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java

@ -45,6 +45,8 @@ import com.epmet.service.OperMenuService;
import com.epmet.service.OperResourceService;
import com.epmet.service.OperRoleMenuService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -59,7 +61,7 @@ import java.util.*;
*/
@Service
public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEntity> implements OperMenuService {
protected Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private OperMenuRedis operMenuRedis;
@Autowired
@ -236,6 +238,13 @@ public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEn
return ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class);
}
@Override
public void clearOperUserAccess(String app, String client, String userId) {
//清空当前用户,菜单导航、权限标识
operMenuRedis.delete(userId, app, client);
logger.info(String.format("运营端用户退出系统%s,清空菜单、权限成功",userId));
}
private void saveLanguage(String tableId, String fieldName, String fieldValue){
operLanguageService.saveOrUpdate("oper_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage());
}

32
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendedListFormDTO.java

@ -0,0 +1,32 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/5/21 15:39
*/
@Data
public class RecommendedListFormDTO implements Serializable {
private static final long serialVersionUID = -4205042052361059952L;
/**
* 客户ID
*/
private String customerId;
/**
* 网格ID
*/
private String gridId;
/**
* 用户ID
*/
private String userId;
/**
* 客户定制化显示几条传入几条
*/
private Integer pageSize;
}

40
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java

@ -0,0 +1,40 @@
package com.epmet.resi.group.dto.group.result;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/5/21 15:41
*/
@Data
public class RecommendedListResultDTO implements Serializable {
private static final long serialVersionUID = -8909027543795476302L;
/**
* 小组id
*/
private String groupId;
/**
* 小组名称
*/
private String groupName;
/**
* 小组头像
*/
private String groupHeadPhoto;
/**
* 总成员数
*/
private String totalMember;
/**
* 党员总数
*/
private String totalPartyMember;
/**
* 组长名
*/
private String leaderName;
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@ -330,4 +330,16 @@ public class ResiGroupController {
public Result<ShouldVoteCountResultDTO> shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO){
return new Result<ShouldVoteCountResultDTO>().ok(resiGroupService.shouldVoteCount(formDTO));
}
/**
* 党建园地-推荐小组
* @author zhaoqifeng
* @date 2020/5/21 15:50
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>>
*/
@PostMapping("recommendedlist")
public Result<List<RecommendedListResultDTO>> recommendedList(@RequestBody RecommendedListFormDTO formDTO) {
return new Result<List<RecommendedListResultDTO>>().ok(resiGroupService.recommendedList(formDTO));
}
}

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@ -162,4 +162,13 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
* @author zxc
*/
ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO);
/**
* 党建园地-推荐小组
* @author zhaoqifeng
* @date 2020/5/21 15:55
* @param formDTO
* @return java.util.List<com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>
*/
List<RecommendedListResultDTO> selectListRecommendList(RecommendedListFormDTO formDTO);
}

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@ -274,4 +274,13 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
* @author zxc
*/
ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO);
/**
* 党建园地-推荐小组
* @author zhaoqifeng
* @date 2020/5/21 15:51
* @param formDTO
* @return java.util.List<com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>
*/
List<RecommendedListResultDTO> recommendedList(RecommendedListFormDTO formDTO);
}

16
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -843,6 +843,22 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
return baseDao.shouldVoteCount(formDTO);
}
@Override
public List<RecommendedListResultDTO> recommendedList(RecommendedListFormDTO formDTO) {
//显示当前网格内所有当前用户还未加入的组,以组的人数由高到低排序;如果人数相同,以话题数由多到少排序
List<RecommendedListResultDTO> recommendGroupList = baseDao.selectListRecommendList(formDTO);
recommendGroupList.forEach(dto -> {
Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId());
if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
} else {
logger.warn("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
}
});
return recommendGroupList;
}
/**
* @Description 给加入此网格的网格长发送消息
* @param msg

30
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -322,4 +322,34 @@
AND rg.del_flag = 0
AND rg.grid_id = #{gridId}
</select>
<select id="selectListRecommendList" resultType="com.epmet.resi.group.dto.group.result.RecommendedListResultDTO"
parameterType="com.epmet.resi.group.dto.group.form.RecommendedListFormDTO">
SELECT
rg.id AS groupId,
rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
rg.GROUP_NAME AS groupName,
rgs.TOTAL_MEMBERS AS totalMember,
rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
FROM
resi_group rg
LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
WHERE
rg.DEL_FLAG = '0'
AND rgs.DEL_FLAG = '0'
and rg.id not in (
SELECT
rgm.RESI_GROUP_ID
FROM
resi_group_member rgm
WHERE
rgm.DEL_FLAG = '0'
AND rgm.`STATUS` !='removed'
AND rgm.CUSTOMER_USER_ID = #{userId}
)
and rg.CUSTOMER_ID=#{customerId}
and rg.GRID_ID=#{gridId}
and rg.STATE ='approved'
order by totalMember desc,rgs.TOTAL_TOPICS desc
LIMIT #{pageSize}
</select>
</mapper>

2
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java

@ -16,7 +16,7 @@ public class EvaluationListFormDTO implements Serializable {
/**
* 议题Id
*/
private String IssueId;
private String issueId;
/**
* 页码

12
epmet-module/resi-home/resi-home-server/pom.xml

@ -50,6 +50,18 @@
<artifactId>feign-httpclient</artifactId>
<version>10.3.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-project-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-issue-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

18
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java

@ -0,0 +1,18 @@
package com.epmet.constant;
/**
* @dscription 党建园地-项目Constant
* @author sun
*/
public interface ProjectConstant {
/**
* 调用gov-project服务查询项目数据失败
*/
String SELECT_PROJECT_EXCEPTION = "获取项目数据失败";
/**
* 调用gov-issue服务查询议题数据失败
*/
String SELECT_ISSUE_EXCEPTION = "获取议题数据失败";
}

40
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java

@ -0,0 +1,40 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO;
import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO;
import com.epmet.service.GroupService;
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;
/**
* @dscription 党建园地-小组Controller
* @author sun
*/
@RestController
@RequestMapping("group")
public class GroupController {
@Autowired
private GroupService groupService;
/**
* 党建园地-推荐小组
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>>
* @author zhaoqifeng
* @date 2020/5/21 15:50
*/
@PostMapping("recommendedlist")
public Result<List<RecommendedListResultDTO>> recommendedList(@LoginUser TokenDto tokenDto, @RequestBody RecommendedListFormDTO formDTO) {
return new Result<List<RecommendedListResultDTO>>().ok(groupService.recommendedList(tokenDto, formDTO));
}
}

41
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/IssueController.java

@ -0,0 +1,41 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.LatestIssueListFormDTO;
import com.epmet.dto.result.LatestIssueListResultDTO;
import com.epmet.service.IssueService;
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;
/**
* @dscription 党建园地-议题Controller
* @author sun
*/
@RestController
@RequestMapping("issue")
public class IssueController {
@Autowired
private IssueService issueService;
/**
* @param formDTO
* @return
* @Author sun
* @Description 党建园地-最新议题
**/
@PostMapping("latestlist")
public Result<List<LatestIssueListResultDTO>> latestList(@LoginUser TokenDto tokenDTO, @RequestBody LatestIssueListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<List<LatestIssueListResultDTO>>().ok(issueService.latestList(formDTO));
}
}

42
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java

@ -0,0 +1,42 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.service.ProjectService;
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;
/**
* @dscription 党建园地-项目Controller
* @author sun
*/
@RestController
@RequestMapping("project")
public class ProjectController {
@Autowired
private ProjectService projectService;
/**
* @param formDTO
* @return
* @Author sun
* @Description 党建园地-结案项目
**/
@PostMapping("latestlist")
public Result<List<LatestListResultDTO>> latestList(@LoginUser TokenDto tokenDTO, @RequestBody LatestListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<List<LatestListResultDTO>>().ok(projectService.latestList(formDTO));
}
}

28
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java

@ -1,28 +0,0 @@
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.DemoTestFormDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/5/21 10:24
*/
@RestController
@RequestMapping("/")
public class ResiHomeController {
private static final Logger logger = LoggerFactory.getLogger(ResiHomeController.class);
@PostMapping("test")
public Result test(@RequestBody DemoTestFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
return new Result().ok("resi-home-server请求成功");
}
}

29
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@ -1,8 +1,18 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
import com.epmet.dto.form.LatestIssueListFormDTO;
import com.epmet.dto.result.LatestIssueListResultDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.feign.fallback.GovIssueFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
@ -13,4 +23,23 @@ import org.springframework.cloud.openfeign.FeignClient;
*/
@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER , fallback = GovIssueFeignClientFallBack.class)
public interface GovIssueFeignClient {
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下已转项目且项目已结案的议题列表
**/
@PostMapping(value = "gov/issue/issue/getclosedprojectissuelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<List<LatestListResultDTO>> getClosedProjectIssueList(@RequestBody ClosedProjectIssueListFormDTO formDTO);
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户网格下最新议题列表
**/
@PostMapping(value = "gov/issue/issue/getnewestissuelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<List<LatestIssueListResultDTO>> getNewestIssueList(@RequestBody LatestIssueListFormDTO formDTO);
}

17
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java

@ -1,8 +1,16 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.feign.fallback.GovProjectFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* @author zhaoqifeng
@ -12,4 +20,13 @@ import org.springframework.cloud.openfeign.FeignClient;
@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
public interface GovProjectFeignClient {
/**
* @param formDTO
* @return
* @Author sun
* @Description 获取客户下已结案项目列表按结案时间倒序
**/
@PostMapping(value = "gov/project/project/getclosedprojectlist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<List<LatestListResultDTO>> getClosedProjectList(@RequestBody LatestListFormDTO formDTO);
}

31
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@ -0,0 +1,31 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO;
import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/17 15:24
*/
@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
public interface ResiGroupFeignClient {
/**
* 党建园地-推荐小组
* @author zhaoqifeng
* @date 2020/5/21 15:50
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>>
*/
@PostMapping("/resi/group/group/recommendedlist")
Result<List<RecommendedListResultDTO>> recommendedList(@RequestBody RecommendedListFormDTO formDTO);
}

20
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java

@ -1,8 +1,18 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
import com.epmet.dto.form.LatestIssueListFormDTO;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.result.LatestIssueListResultDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.feign.GovIssueFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
*
* @author zhaoqifeng
@ -11,4 +21,14 @@ import org.springframework.stereotype.Component;
@Component
public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
@Override
public Result<List<LatestListResultDTO>> getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getClosedProjectIssueList", formDTO);
}
@Override
public Result<List<LatestIssueListResultDTO>> getNewestIssueList(LatestIssueListFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getNewestIssueList", formDTO);
}
}

10
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java

@ -1,5 +1,10 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.feign.GovProjectFeignClient;
import org.springframework.stereotype.Component;
@ -12,4 +17,9 @@ import java.util.List;
*/
@Component
public class GovProjectFeignClientFallBack implements GovProjectFeignClient {
@Override
public Result<List<LatestListResultDTO>> getClosedProjectList(LatestListFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getClosedProjectList", formDTO);
}
}

25
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java

@ -0,0 +1,25 @@
package com.epmet.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.*;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/17 15:27
*/
@Component
public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
@Override
public Result<List<RecommendedListResultDTO>> recommendedList(RecommendedListFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "recommendedList", formDTO);
}
}

23
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java

@ -0,0 +1,23 @@
package com.epmet.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO;
import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO;
import java.util.List;
/**
* @dscription 党建园地-小组Service
* @author sun
*/
public interface GroupService {
/**
* 党建园地-推荐小组
* @author zhaoqifeng
* @date 2020/5/21 16:35
* @param tokenDto
* @param formDTO
* @return java.util.List<com.epmet.resi.group.dto.group.result.RecommendedListResultDTO>
*/
List<RecommendedListResultDTO> recommendedList(TokenDto tokenDto, RecommendedListFormDTO formDTO);
}

22
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/IssueService.java

@ -0,0 +1,22 @@
package com.epmet.service;
import com.epmet.dto.form.LatestIssueListFormDTO;
import com.epmet.dto.result.LatestIssueListResultDTO;
import java.util.List;
/**
* @dscription 党建园地-议题Service
* @author sun
*/
public interface IssueService {
/**
* @param formDTO
* @return
* @Author sun
* @Description 党建园地-最新议题
**/
List<LatestIssueListResultDTO> latestList(LatestIssueListFormDTO formDTO);
}

21
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ProjectService.java

@ -0,0 +1,21 @@
package com.epmet.service;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.result.LatestListResultDTO;
import java.util.List;
/**
* @dscription 党建园地-项目Service
* @author sun
*/
public interface ProjectService {
/**
* @param formDTO
* @return
* @Author sun
* @Description 党建园地-结案项目
**/
List<LatestListResultDTO> latestList(LatestListFormDTO formDTO);
}

26
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java

@ -0,0 +1,26 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.feign.ResiGroupFeignClient;
import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO;
import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO;
import com.epmet.service.GroupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @dscription 党建园地-小组ServiceImpl
* @author sun
*/
@Service
public class GroupServiceImpl implements GroupService {
@Autowired
ResiGroupFeignClient resiGroupFeignClient;
@Override
public List<RecommendedListResultDTO> recommendedList(TokenDto tokenDto, RecommendedListFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
return resiGroupFeignClient.recommendedList(formDTO).getData();
}
}

35
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@ -0,0 +1,35 @@
package com.epmet.service.impl;
import com.epmet.dto.form.LatestIssueListFormDTO;
import com.epmet.dto.result.LatestIssueListResultDTO;
import com.epmet.feign.GovIssueFeignClient;
import com.epmet.service.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @dscription 党建园地-议题ServiceImpl
* @author sun
*/
@Service
public class IssueServiceImpl implements IssueService {
@Autowired
private GovIssueFeignClient govIssueFeignClient;
/**
* @param formDTO
* @return
* @Author sun
* @Description 党建园地-最新议题
**/
@Override
public List<LatestIssueListResultDTO> latestList(LatestIssueListFormDTO formDTO) {
//1:调用gov-issue服务,查询客户网格下最新议题列表
return null;
}
}

57
epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -0,0 +1,57 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.ProjectConstant;
import com.epmet.dto.form.ClosedProjectIssueListFormDTO;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.feign.GovIssueFeignClient;
import com.epmet.feign.GovProjectFeignClient;
import com.epmet.service.ProjectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @dscription 党建园地-项目ServiceImpl
* @author sun
*/
@Service
public class ProjectServiceImpl implements ProjectService {
@Autowired
private GovProjectFeignClient govProjectFeignClient;
@Autowired
private GovIssueFeignClient govIssueFeignClient;
/**
* @param formDTO
* @return
* @Author sun
* @Description 党建园地-结案项目
**/
@Override
public List<LatestListResultDTO> latestList(LatestListFormDTO formDTO) {
//1:调用gov-project服务,查询客户已结案项目列表
Result<List<LatestListResultDTO>> listResult = govProjectFeignClient.getClosedProjectList(formDTO);
if (!listResult.success()){
throw new RenException(ProjectConstant.SELECT_PROJECT_EXCEPTION);
}
if (null == listResult.getData()){
return new ArrayList<>();
}
//2:调用gov-issue服务,获取客户网格下已转项目且项目已结案的议题列表
ClosedProjectIssueListFormDTO closedProjectIssueListFormDTO = new ClosedProjectIssueListFormDTO();
closedProjectIssueListFormDTO.setLatestListForm(formDTO);
closedProjectIssueListFormDTO.setLatestListResult(listResult.getData());
Result<List<LatestListResultDTO>> resultList = govIssueFeignClient.getClosedProjectIssueList(closedProjectIssueListFormDTO);
if (!resultList.success() || null == resultList.getData()) {
throw new RenException(ProjectConstant.SELECT_ISSUE_EXCEPTION);
}
return resultList.getData();
}
}

11
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@ -280,4 +280,15 @@ public class CustomerStaffController {
public Result<CustomerStaffListResultDTO> getCustomerStaffList(@RequestBody List<String> staffIdList){
return new Result<CustomerStaffListResultDTO>().ok(customerStaffService.getCustomerStaffList(staffIdList));
}
/**
* @param staffIdList
* @return
* @Author sun
* @Description 批量查询工作人员基础信息
**/
@PostMapping(value = "getstafflistbyids")
public Result<List<StaffListResultDTO>> getStaffListByIds(@RequestBody List<String> staffIdList){
return new Result<List<StaffListResultDTO>>().ok(customerStaffService.getStaffListByIds(staffIdList));
}
}

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@ -231,4 +231,12 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
* @Description 根据staffId集合查询工作人员基础信息
**/
CustomerStaffListResultDTO getCustomerStaffList(List<String> staffIdList);
/**
* @param staffIdList
* @return
* @Author sun
* @Description 批量查询工作人员基础信息
**/
List<StaffListResultDTO> getStaffListByIds(List<String> staffIdList);
}

11
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@ -440,4 +440,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
return list;
}
/**
* @param staffIdList
* @return
* @Author sun
* @Description 批量查询工作人员基础信息
**/
@Override
public List<StaffListResultDTO> getStaffListByIds(List<String> staffIdList) {
return baseDao.selectStaffByIds(staffIdList);
}
}

3
epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@ -189,8 +189,7 @@
customer_staff
WHERE
del_flag = '0'
AND
<foreach item="userId" collection="staffIdList" separator="or" open="(" close=")" index="">
<foreach item="userId" collection="staffIdList" separator="OR" open="AND (" close=")" index="">
user_id = #{userId}
</foreach>
</select>

Loading…
Cancel
Save