Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

master
wxz 5 years ago
parent
commit
e625b3e266
  1. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
  2. 29
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/StaffMessageCommonFormDTO.java
  3. 39
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/StaffMessageFormDTO.java
  4. 39
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java
  5. 19
      epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffUnReadMsgResultDTO.java
  6. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  7. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  8. 19
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java
  9. 34
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java
  10. 8
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java
  11. 34
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
  12. 31
      epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml
  13. 37
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java
  14. 2
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java
  15. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  17. 3
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java
  18. 25
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
  19. 12
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
  20. 12
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java
  21. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  22. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
  23. 11
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
  24. 35
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
  25. 33
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  26. 20
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
  27. 13
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml
  28. 19
      epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/StaffReadMsgFormDTO.java
  29. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  30. 8
      epmet-module/gov-mine/gov-mine-server/pom.xml
  31. 98
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffMessageController.java
  32. 64
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetMessageFeignClient.java
  33. 44
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetMessageFeignClientFallBack.java
  34. 52
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffMessageService.java
  35. 73
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffMessageServiceImpl.java
  36. 39
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java
  37. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  38. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  39. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
  40. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
  41. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  42. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  43. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  44. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
  45. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java
  46. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  47. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
  48. 8
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java
  49. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java
  50. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  51. 8
      epmet-module/resi-group/resi-group-server/pom.xml
  52. 23
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java
  53. 26
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java
  54. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
  55. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  56. 16
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
  57. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  58. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  59. 7
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java
  60. 2
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java
  61. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  62. 2
      epmet-module/resi-hall/resi-hall-server/pom.xml
  63. 26
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java
  64. 2
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java

@ -102,5 +102,5 @@ public interface ServiceConstant {
/**
* 共通
*/
String EPMET_COMMON_SERVICE = "epmet-common-service";
String EPMET_COMMON_SERVICE = "common-service-server";
}

29
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/StaffMessageCommonFormDTO.java

@ -0,0 +1,29 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 政府端wxmp-未读消息查询入参
* @Author yinzuomei
* @Date 2020/5/17 14:17
*/
@Data
public class StaffMessageCommonFormDTO implements Serializable {
private static final long serialVersionUID = 6926536123515417293L;
/**
* 当前登录的工作人员从token中获取
*/
@NotBlank(message="用户id不能为空")
private String userId;
/**
* 用户当前访问的网格对应的客户id
*/
@NotBlank(message="客户id不能为空")
private String customerId;
}

39
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/StaffMessageFormDTO.java

@ -0,0 +1,39 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 政府端wxmp-查询我的消息
* @Author yinzuomei
* @Date 2020/5/17 14:50
*/
@Data
public class StaffMessageFormDTO implements Serializable {
/**
* 当前登录的工作人员从token中获取
*/
@NotBlank(message="用户id不能为空")
private String userId;
/**
* 用户当前访问的网格对应的客户id
*/
@NotBlank(message="客户id不能为空")
private String customerId;
/**
* 页码
*/
@Min(1)
private Integer pageNo;
/**
* 每页显示条数
*/
private Integer pageSize = 20;
}

39
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffMessageResultDTO.java

@ -0,0 +1,39 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 政府端wxmp-查询我的消息返参
* @Author yinzuomei
* @Date 2020/5/17 14:52
*/
@Data
public class StaffMessageResultDTO implements Serializable {
/**
* 消息id
*/
private String id;
/**
* 消息标题
*/
private String title;
/**
* 消息内容
*/
private String messageContent;
/**
* read已读unread未读
*/
private String readFlag;
/**
* 通知时间
*/
private Long createdTime;
}

19
epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/StaffUnReadMsgResultDTO.java

@ -0,0 +1,19 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 政府端wxmp-未读消息查询返参
* @Author yinzuomei
* @Date 2020/5/17 14:19
*/
@Data
public class StaffUnReadMsgResultDTO implements Serializable {
/**
* 未读消息总数
*/
private Integer unReadCount;
}

2
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
container_name: epmet-message-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.5
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.6
ports:
- "8085:8085"
network_mode: host # 使用现有网络

2
epmet-module/epmet-message/epmet-message-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.5</version>
<version>0.3.6</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>

19
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/UserMessageController.java

@ -17,6 +17,7 @@
package com.epmet.controller;
import com.baomidou.mybatisplus.extension.api.R;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
@ -27,7 +28,11 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.UserMessageDTO;
import com.epmet.dto.form.MymessageFormDTO;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.excel.UserMessageExcel;
import com.epmet.service.UserMessageService;
import org.springframework.beans.factory.annotation.Autowired;
@ -143,4 +148,18 @@ public class UserMessageController {
public Result saveUserMessageList(@RequestBody List<UserMessageFormDTO> msgList) {
return userMessageService.saveUserMessageList(msgList);
}
@PostMapping("staff/queryunreadmsg")
public Result<StaffUnReadMsgResultDTO> queryUnReadMsg(@RequestBody StaffMessageCommonFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = userMessageService.queryUnReadMsg(formDTO);
return new Result<StaffUnReadMsgResultDTO>().ok(staffUnReadMsgResultDTO);
}
@PostMapping("staff/querystaffmessage")
public Result<List<StaffMessageResultDTO>> queryStaffMessage(@RequestBody StaffMessageFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
List<StaffMessageResultDTO> list = userMessageService.queryStaffMessage(formDTO);
return new Result<List<StaffMessageResultDTO>>().ok(list);
}
}

34
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/UserMessageDao.java

@ -19,8 +19,11 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.MymessageFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.entity.UserMessageEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -33,11 +36,30 @@ import java.util.List;
@Mapper
public interface UserMessageDao extends BaseDao<UserMessageEntity> {
/**
* 获取消息分页
* @param messageFromDTO
* @return
*/
List<UserMessageEntity> selectMyMessageList(MymessageFormDTO messageFromDTO);
/**
* 获取消息分页
*
* @param messageFromDTO
* @return
*/
List<UserMessageEntity> selectMyMessageList(MymessageFormDTO messageFromDTO);
/**
* @param userId
* @param customerId
* @return java.lang.Integer
* @Author yinzuomei
* @Description 根据用户id客户id统计用户未读消息总数
* @Date 2020/5/17 16:47
**/
Integer queryUnReadMsg(@Param("userId") String userId, @Param("customerId") String customerId);
/**
* @param formDTO
* @return java.util.List<com.epmet.dto.result.StaffMessageResultDTO>
* @Author yinzuomei
* @Description 查询政府端工作人员我的消息列表
* @Date 2020/5/17 16:47
**/
List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO);
}

