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

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";
 }

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.7
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.8
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

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.7</version>
+    <version>0.3.8</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

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 = "议题转项目，获取项目数据失败";
 }

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);
 
     /**

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

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

@@ -195,7 +195,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             shiftProject.setIssueTitle(issue.getIssueTitle());
             shiftProject.setDepartmentNameList(project.getDepartmentNameList());
             shiftProject.setPublicReply(project.getPublicReply());
-            shiftProject.setShiftedTime(project.getCreatedTime().getTime());
+            shiftProject.setShiftedTime(project.getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
             shiftProject.setProjectStatus(project.getStatus());
             return shiftProject;
         })).collect(Collectors.toList());
@@ -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());
+        msgIssue.setUserId(entity.getCreatedBy());
-        msgList.add(msgDTO);
+        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:更新议题相关业务表数据

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.37
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.38
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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.37</version>
+    <version>0.3.38</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

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 = "获取用户基本信息失败";
 }

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));
     }
 

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

@@ -198,12 +198,15 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         //2.1:查询组织下部门列表
         List<DepartmentListResultDTO> listDept = customerDepartmentDao.selectDepartmentList(canTick.getAgencyId());
         List<DeptListResultDTO> departmentList = ConvertUtils.sourceToTarget(listDept, DeptListResultDTO.class);
+        List<CustomerStaffDepartmentDTO> deptStaffs = new ArrayList<>();
+        if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
             //2.2:查询每一个部门下人员列表
             List<String> deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList());
-        List<CustomerStaffDepartmentDTO> deptStaffs  = customerStaffDepartmentDao.selectDeptStaffs(deptIdList);
+            deptStaffs = customerStaffDepartmentDao.selectDeptStaffs(deptIdList);
+            List<CustomerStaffDepartmentDTO> finalDeptStaffs = deptStaffs;
             departmentList.forEach(dept->{
                 List<StaffListResultDTO> departmentStaffList = new ArrayList<>();
-            deptStaffs.forEach(ds->{
+                finalDeptStaffs.forEach(ds->{
                     if (dept.getDepartmentId().equals(ds.getDepartmentId())) {
                         if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !dept.getDepartmentId().equals(canTick.getDeptOrGridId())) {
                             StaffListResultDTO sf = new StaffListResultDTO();
@@ -214,15 +217,19 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 });
                 dept.setDepartmentStaffList(departmentStaffList);
             });
+        }
         //3:根据组织Id查询该组织下网格、人员列表
         //3.1:查询组织下网格列表
         List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId());
+        List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>();
+        if (null != gridList && gridList.size() > NumConstant.ZERO) {
             //3.2:查询每一个网格下人员列表
             List<String> gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList());
-        List<CustomerStaffGridDTO> gridStaffs  = customerStaffGridDao.selectGridStaffs(gridIdList);
+            gridStaffs  = customerStaffGridDao.selectGridStaffs(gridIdList);
+            List<CustomerStaffGridDTO> finalGridStaffs = gridStaffs;
             gridList.forEach(grid->{
                 List<StaffListResultDTO> gridStaffList = new ArrayList<>();
-            gridStaffs.forEach(gs->{
+                finalGridStaffs.forEach(gs->{
                     if(grid.getGridId().equals(gs.getGridId())){
                         if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !grid.getGridId().equals(canTick.getDeptOrGridId())) {
                             StaffListResultDTO sf = new StaffListResultDTO();
@@ -233,6 +240,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 });
                 grid.setGridStaffList(gridStaffList);
             });
+        }
         //4:汇总组织下人员、组织下部门下人员、组织下网格下人员Id集合，调用epmet-user服务查询工作人员基本信息
         List<String> staffIdList1 = agencyStaffList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList());
         List<String> staffIdList2 = deptStaffs.stream().map(CustomerStaffDepartmentDTO::getUserId).collect(Collectors.toList());
@@ -241,6 +249,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();

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.5
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.6
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

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.5</version>
+    <version>0.3.6</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

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<>();

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.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 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();
+        Result<List<UserResiInfoResultDTO>> listResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
-        if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
+        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 -> {

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

@@ -146,7 +146,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			PendProjectListResultDTO pend = new PendProjectListResultDTO();
 			pend.setProjectId(p.getId());
 			pend.setProjectTitle(p.getTitle());
-			pend.setProjectTime(p.getCreatedTime().getTime());
+			pend.setProjectTime(p.getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
 			String detentionDays = getDetentionDays(p);
 			if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
 				pend.setWarningFlag(true);
@@ -178,7 +178,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			created.setProjectTitle(p.getTitle());
 			created.setProjectStatus(p.getStatus());
 			created.setPublicReply(p.getPublicReply());
-			created.setProjectTime(p.getCreatedTime().getTime());
+			created.setProjectTime(p.getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
 
 
 			//获取当前处理部门
@@ -221,7 +221,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			involved.setProjectTitle(p.getTitle());
 			involved.setProjectStatus(p.getStatus());
 			involved.setPublicReply(p.getPublicReply());
-			involved.setProjectTime(p.getCreatedTime().getTime());
+			involved.setProjectTime(p.getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
 
 
 			//获取当前处理部门
@@ -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);
 			}
 		}
 

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();
     }
 

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;
 
 }

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.22
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.23
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

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.22</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>

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);
+}

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);
+
+    }
+}
+

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;
 	}
 

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;

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
+            rgm.del_flag = 0
+            AND rgm.resi_group_id = ALL (
+            SELECT
+                rg.id
+            FROM
+                resi_group rg
             WHERE
-            del_flag = 0
+                rg.del_flag = 0
-            AND resi_group_id = ALL ( SELECT id FROM resi_group WHERE del_flag = 0 AND grid_id = #{gridId} )
+                AND rg.grid_id = #{gridId}
-            AND customer_user_id = #{userId}
+                AND rgm.resi_group_id = rg.id )
+            AND rgm.customer_user_id = #{userId}
     </select>
 
     <!-- 查询一个网格下面所有组Id -->

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 # 使用现有网络

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>

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);

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

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.6
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.7
     ports:
       - "8100:8100"
     network_mode: host # 使用现有网络

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.6</version>
+    <version>0.3.7</version>
     <parent>
         <artifactId>resi-hall</artifactId>
         <groupId>com.epmet</groupId>

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));
@@ -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));

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;
     }