8
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/UserMessageService.java

@ -22,7 +22,11 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserMessageDTO;
import com.epmet.dto.form.MymessageFormDTO;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.entity.UserMessageEntity;
import java.util.List;
import java.util.Map;
@ -134,4 +138,8 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
* @Description 批量插入未读消息
**/
Result saveUserMessageList(List<UserMessageFormDTO> msgList);
StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO);
List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO);
}

34
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java

@ -29,7 +29,11 @@ import com.epmet.constant.UserMessageConstans;
import com.epmet.dao.UserMessageDao;
import com.epmet.dto.UserMessageDTO;
import com.epmet.dto.form.MymessageFormDTO;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.entity.UserMessageEntity;
import com.epmet.redis.UserMessageRedis;
import com.epmet.service.UserMessageService;
@ -174,4 +178,34 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
insertBatch(entityList);
return new Result();
}
/**
* @return com.epmet.dto.result.StaffUnReadMsgResultDTO
* @param formDTO
* @Author yinzuomei
* @Description 根据用户id客户id统计用户未读消息总数
* @Date 2020/5/17 16:43
**/
@Override
public StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO) {
StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = new StaffUnReadMsgResultDTO();
Integer unReadCount = baseDao.queryUnReadMsg(formDTO.getUserId(), formDTO.getCustomerId());
staffUnReadMsgResultDTO.setUnReadCount(unReadCount);
return staffUnReadMsgResultDTO;
}
/**
* @return java.util.List<com.epmet.dto.result.StaffMessageResultDTO>
* @param formDTO
* @Author yinzuomei
* @Description 查询政府端工作人员我的消息列表
* @Date 2020/5/17 16:43
**/
@Override
public List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO) {
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
List<StaffMessageResultDTO> list = baseDao.queryStaffMessage(formDTO);
return list;
}
}

31
epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml

@ -49,5 +49,34 @@
LIMIT #{pageNo}, #{pageSize}
</select>
<!-- 根据用户id、客户id统计用户未读消息总数 -->
<select id="queryUnReadMsg" parameterType="map" resultType="java.lang.Integer">
select count(1)
from
user_message
where
del_flag = '0'
and app='gov'
and CUSTOMER_ID = #{customerId}
and USER_ID = #{userId}
and read_flag='unread'
</select>
<!-- 查询政府端工作人员我的消息列表 -->
<select id="queryStaffMessage" parameterType="com.epmet.dto.form.StaffMessageFormDTO"
resultType="com.epmet.dto.result.StaffMessageResultDTO">
select id,
title,
message_content as messageContent,
read_flag as readFlag,
unix_timestamp(CREATED_TIME) as createdTime
from
user_message
where
del_flag = '0'
and app='gov'
and CUSTOMER_ID = #{customerId}
and USER_ID = #{userId}
ORDER BY CREATED_TIME DESC
LIMIT #{pageNo}, #{pageSize}
</select>
</mapper>

37
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java

@ -0,0 +1,37 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 政府端关闭议题列表属性
* @ClassName ClosedIssueListGovResultDTO
* @Auth wangc
* @Date 2020-05-18 10:33
*/
@Data
public class ClosedIssueListGovResultDTO implements Serializable {
private static final long serialVersionUID = 3809252070982486401L;
/**
* 议题id
* */
private String issueId;
/**
* 议题标题
* */
private String issueTitle;
/**
* 议题关闭时间 时间戳
* */
private Long closedTime;
/**
* 解决方案
* */
private String closeReason;
}

2
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java

@ -32,7 +32,7 @@ public class GovTopicOfIssueInfoResultDTO implements Serializable {
/**
* 话题发表人山东路168-尹女士
*/
private String publishedUser;
private String topicPublisher;
/**
* 话题发表时间 (时间戳 毫秒级)

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-issue-server:
container_name: gov-issue-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.4
image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.8
ports:
- "8101:8101"
network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.4</version>
<version>0.3.8</version>
<parent>
<artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId>

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

@ -54,4 +54,7 @@ public interface IssueConstant {
String ISSUE_GRID = "grid";
String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败";
String SELECT_GOV_ORG_EXCEPTION = "获取议题所属组织、网格信息失败";
String OPERATION_EXCEPTION = "议题已关闭,不能再次关闭";
String GOV_PRJECT_EXCEPTION = "议题转项目,获取项目数据失败";
}

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

@ -8,6 +8,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.service.IssueProcessService;
import com.epmet.service.IssueService;
import com.epmet.service.IssueVoteStatisticalService;
import org.springframework.beans.factory.annotation.Autowired;
@ -31,6 +32,8 @@ public class IssueManageController {
private IssueService issueService;
@Autowired
private IssueVoteStatisticalService issueVoteStatisticalService;
@Autowired
private IssueProcessService issueProcessService;
/**
* @param formDTO
@ -116,22 +119,24 @@ public class IssueManageController {
* @date 2020.05.14 13:57
**/
@PostMapping(value = "votingissuelist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_VOTINGLIST)
public Result<List<VotingIssueListResultDTO>> votingList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
ValidatorUtils.validateEntity(issueListFormDTO);
return new Result<List<VotingIssueListResultDTO>>().ok(issueService.votingList(issueListFormDTO));
}
/**
* @Description 获取关闭议题列表
* @Description 获取关闭议题列表 - 政府端
* @param issueListFormDTO
* @return Result<List<ClosedIssueListResultDTO>>
* @author wangc
* @date 2020.05.14 13:58
**/
@PostMapping(value = "closedlist")
public Result<List<ClosedIssueListResultDTO>> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSED_LIST)
public Result<List<ClosedIssueListGovResultDTO>> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
ValidatorUtils.validateEntity(issueListFormDTO);
return new Result<List<ClosedIssueListResultDTO>>().ok(issueService.closedList(issueListFormDTO));
return new Result<List<ClosedIssueListGovResultDTO>>().ok(issueService.closedListGov(issueListFormDTO));
}
/**
@ -141,6 +146,7 @@ public class IssueManageController {
* @author wangc
* @date 2020.05.15 00:19
**/
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
@PostMapping(value = "votingissuedetail")
public Result<GovIssueDetailResultDTO> votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail){
ValidatorUtils.validateEntity(issueDetail);
@ -162,5 +168,18 @@ public class IssueManageController {
return new Result();
}
/**
* @Description 政府端查看议题进展 (已关闭单表查询转议题跨服务查询)
* @param issueId
* @return Result<List<ProcessListResultDTO>>
* @author wangc
* @date 2020.05.16 10:17
**/
@PostMapping("processlist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId){
return new Result<List<ProcessListResultDTO>>().ok(issueProcessService.processList(issueId));
}
}

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

@ -22,6 +22,7 @@ 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.result.ClosedIssueListGovResultDTO;
import com.epmet.dto.result.ClosedIssueListResultDTO;
import com.epmet.dto.result.IssueResultDTO;
import com.epmet.dto.result.VotingIssueListResultDTO;
@ -74,11 +75,20 @@ public interface IssueDao extends BaseDao<IssueEntity> {
List<VotingIssueListResultDTO> selectVotingList(CommonIssueListFormDTO issueListFormDTO);
/**
* @Description 查询已关闭议题列表
* @Description 查询已关闭议题列表 - 居民端
* @param issueListFormDTO
* @return List<ClosedIssueListResultDTO>
* @author wangc
* @date 2020.05.14 13:34
**/
List<ClosedIssueListResultDTO> selectClosedList(CommonIssueListFormDTO issueListFormDTO);
/**
* @Description 查询已关闭议题列表 - 政府端
* @param issueListFormDTO
* @return List<ClosedIssueListResultDTO>
* @author wangc
* @date 2020.05.14 13:34
**/
List<ClosedIssueListGovResultDTO> selectClosedListGov(CommonIssueListFormDTO issueListFormDTO);
}

12
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java

@ -19,11 +19,10 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.result.IssueProcessResultDTO;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.entity.IssueProcessEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -50,8 +49,13 @@ public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
* @param issueId
* @author zxc
*/
List<IssueProcessResultDTO> issueProcess(IssueIdFormDTO issueId);
List<ProcessListResultDTO> issueProcess(IssueIdFormDTO issueId);
IssueProcessResultDTO issueBeginInfo(IssueIdFormDTO formDTO);
/**
* @Description 查询转议题信息
* @param formDTO
* @author zxc
*/
ProcessListResultDTO issueBeginInfo(IssueIdFormDTO formDTO);
}

2
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@ -27,7 +27,7 @@ public interface GovOrgFeignClient {
* @Author sun
* @Description 根据组织Id网格Id查询组织网格名称
**/
@PostMapping("/gov/org/customergrid/getcustomergridbygridid")
@PostMapping("/gov/org/customeragency/getagencyandgrid")
Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO);
/**

2
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@ -21,7 +21,7 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
@Override
public Result<AgencyGridResultDTO> getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getagencyandgrid", agencyGridResultDTO);
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyAndGrid", agencyGridResultDTO);
}
@Override

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

@ -149,7 +149,7 @@ public interface IssueService extends BaseService<IssueEntity> {
List<VotingIssueListResultDTO> votingList(CommonIssueListFormDTO issueListForm);
/**
* @Description 已关闭列表
* @Description 已关闭列表 居民端
* @param issueListForm
* @return List<ClosedIssueListResultDTO>
* @author wangc
@ -188,4 +188,13 @@ public interface IssueService extends BaseService<IssueEntity> {
* @Description 议题管理-议题转项目
**/
void shiftProject(ShiftProjectFormDTO formDTO);
/**
* @Description 已关闭列表 政府端
* @param issueListForm
* @return List<ClosedIssueListResultDTO>
* @author wangc
* @date 2020.05.14 10:33
**/
List<ClosedIssueListGovResultDTO> closedListGov(CommonIssueListFormDTO issueListForm);
}

35
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java

@ -20,7 +20,6 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
@ -29,11 +28,8 @@ import com.epmet.dao.IssueProcessDao;
import com.epmet.dao.IssueProjectRelationDao;
import com.epmet.dto.IssueDTO;
import com.epmet.dto.IssueProcessDTO;
import com.epmet.dto.form.BelongGridNameFormDTO;
import com.epmet.dto.form.IssueIdFormDTO;
import com.epmet.dto.form.ProcessProjectIdFormDTO;
import com.epmet.dto.result.BelongGridNameResultDTO;
import com.epmet.dto.result.IssueProcessResultDTO;
import com.epmet.dto.result.ProcessListResultDTO;
import com.epmet.entity.IssueProcessEntity;
import com.epmet.feign.GovOrgFeignClient;
@ -42,7 +38,6 @@ import com.epmet.redis.IssueProcessRedis;
import com.epmet.service.IssueProcessService;
import com.epmet.service.IssueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -149,38 +144,16 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
IssueDTO issueDTO = issueService.get(issueId.getIssueId());
String issueStatus = issueDTO.getIssueStatus();
if (issueStatus.equals(IssueConstant.ISSUE_CLOSED)){//已关闭——处理进展
List<IssueProcessResultDTO> issueProcessResultDTOS = baseDao.issueProcess(issueId);
if (issueProcessResultDTOS.size()!=NumConstant.ZERO){
String gridId = issueProcessResultDTOS.get(NumConstant.ZERO).getGridId();
BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO();
formDTO.setGridId(gridId);
//处理部门(处理人所属的机关单位名称) eg:阜新路社区——第一网格
BelongGridNameResultDTO data = govOrgFeignClient.getGridNameByGridId(formDTO).getData();
BeanUtils.copyProperties(issueProcessResultDTOS,listResult);
for (IssueProcessResultDTO issueProcessResultDTO : issueProcessResultDTOS) {
ProcessListResultDTO process = new ProcessListResultDTO();
BeanUtils.copyProperties(issueProcessResultDTO,process);
process.setDepartmentName(data.getBelongsGridName());
listResult.add(process);
}
}
listResult = baseDao.issueProcess(issueId);
}else if (issueStatus.equals(IssueConstant.ISSUE_SHIFT_PROJECT)){//已转项目——处理进展
String projectId = issueProjectRelationDao.selectProjectIdByIssueId(issueId.getIssueId());
if (!StringUtils.isBlank(projectId)) {
ProcessProjectIdFormDTO formDTO = new ProcessProjectIdFormDTO();
formDTO.setProjectId(projectId);
listResult = govProjectFeignClient.projectProcessList(formDTO).getData();
//转议题时间
IssueProcessResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId);
String gridId = issueProcessResultDTO.getGridId();
BelongGridNameFormDTO gridName = new BelongGridNameFormDTO();
gridName.setGridId(gridId);
//处理部门(处理人所属的机关单位名称) eg:阜新路社区——第一网格
BelongGridNameResultDTO data = govOrgFeignClient.getGridNameByGridId(gridName).getData();
ProcessListResultDTO process = new ProcessListResultDTO();
BeanUtils.copyProperties(issueProcessResultDTO,process);
process.setDepartmentName(data.getBelongsGridName());
listResult.add(process);
//转议题信息
ProcessListResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId);
listResult.add(issueProcessResultDTO);
}
}else {
return new ArrayList<>();

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

@ -274,7 +274,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
}
/**
* @Description 已关闭列表
* @Description 已关闭列表 居民端
* @param issueListForm
* @return List<ClosedIssueListResultDTO>
* @author wangc
@ -346,6 +346,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
if (null == entity) {
throw new RenException(IssueConstant.SELECT_EXCEPTION);
}
if (IssueConstant.ISSUE_CLOSED.equals(entity.getIssueStatus())) {
throw new RenException(IssueConstant.OPERATION_EXCEPTION);
}
entity.setIssueStatus(IssueConstant.ISSUE_CLOSED);
entity.setCloseReason(formDTO.getCloseReason());
entity.setResolveType(formDTO.getResolveType());
@ -360,6 +363,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
agencyGridResultDTO.setAgencyId(entity.getOrgId());
agencyGridResultDTO.setGridId(entity.getGridId());
Result<AgencyGridResultDTO> resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO);
if (!resultDTO.success() || null == resultDTO.getData()) {
throw new RenException(IssueConstant.SELECT_GOV_ORG_EXCEPTION);
}
agencyGridResultDTO = resultDTO.getData();
//3:议题进展记录表新增数据
@ -367,7 +373,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
processEntity.setIssueId(formDTO.getIssueId());
processEntity.setIssueStatus(IssueConstant.ISSUE_CLOSED);
processEntity.setOrgType(IssueConstant.ISSUE_GRID);
processEntity.setOrgId(entity.getOrgId());
processEntity.setOrgId(entity.getGridId());
processEntity.setOperationExplain(formDTO.getCloseReason());
processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName());
issueProcessDao.insert(processEntity);
@ -409,10 +415,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE);
msgDTO.setMessageContent(messageContent);
msgDTO.setReadFlag(ReadFlagConstant.UN_READ);
UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO,UserMessageFormDTO.class);
msgDTO.setUserId(topicDTO.getCreatedBy());
msgList.add(msgDTO);
msgDTO.setUserId(entity.getCreatedBy());
msgList.add(msgDTO);
msgIssue.setUserId(entity.getCreatedBy());
msgList.add(msgIssue);
return messageFeignClient.saveUserMessageList(msgList);
}
@ -466,6 +473,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
//2:调用gov-project服务,新增项目各业务表初始数据
Result<IssueProjectResultDTO> resultDTO = govProjectFeignClient.issueShiftProject(formDTO);
if (!resultDTO.success() || null == resultDTO.getData()) {
throw new RenException(IssueConstant.GOV_PRJECT_EXCEPTION);
}
IssueProjectResultDTO issueProjectResultDTO = resultDTO.getData();
//3:更新议题相关业务表数据
@ -507,4 +517,19 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
}
/**
* @Description
* @param issueListForm
* @return
* @author wangc
* @date 2020.05.18 10:38
**/
@Override
public List<ClosedIssueListGovResultDTO> closedListGov(CommonIssueListFormDTO issueListForm) {
issueListForm.setPageNo(null == issueListForm.getPageNo() ? NumConstant.ZERO :
(issueListForm.getPageNo() - NumConstant.ONE)*issueListForm.getPageSize()
);
return baseDao.selectClosedListGov(issueListForm);
}
}

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

@ -212,7 +212,7 @@
<select id="selectClosedList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListResultDTO">
SELECT
ID AS issueId,
IFNULL(ISSUE_TITLE,''),
IFNULL(ISSUE_TITLE,'') AS issueTitle,
IFNULL(CLOSE_REASON,'') AS solution,
UNIX_TIMESTAMP( created_time ) AS issueClosedTime
FROM
@ -226,5 +226,23 @@
LIMIT #{pageNo},
#{pageSize}
</select>
<!-- 查询已关闭议题列表 政府端 -->
<select id="selectClosedListGov" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListGovResultDTO">
SELECT
ID AS issueId,
IFNULL(ISSUE_TITLE,'') AS issueTitle,
IFNULL(CLOSE_REASON,'') AS closeReason,
UNIX_TIMESTAMP( created_time ) AS closedTime
FROM
issue
WHERE
DEL_FLAG = '0'
AND GRID_ID = #{gridId}
AND ISSUE_STATUS = 'closed'
ORDER BY
created_time DESC
LIMIT #{pageNo},
#{pageSize}
</select>
</mapper>

13
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml

@ -99,7 +99,7 @@
</trim>
</insert>
<!-- 议题处理进展——已关闭 -->
<select id="issueProcess" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.IssueProcessResultDTO">
<select id="issueProcess" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.ProcessListResultDTO">
SELECT
CASE
WHEN issue_status = 'voting' THEN "转议题"
@ -108,8 +108,8 @@
END AS processName,
UNIX_TIMESTAMP( created_time ) AS processTime,
operation_explain AS progressDesc,
id AS processId,
org_id AS gridId
org_name AS departmentName,
id AS processId
FROM
issue_process
WHERE
@ -118,13 +118,14 @@
ORDER BY created_time DESC
</select>
<select id="issueBeginInfo" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.IssueProcessResultDTO">
<!-- 查询转议题信息 -->
<select id="issueBeginInfo" parameterType="com.epmet.dto.form.IssueIdFormDTO" resultType="com.epmet.dto.result.ProcessListResultDTO">
SELECT
'转议题' AS processName,
UNIX_TIMESTAMP( created_time ) AS processTime,
operation_explain AS progressDesc,
id AS processId,
org_id AS gridId
org_name AS departmentName,
id AS processId
FROM
issue_process
WHERE

19
epmet-module/gov-mine/gov-mine-client/src/main/java/com/epmet/dto/form/StaffReadMsgFormDTO.java

@ -0,0 +1,19 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 单条消息标记为已读入参
* @Author yinzuomei
* @Date 2020/5/17 15:56
*/
@Data
public class StaffReadMsgFormDTO implements Serializable {
@NotBlank(message = "消息id不能为空")
private String messageId;
}

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.14
image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.15
ports:
- "8098:8098"
network_mode: host # 使用现有网络

8
epmet-module/gov-mine/gov-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.14</version>
<version>0.3.15</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>
@ -84,6 +84,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-message-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

98
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffMessageController.java

@ -0,0 +1,98 @@
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.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.form.StaffReadMsgFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.service.StaffMessageService;
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;
/**
* @Description 政府端小程序首页我的消息
* @Author yinzuomei
* @Date 2020/5/17 14:11
*/
@RestController
@RequestMapping("message")
public class StaffMessageController {
@Autowired
private StaffMessageService staffMessageService;
/**
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.StaffUnReadMsgResultDTO>
* @Author yinzuomei
* @Description 未读消息查询
* @Date 2020/5/17 15:48
**/
@PostMapping("unreadmsg")
public Result<StaffUnReadMsgResultDTO> unReadMsg(@LoginUser TokenDto tokenDto,
@RequestBody StaffMessageCommonFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = staffMessageService.queryUnReadMsg(formDTO);
return new Result<StaffUnReadMsgResultDTO>().ok(staffUnReadMsgResultDTO);
}
/**
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.StaffMessageResultDTO>
* @Author yinzuomei
* @Description 查询我的消息
* @Date 2020/5/17 15:48
**/
@PostMapping("mymessage")
public Result<List<StaffMessageResultDTO>> myMessage(@LoginUser TokenDto tokenDto,
@RequestBody StaffMessageFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
List<StaffMessageResultDTO> staffMessageResultDTO = staffMessageService.queryStaffMessage(formDTO);
return new Result<List<StaffMessageResultDTO>>().ok(staffMessageResultDTO);
}
/**
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 全部已读(清楚未读)
* @Date 2020/5/17 15:52
**/
@PostMapping("readall")
public Result readAll(@LoginUser TokenDto tokenDto,
@RequestBody StaffMessageCommonFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
staffMessageService.readAllMessage(formDTO);
return new Result();
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 单条消息标记为已读
* @Date 2020/5/17 15:57
**/
@PostMapping("readmsg")
public Result readMessage(@RequestBody StaffReadMsgFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
staffMessageService.readMessage(formDTO);
return new Result();
}
}

64
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetMessageFeignClient.java

@ -0,0 +1,64 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserMessageDTO;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.feign.fallback.EpmetMessageFeignClientFallBack;
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/7 14:55
*/
@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageFeignClientFallBack.class)
public interface EpmetMessageFeignClient {
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.StaffUnReadMsgResultDTO>
* @Author yinzuomei
* @Description 查询未读消息
* @Date 2020/5/17 16:10
**/
@PostMapping("/message/usermessage/staff/queryunreadmsg")
Result<StaffUnReadMsgResultDTO> queryUnReadMsg(@RequestBody StaffMessageCommonFormDTO formDTO);
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.StaffMessageResultDTO>>
* @Author yinzuomei
* @Description 查询我的消息列表
* @Date 2020/5/17 16:10
**/
@PostMapping("/message/usermessage/staff/querystaffmessage")
Result<List<StaffMessageResultDTO>> queryStaffMessage(@RequestBody StaffMessageFormDTO formDTO);
/**
* 单条消息已读
*
* @param messageDTO 参数
* @return Result
*/
@PostMapping("/message/usermessage/readmsg")
Result readMessage(@RequestBody UserMessageDTO messageDTO);
/**
* 消息全部已读
*
* @param messageDTO 参数
* @return Result
*/
@PostMapping("/message/usermessage/readall")
Result readAllMessage(@RequestBody UserMessageDTO messageDTO);
}

44
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetMessageFeignClientFallBack.java

@ -0,0 +1,44 @@
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.UserMessageDTO;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.feign.EpmetMessageFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/4/7 14:58
*/
@Component
public class EpmetMessageFeignClientFallBack implements EpmetMessageFeignClient {
@Override
public Result<StaffUnReadMsgResultDTO> queryUnReadMsg(StaffMessageCommonFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "queryUnReadMsg", formDTO);
}
@Override
public Result<List<StaffMessageResultDTO>> queryStaffMessage(StaffMessageFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "queryStaffMessage", formDTO);
}
@Override
public Result readMessage(UserMessageDTO messageDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "readMessage", messageDTO);
}
@Override
public Result readAllMessage(UserMessageDTO messageDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "allRead", messageDTO);
}
}

52
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffMessageService.java

@ -0,0 +1,52 @@
package com.epmet.service;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.form.StaffReadMsgFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import java.util.List;
/**
* @Description 政府端小程序首页我的消息
* @Author yinzuomei
* @Date 2020/5/17 14:12
*/
public interface StaffMessageService {
/**
* @param formDTO
* @return com.epmet.dto.result.StaffUnReadMsgResultDTO
* @Author yinzuomei
* @Description 查询未读消息
* @Date 2020/5/17 15:58
**/
StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO);
/**
* @param formDTO
* @return com.epmet.dto.result.StaffMessageResultDTO
* @Author yinzuomei
* @Description 查询我的消息
* @Date 2020/5/17 15:58
**/
List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO);
/**
* @param formDTO
* @return void
* @Author yinzuomei
* @Description 清除未读
* @Date 2020/5/17 15:58
**/
void readAllMessage(StaffMessageCommonFormDTO formDTO);
/**
* @param formDTO
* @return void
* @Author yinzuomei
* @Description 单条已读
* @Date 2020/5/17 15:58
**/
void readMessage(StaffReadMsgFormDTO formDTO);
}

73
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffMessageServiceImpl.java

@ -0,0 +1,73 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserMessageDTO;
import com.epmet.dto.form.StaffMessageCommonFormDTO;
import com.epmet.dto.form.StaffMessageFormDTO;
import com.epmet.dto.form.StaffReadMsgFormDTO;
import com.epmet.dto.result.StaffMessageResultDTO;
import com.epmet.dto.result.StaffUnReadMsgResultDTO;
import com.epmet.feign.EpmetMessageFeignClient;
import com.epmet.service.StaffMessageService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @Description 政府端小程序首页我的消息
* @Author yinzuomei
* @Date 2020/5/17 14:12
*/
@Service
public class StaffMessageServiceImpl implements StaffMessageService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private EpmetMessageFeignClient epmetMessageFeignClient;
@Override
public StaffUnReadMsgResultDTO queryUnReadMsg(StaffMessageCommonFormDTO formDTO) {
StaffUnReadMsgResultDTO staffUnReadMsgResultDTO = new StaffUnReadMsgResultDTO();
staffUnReadMsgResultDTO.setUnReadCount(0);
Result<StaffUnReadMsgResultDTO> result = epmetMessageFeignClient.queryUnReadMsg(formDTO);
if (result.success() && null != result.getData()) {
return result.getData();
}
return staffUnReadMsgResultDTO;
}
@Override
public List<StaffMessageResultDTO> queryStaffMessage(StaffMessageFormDTO formDTO) {
Result<List<StaffMessageResultDTO>> result = epmetMessageFeignClient.queryStaffMessage(formDTO);
if (result.success() && null != result.getData() && result.getData().size() > 0) {
return result.getData();
}
return new ArrayList<>();
}
@Override
public void readAllMessage(StaffMessageCommonFormDTO formDTO) {
UserMessageDTO userMessageDTO = new UserMessageDTO();
userMessageDTO.setUserId(formDTO.getUserId());
userMessageDTO.setCustomerId(formDTO.getCustomerId());
Result result = epmetMessageFeignClient.readAllMessage(userMessageDTO);
if (result.success()) {
logger.info(String.format("客户id:%s,staffId:%s清除未读消息成功", formDTO.getCustomerId(), formDTO.getUserId()));
}
}
@Override
public void readMessage(StaffReadMsgFormDTO formDTO) {
UserMessageDTO userMessageDTO = new UserMessageDTO();
userMessageDTO.setId(formDTO.getMessageId());
Result result = epmetMessageFeignClient.readMessage(userMessageDTO);
if (result.success()) {
logger.info(String.format("消息id:%s置为已读", formDTO.getMessageId()));
}
}
}

39
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CanTickStaffListFormDTO.java

@ -0,0 +1,39 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 项目跟踪-部门人员选择-接口入参
* @Author sun
*/
@Data
public class CanTickStaffListFormDTO implements Serializable {
private static final long serialVersionUID = 4859779755214502427L;
/**
* 当前工作人员代表的组织Id
*/
private String agencyId="";
/**
* 代表是哪个模块调用的接口
* issue:议题管理
* project:项目跟踪
*/
private String type="";
/**
* 当前工作人员可能所属的部门
* 1组织下的人则此字段值为空
* 2部门下的人此字段为部门Id
* 3网格下的人此字段为网格Id
*/
private String deptOrGridId="";
/**
* 工作人员Id
*/
private String staffId;
}

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.36
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.38
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.36</version>
<version>0.3.38</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java

@ -51,4 +51,8 @@ public interface CustomerAgencyConstant {
* 工作人员角色-网格长
*/
String GRID_MANAGER = "grid_manager";
/**
* 调用epmet-user服务查询用户基础信息失败
*/
String SELECT_USER_EXCEPTION = "获取用户基本信息失败";
}

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@ -125,7 +125,7 @@ public class CustomerAgencyController {
* @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息
**/
@PostMapping("departmentstafflist")
public Result<DepartmentStaffListResultDTO> departmentStaffList(CanTickStaffListFormDTO canTick) {
public Result<DepartmentStaffListResultDTO> departmentStaffList(@RequestBody CanTickStaffListFormDTO canTick) {
return new Result<DepartmentStaffListResultDTO>().ok(customerAgencyService.departmentStaffList(canTick));
}
@ -136,7 +136,7 @@ public class CustomerAgencyController {
* @Description 根据组织Id集合部门Id集合网格Id集合查询各自对应详细信息
**/
@PostMapping("getagencydeptgridlist")
public Result<AgencyDeptGridResultDTO> getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO) {
public Result<AgencyDeptGridResultDTO> getAgencyDeptGridList(@RequestBody AgencyDeptGridFormDTO formDTO) {
return new Result<AgencyDeptGridResultDTO>().ok(customerAgencyService.getAgencyDeptGridList(formDTO));
}

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@ -190,7 +190,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
DepartmentStaffListResultDTO resultDTO = new DepartmentStaffListResultDTO();
//1:根据组织Id查询该组织下工作人员列表(如果当前操作人是组织下的则不查询)
String staffId = "";
if("project".equals(canTick.getType())&&"".equals(canTick.getDeptOrGridId())){
if ("project".equals(canTick.getType()) && "".equals(canTick.getDeptOrGridId())) {
staffId = canTick.getStaffId();
}
List<StaffListResultDTO> agencyStaffList = customerStaffAgencyDao.selectAgencyStaffList(canTick.getAgencyId(),staffId);
@ -241,6 +241,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
staffIdList.addAll(staffIdList1); staffIdList.addAll(staffIdList2); staffIdList.addAll(staffIdList3);
staffIdList = new ArrayList<String>(new LinkedHashSet<>(staffIdList));
Result<CustomerStaffListResultDTO> userList = epmetUserFeignClient.getCustomerStaffList(staffIdList);
if(!userList.success()||null==userList.getData()){
throw new RenException(CustomerAgencyConstant.SELECT_USER_EXCEPTION);
}
//5:循环数据,将人员数据放到对应数据结构下
CustomerStaffListResultDTO dto = userList.getData();
List<StaffListResultDTO> staffList = dto.getStaffList();

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.4
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.6
ports:
- "8102:8102"
network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.4</version>
<version>0.3.6</version>
<parent>
<artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId>

3
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@ -206,6 +206,9 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
agencyDeptGridFormDTO.setDeptIdList(deptIdList);
agencyDeptGridFormDTO.setGridIdList(gridIdList);
Result<AgencyDeptGridResultDTO> resultDTO = govOrgFeignClient.getAgencyDeptGridList(agencyDeptGridFormDTO);
if (!resultDTO.success() || null == resultDTO.getData()) {
throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION);
}
AgencyDeptGridResultDTO agencyDeptGrid = resultDTO.getData();
//3.2:批量新增项目人员关联表数据
List<ProjectStaffEntity> entityList = new ArrayList<>();

12
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java

@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.ProjectConstant;
import com.epmet.dao.ProjectSatisfactionDetailDao;
import com.epmet.dto.ProjectSatisfactionDetailDTO;
@ -42,10 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -130,13 +128,15 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl<Projec
//2:调用epmet-user服务 获取用户头像 昵称
//2.1:遍历获取所有的userId
List<String> userIds = evaluationList.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList());
userIds = new ArrayList<String>(new LinkedHashSet<>(userIds));
//2.2:获取所有用户的头像 昵称
UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
userResiInfoListFormDTO.setUserIdList(userIds);
List<UserResiInfoResultDTO> userResiInfoList = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO).getData();
if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
Result<List<UserResiInfoResultDTO>> listResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
if (null == listResult.getData()) {
throw new RenException(ProjectConstant.SELECT_USERINFO_EXCEPTION);
}
List<UserResiInfoResultDTO> userResiInfoList = listResult.getData();
//3:将每个用户的头像 昵称放到对应实体中返回给前台
List<EvaluationListResultDTO> resultList = evaluationList.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {

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

@ -251,7 +251,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
public ProjectDetailResultDTO getProjectDetail(ProjectDetailFromDTO fromDTO) {
ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
resultDTO.setProcessable(true);
resultDTO.setProcessable(false);
} else {
//获取我未处理的部门
ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@ -259,9 +259,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
projectStaffDTO.setStaffId(fromDTO.getUserId());
List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO);
if (null != departmentList && departmentList.size() > 0) {
resultDTO.setProcessable(false);
} else {
resultDTO.setProcessable(true);
} else {
resultDTO.setProcessable(false);
}
}

3
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java

@ -140,6 +140,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
}
canTick.setStaffId(formDTO.getStaffId());
Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(canTick);
if(null==resultDTOResult.getData()){
throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION);
}
return resultDTOResult.getData();
}

8
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java

@ -18,12 +18,12 @@ public class TopicInfoDTO implements Serializable {
/**
* 话题id
*/
private String topicId;
private String topicId = "";
/**
* 话题内容
*/
private String topicContent;
private String topicContent = "";
/**
* 图片列表
@ -33,11 +33,11 @@ public class TopicInfoDTO implements Serializable {
/**
* 话题发表人山东路168-尹女士
*/
private String publishedUser;
private String publishedUser = "";
/**
* 话题发表时间 (时间戳 毫秒级)
*/
private Long publishedTime;
private Long publishedTime = 0L;
}

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java

@ -33,7 +33,7 @@ public class GovTopicIssueInfoResultDTO implements Serializable {
/**
* 话题发表人山东路168-尹女士
*/
private String publishedUser;
private String topicPublisher;
/**
* 话题发表时间 (时间戳 毫秒级)

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.20
image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.23
ports:
- "8095:8095"
network_mode: host # 使用现有网络

8
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.20</version>
<version>0.3.23</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>
@ -88,6 +88,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>resi-guide-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

23
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java

@ -0,0 +1,23 @@
package com.epmet.modules.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.UserEnterGridFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.modules.feign.fallback.ResiGuideFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @Description TODO
* @Author yinzuomei
* @Date 2020/5/18 15:13
*/
//,url = "http://localhost:8091"
@FeignClient(name = ServiceConstant.RESI_GUIDE_SERVER, fallback = ResiGuideFeignClientFallback.class)
public interface ResiGuideFeignClient {
@PostMapping("/resi/guide/user/entergrid")
Result<UserInfoOnEnterGridResultDTO> enterGrid(@RequestBody UserEnterGridFormDTO userEnterGridFormDTO);
}

26
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java

@ -0,0 +1,26 @@
package com.epmet.modules.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.UserEnterGridFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.modules.feign.ResiGuideFeignClient;
import org.springframework.stereotype.Component;
/**
* @Description TODO
* @Author yinzuomei
* @Date 2020/5/18 15:14
*/
@Component
public class ResiGuideFeignClientFallback implements ResiGuideFeignClient {
@Override
public Result<UserInfoOnEnterGridResultDTO> enterGrid(UserEnterGridFormDTO userEnterGridFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GUIDE_SERVER,"enterGrid",userEnterGridFormDTO);
}
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@ -27,13 +27,16 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.ReadFlagConstant;
import com.epmet.dto.form.UserEnterGridFormDTO;
import com.epmet.dto.form.UserInvitationFormDTO;
import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.feign.MessageFeignClient;
import com.epmet.modules.constant.UserMessageConstant;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.ResiGuideFeignClient;
import com.epmet.modules.group.dao.ResiGroupDao;
import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.modules.group.service.ResiGroupService;
@ -96,6 +99,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private ResiGuideFeignClient resiGuideFeignClient;
@Override
public PageData<GroupInvitationDTO> page(Map<String, Object> params) {
@ -212,6 +217,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
linkGroupInfoResultDTO.setGroupInfo(groupInfo);
//4、记录用户邀请关系
this.saveUserInvitation(groupInvitationDTO,formDTO);
UserEnterGridFormDTO userEnterGridFormDTO=new UserEnterGridFormDTO();
userEnterGridFormDTO.setCustomerId(groupInfo.getCustomerId());
userEnterGridFormDTO.setGridId(groupInfo.getGridId());
Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
if(!result.success()){
logger.error("进入网格失败"+result.getMsg());
}
return linkGroupInfoResultDTO;
}

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@ -928,6 +928,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId());
wrapper.orderByAsc(TopicConstant.SORT);
List<ResiTopicAttachmentEntity> attachments = resiTopicAttachmentDao.selectList(wrapper);
if (attachments.size()==NumConstant.ZERO){
return new TopicInfoDTO();
}
List<String> attachmentUrls = new ArrayList<>();
for(ResiTopicAttachmentEntity attachment : attachments){
attachmentUrls.add(attachment.getAttachmentUrl());
@ -935,7 +938,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
topicInfo.setTopicImgs(attachmentUrls);
//话题发起人
IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO();
issueInitiator.setUserId(topicInfo.getTopicId());
issueInitiator.setUserId(topicInfo.getPublishedUser());
Result<IssueInitiatorResultDTO> issueInitiatorResult = epmetUserFeignClient.selectIssueInitiator(issueInitiator);
topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator());
return topicInfo;
@ -1102,12 +1105,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
ResiGroupMemberInfoRedisDTO topicCreator =
resiGroupMemberRedis.get(topic.getGroupId(), topic.getCreatedBy());
if (null != topicCreator) {
result.setPublishedUser(StringUtils.isBlank(topicCreator.getUserShowName())
result.setTopicPublisher(StringUtils.isBlank(topicCreator.getUserShowName())
? ModuleConstant.EMPTY_STR : topicCreator.getUserShowName());
result.setTopicPublisherMobile(StringUtils.isBlank(topicCreator.getMemberMobile())
? ModuleConstant.EMPTY_STR : topicCreator.getMemberMobile());
} else {
result.setPublishedUser(ModuleConstant.EMPTY_STR);
result.setTopicPublisher(ModuleConstant.EMPTY_STR);
result.setTopicPublisherMobile(ModuleConstant.EMPTY_STR);
}
//4.话题发表时间格式转换

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

@ -283,11 +283,19 @@
SELECT
COUNT(*) AS joinTeamCounts
FROM
resi_group_member joinTeamCounts
resi_group_member rgm
WHERE
del_flag = 0
AND resi_group_id = ALL ( SELECT id FROM resi_group WHERE del_flag = 0 AND grid_id = #{gridId} )
AND customer_user_id = #{userId}
rgm.del_flag = 0
AND rgm.resi_group_id = ALL (
SELECT
rg.id
FROM
resi_group rg
WHERE
rg.del_flag = 0
AND rg.grid_id = #{gridId}
AND rgm.resi_group_id = rg.id )
AND rgm.customer_user_id = #{userId}
</select>
<!-- 查询一个网格下面所有组Id -->

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.6
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.7
ports:
- "8091:8091"
network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.6</version>
<version>0.3.7</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

7
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java

@ -1,5 +1,6 @@
package com.epmet.controller;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
@ -7,6 +8,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.UserEnterGridFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.service.UserAccessService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -22,13 +25,13 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("user")
public class UserGuideController {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private UserAccessService userAccessService;
@PostMapping("entergrid")
Result<UserInfoOnEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
logger.info("进网格TokenDto:"+ JSON.toJSON(token));
ValidatorUtils.validateEntity(userEnterGridFormDTO);
return userAccessService.enterGrid(token,userEnterGridFormDTO);

2
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java

@ -48,7 +48,7 @@ public class IssueDetailResultDTO implements Serializable {
/**
* 项目状态 已结案true未结案false
*/
private Boolean projectStatus;
private Boolean projectStatus = false;
/**
* 投票状态 已投票true未投票false

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-hall-server:
container_name: resi-hall-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.4
image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.7
ports:
- "8100:8100"
network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.4</version>
<version>0.3.7</version>
<parent>
<artifactId>resi-hall</artifactId>
<groupId>com.epmet</groupId>

26
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@ -40,7 +40,7 @@ public class IssueController {
* @date 2020/5/11 9:42
*/
@PostMapping(value = "/detail")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<IssueDetailResultDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IssueDetailFormDTO issueDetail){
ValidatorUtils.validateEntity(issueDetail);
return new Result<IssueDetailResultDTO>().ok(issueService.detail(tokenDto,issueDetail));
@ -52,7 +52,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping(value = "votingtrend")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return new Result<VotingTrendResultDTO>().ok(issueService.votingTrend(formDTO));
@ -64,7 +64,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping(value = "support")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result support(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
issueService.support(tokenDto,formDTO);
@ -77,7 +77,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping(value = "oppose")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result oppose(@LoginUser TokenDto tokenDto,@RequestBody IssueIdFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
issueService.oppose(tokenDto,formDTO);
@ -103,7 +103,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("initevaluation")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<InitEvaluationResultDTO> initEvaluation(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO issueId){
ValidatorUtils.validateEntity(issueId);
return new Result<InitEvaluationResultDTO>().ok(issueService.initEvaluation(tokenDto,issueId));
@ -116,7 +116,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("projectinitevaluation")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){
ValidatorUtils.validateEntity(projectId);
return new Result<ProjectInitEvaluationResultDTO>().ok(issueService.projectInitEvaluation(tokenDto,projectId));
@ -128,7 +128,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("evaluate")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result evaluate(@LoginUser TokenDto tokenDto,@RequestBody EvaluateFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
issueService.evaluate(tokenDto,formDTO);
@ -141,7 +141,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("projectevaluate")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
issueService.projectEvaluate(tokenDto,formDTO);
@ -154,7 +154,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("evaluationlist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return new Result<List<EvaluationListResultDTO>>().ok(issueService.evaluationList(formDTO));
@ -166,7 +166,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("projectevaluationlist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<List<EvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return new Result<List<EvaluationListResultDTO>>().ok(issueService.projectEvaluationList(formDTO));
@ -178,7 +178,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("shiftproject")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT)
public Result<List<ShiftProjectListResultDTO>> getShiftProjectList(@RequestBody ShiftProjectListFromDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return new Result<List<ShiftProjectListResultDTO>>().ok(issueService.getShiftProjectList(formDTO));
@ -192,7 +192,7 @@ public class IssueController {
* @date 2020.05.14 13:57
**/
@PostMapping("votinglist")
public Result<List<VotingIssueListResultDTO>> votingList(CommonIssueListFormDTO issueListFormDTO){
public Result<List<VotingIssueListResultDTO>> votingList(@RequestBody CommonIssueListFormDTO issueListFormDTO){
ValidatorUtils.validateEntity(issueListFormDTO);
return govIssueFeignClient.votingList(issueListFormDTO);
}
@ -216,7 +216,7 @@ public class IssueController {
* @author zxc
*/
@PostMapping("processlist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
public Result<List<ProcessListResultDTO>> processList(@RequestBody IssueIdFormDTO issueId){
ValidatorUtils.validateEntity(issueId);
return new Result<List<ProcessListResultDTO>>().ok(issueService.processList(issueId));

2
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@ -171,8 +171,8 @@ public class IssueServiceImpl implements IssueService {
voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
voteResultDTOResult.setSupportCount(NumConstant.ZERO);
}else {
voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
voteResultDTOResult = govIssueFeignClient.voteCount(issueId).getData();
voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
}
return voteResultDTOResult;
}

Loading…
Cancel
Save