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

epmet-module/epmet-message/epmet-message-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.2
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:0.3.3
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

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.2</version>
+    <version>0.3.3</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>
@@ -90,12 +90,6 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>gov-org-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -1,18 +0,0 @@
-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.CustomerGridDTO;
-import com.epmet.feign.GovOrgFeignClient;
-import org.springframework.stereotype.Component;
-
-
-@Component
-public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
-
-    @Override
-    public Result<CustomerGridDTO> get(String id) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", id);
-    }
-}

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

@@ -22,7 +22,6 @@ 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.SendMsgResi2GovFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.entity.UserMessageEntity;
 import java.util.List;
@@ -135,12 +134,4 @@ public interface UserMessageService extends BaseService<UserMessageEntity> {
 	 * @Description 批量插入未读消息
 	 **/
 	Result saveUserMessageList(List<UserMessageFormDTO> msgList);
-
-	/**
-	* @Description 居民端动作触发发消息给政府端
-	* @param msgResi2GovFormDTO
-	* @author wangc
-	* @date 2020.04.29 14:42
-	*/
-	Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO);
 }

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

@@ -24,22 +24,16 @@ import com.epmet.commons.tools.constant.FieldConstant;
 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.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserMessageConstans;
 import com.epmet.dao.UserMessageDao;
-import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
-import com.epmet.dto.form.SendMsgResi2GovFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.entity.UserMessageEntity;
-import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.UserMessageRedis;
 import com.epmet.service.UserMessageService;
-import com.epmet.utils.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
-import org.bouncycastle.math.raw.Mod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,8 +56,6 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 
 	@Autowired
 	private UserMessageRedis userMessageRedis;
-	@Autowired
-	private GovOrgFeignClient govOrgFeignClient;
 
 	@Override
 	public PageData<UserMessageDTO> page(Map<String, Object> params) {
@@ -182,26 +174,4 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 		insertBatch(entityList);
 		return new Result();
 	}
-
-	@Override
-	public Result sendMsgResi2Gov(SendMsgResi2GovFormDTO msgResi2GovFormDTO) {
-
-		if(ModuleConstant.INSTITUTION_GRID.equals(msgResi2GovFormDTO.getInstitutionFlag())){
-			//1.根据网格Id找到其PID，即当前的AgencyId，调用gov-org服务
-			Result<CustomerGridDTO> gridInfo = govOrgFeignClient.get(msgResi2GovFormDTO.getInstitutionId());
-			if(!gridInfo.success() || null == gridInfo.getData() || StringUtils.isBlank(gridInfo.getData().getPid())){
-				logger.warn("");
-			}
-		}
-
-
-		//2.1根据AgencyId查找staff_role下所有的staffId且是未被禁用的，调用epmet-user服务
-
-		//2.2是本机构下的所有拥有roleKey的工作人员还是本网格下所有拥有roleKey的工作人员
-		//如果是本网格下则需要再次调用gov-org服务校验查询出相应角色的员工是否在本网格下，如果是本机构下则跳过此操作
-
-		//3.创建消息，调用epmet-message服务
-
-		return null;
-	}
 }

epmet-module/gov-access/gov-access-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.4
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.5
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-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.5</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java

@@ -31,7 +31,7 @@ public class AuditedPartyMemberResultDTO implements Serializable {
     /**
      * 申请时间
      */
-    private Date applyTime;
+    private Long applyTime;
 
     /**
      * auto_confirm_failed:自动认证失败,rejected :拒绝

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java

@@ -32,7 +32,7 @@ public class AuditingPartyMemberResultDTO implements Serializable {
     /**
      * 申请时间
      */
-    private Date applyTime;
+    private Long applyTime;
 
     /**
      * 提交网格：XXX街道-XXX社区-XXX网格

epmet-module/gov-grid/gov-grid-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.7
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.9
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络

epmet-module/gov-grid/gov-grid-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.7</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java

@@ -51,7 +51,7 @@ public class ResiGroupController {
 	 * @return Result<List < GroupAuditedResultDTO>>
 	 */
 	@PostMapping("groupsingrid")
-	public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) {
+	public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		return resiGroupService.getGroupsInGrid(formDTO);
 	}
@@ -63,7 +63,7 @@ public class ResiGroupController {
 	 * @return Result<GovGroupSummarizeResultDTO>
 	 */
 	@PostMapping("getgroupsummarize")
-	public Result<GovGroupSummarizeResultDTO> getGroupSummarize(GovGroupSummarizeFromDTO formDTO) {
+	public Result<GovGroupSummarizeResultDTO> getGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		return resiGroupService.getGroupSummarize(formDTO);
 	}

epmet-module/gov-mine/gov-mine-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.5
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.6
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

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

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

@@ -42,7 +42,7 @@ public class StaffSubmitFromDTO implements Serializable {
 	 * 手机
 	 */
 	@NotBlank(message = "手机号不能为空")
-	@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误")
+	@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "请输入正确的手机号")
 	private String mobile;
 	/**
 	 * 性别

epmet-module/gov-org/gov-org-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.25
     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.22</version>
+    <version>0.3.25</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

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

@@ -213,7 +213,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setGridName(addGridFormDTO.getGridName());
         customerGridEntity.setManageDistrict(addGridFormDTO.getManageDistrict());
         customerGridEntity.setPid(addGridFormDTO.getAgencyId());
-        customerGridEntity.setPids(customerAgencyDTO.getPids());//查询所有上级组织id
+        if(StringUtils.isBlank(customerAgencyDTO.getPids())){
+            customerGridEntity.setPids(addGridFormDTO.getAgencyId());
+        }else{
+            if(customerAgencyDTO.getPids().endsWith(addGridFormDTO.getAgencyId())){
+                customerGridEntity.setPids(customerAgencyDTO.getPids());
+            }else{
+                customerGridEntity.setPids(customerAgencyDTO.getPids().concat(":").concat(addGridFormDTO.getAgencyId()));
+            }
+        }
+       //查询所有上级组织id
         baseDao.insert(customerGridEntity);
         //查询刚刚添加的gridId
         String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null);
@@ -435,7 +444,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         if(null==customerGridDTO){
             return new Result<>();
         }
+        gridInfoResultDTO.setGridId(gridId);
         gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId());
+        gridInfoResultDTO.setGridName(customerGridDTO.getGridName());
         String pids=customerGridDTO.getPids();
         String[] pidArray = pids.split(":");
         for(String agencyId:pidArray){

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -96,13 +96,14 @@
     <!-- 根据gridId查询gridName -->
     <select id="selectGridNameByGridId" parameterType="com.epmet.dto.form.SelectGridNameByGridIdFormDTO" resultType="com.epmet.dto.result.SelectGridNameByGridIdResultDTO">
         SELECT
-            id AS gridId,
+            IFNULL(CONCAT(ca.all_parent_name,'-',ca.organization_name),'') AS gridName
-            grid_name AS gridName
         FROM
-            customer_grid
+            customer_grid cg
+            LEFT JOIN customer_agency ca ON ca.id = cg.pid
         WHERE
-            id = #{gridId}
+            cg.id = #{gridId}
-            AND del_flag = 0
+            AND cg.del_flag = 0
+            AND ca.del_flag = 0
     </select>
 
     <select id="getMyGrids" resultType="com.epmet.dto.result.CustomerGridByUserIdResultDTO">

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -18,18 +18,24 @@
 
     <!-- 查询指定客户下一个用户所在的网格，按照网格名称升序排序，取第一个 -->
     <select id="selectStaffGridOrderByGridName" parameterType="com.epmet.dto.form.LatestGridFormDTO" resultType="com.epmet.dto.CustomerGridDTO">
-        select csg.GRID_ID as id,
+        SELECT
-        cg.GRID_NAME,
+            grid.ID,
-        cg.PID
+            grid.GRID_NAME,
-        from customer_staff_grid csg
+            grid.PID
-        left join customer_grid cg
+		FROM CUSTOMER_STAFF_GRID staff
-        on(csg.GRID_ID=cg.id
+        LEFT JOIN
-        and cg.DEL_FLAG='0')
+            CUSTOMER_GRID grid ON
-        where csg.DEL_FLAG='0'
+            grid.ID = staff.GRID_ID
-        and csg.CUSTOMER_ID=#{customerId}
+        WHERE
-        and csg.USER_ID=#{staffId}
+            grid.DEL_FLAG = '0'
-        order by cg.GRID_NAME desc
+		AND
-        limit 1
+            staff.DEL_FLAG = '0'
+        AND
+            staff.CUSTOMER_ID = #{customerId}
+        AND
+            staff.USER_ID = #{staffId}
+        ORDER BY grid.GRID_NAME ASC
+        LIMIT 1
     </select>
 
     <!-- 校验用户是否已加入当前网格 -->

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

@@ -1,5 +1,6 @@
 package com.epmet.resi.group.dto.group.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,6 +39,7 @@ public class ApplyingGroupDetailResultDTO implements Serializable {
     /**
      * 申请时间
      * */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createdTime;
 
     /**

epmet-module/resi-group/resi-group-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.4
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.8
     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.4</version>
+    <version>0.3.8</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
@@ -70,6 +70,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-org-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java

@@ -1,10 +1,10 @@
-package com.epmet.feign;
+package com.epmet.modules.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDepartmentDTO;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 

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

@@ -0,0 +1,24 @@
+package com.epmet.modules.feign.fallback;
+
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerDepartmentDTO;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.modules.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+
+
+    @Override
+    public Result<CustomerGridDTO> getGrid(String id) {
+        return null;
+    }
+
+    @Override
+    public Result<CustomerDepartmentDTO> getDept(String id) {
+        return null;
+    }
+}

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

@@ -225,7 +225,7 @@ public class ResiGroupController {
 	 * @return Result<List < GroupAuditedResultDTO>>
 	 */
 	@PostMapping("audited")
-	public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) {
+	public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		return resiGroupService.audited(formDTO);
 	}
@@ -237,7 +237,7 @@ public class ResiGroupController {
 	 * @return Result<List < GroupAuditedResultDTO>>
 	 */
 	@PostMapping("groupsingrid")
-	public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) {
+	public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		return resiGroupService.getGroupsInGrid(formDTO);
 	}
@@ -249,7 +249,7 @@ public class ResiGroupController {
 	 * @return Result<GovGroupSummarizeResultDTO>
 	 */
 	@PostMapping("getgovgroupsummarize")
-	public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(GovGroupSummarizeFromDTO formDTO) {
+	public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) {
 		return resiGroupService.getGovGroupSummarize(formDTO);
 	}
 

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

@@ -260,9 +260,10 @@
 	gro.ID AS groupId,
 	gro.GROUP_NAME AS groupName,
 	gro.GROUP_HEAD_PHOTO AS groupHeadPhoto,
+	gro.GROUP_INTRODUCTION AS groupIntroduction,
 	oper.READ_FLAG AS readFlag,
 	oper.MESSAGE_TEXT AS messageText,
-	DATE_FORMAT(oper.CREATED_TIME,'%Y-%d-%m %k:%i') AS createdTime,
+	oper.CREATED_TIME AS createdTime,
 	oper.STATE AS status,
 	oper.OPERATE_REASON rejectReason,
 	gro.CREATED_BY AS leaderId,

epmet-module/resi-mine/resi-mine-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.3
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:0.3.4
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.3</version>
+    <version>0.3.4</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java

@@ -29,7 +29,7 @@ public class ReviewedParyMemberResultDTO {
     /**
      * 申请时间
      */
-    private Date applyTime;
+    private Long applyTime;
 
     /**
      * auto_confirm_failed:自动认证失败,rejected :拒绝

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java

@@ -32,7 +32,7 @@ public class UnderReviewParyMemberResultDTO implements Serializable {
     /**
      * 申请时间
      */
-    private Date applyTime;
+    private Long applyTime;
 
     /**
      * read已读unread未读

epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.7
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.10
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-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.7</version>
+    <version>0.3.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java

@@ -0,0 +1,28 @@
+package com.epmet.constant;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/29 13:41
+ */
+public interface PartyMemberMessageConstant {
+	/**
+	 * 消息标题
+	 */
+	String GROUP_TITLE = "您有一条党员申请消息";
+
+	/**
+	 * 党员提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为党员，请审核。
+	 */
+	String MEMBER_APPLY_MSG = "%s申请成为党员，请审核。";
+
+	/**
+	 * 党员申请审核通过给申请人发送消息：您好，您申请的党员已审核通过，请查看。
+	 */
+	String AUDIT_APPROVE_MSG = "您好，您申请的%s党员已审核通过，请查看。";
+
+	/**
+	 * 党员申请审核驳回给申请人发送消息：您好，您申请的党员，由于不符合条件的原因，已被驳回。
+	 */
+	String AUDIT_REJECT_MSG = "您好，您申请的%s党员，由于不符合条件的原因，已被驳回。";
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -1,12 +1,18 @@
 package com.epmet.modules.partymember.service.impl;
 
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
+import com.epmet.constant.PartyMemberMessageConstant;
+import com.epmet.constant.ReadFlagConstant;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -16,6 +22,8 @@ import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.partymember.entity.*;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
 import com.epmet.modules.partymember.service.*;
+import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant;
+import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
@@ -260,11 +268,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			partymemberConfirmManualService.insert(manualEntity);
 		}
 
-
+		auditMessage(ConvertUtils.sourceToTarget(partyMemberInfo, PartymemberInfoEntity.class), PartyMemberMessageConstant.MEMBER_APPLY_MSG);
 		return new Result();
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) {
 		PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId());
 		PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId());
@@ -289,6 +298,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			//存入党员注册关系表  用于统计客户网格的认证党员数
 			saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity,
 					PartymemberInfoDTO.class));
+			auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_APPROVE_MSG);
+		} else {
+			auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG);
 		}
 
 		return new Result();
@@ -532,4 +544,32 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		return partymemberVisitEntity.getId();
 	}
 
+	/**
+	 * 热心居民申请审核通过向申请人发送消息
+	 * @Author sun
+	 * @param formDTO
+	 * @param userMsg  消息模板
+	 */
+	private Result auditMessage(PartymemberInfoEntity formDTO, String userMsg) {
+		UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
+		userMessageFormDTO.setCustomerId(formDTO.getCustomerId());
+		userMessageFormDTO.setGridId(formDTO.getGridId());
+		userMessageFormDTO.setUserId(formDTO.getUserId());
+		userMessageFormDTO.setApp(AppClientConstant.APP_RESI);
+		userMessageFormDTO.setTitle(PartyMemberMessageConstant.GROUP_TITLE);
+		//调用gov-org服务查询网格信息
+		CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
+		customerGridFormDTO.setGridId(formDTO.getGridId());
+		Result<CustomerGridDTO> result = govOrgFeignClient.getCustomerGridByGridId(customerGridFormDTO);
+		String gridName = null;
+		if (result.success() && null != result.getData()) {
+			gridName = result.getData().getGridName();
+		}
+		String messageContent = String.format(userMsg, gridName);
+		userMessageFormDTO.setMessageContent(messageContent);
+		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+		//保存消息
+		return messageFeignClient.saveUserMessage(userMessageFormDTO);
+	}
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -142,7 +142,8 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 	 */
 	@Override
 	public List<CertifiedResultDTO> certified(CertifiedFormDTO certifiedFormDTO) {
-		certifiedFormDTO.setPageNo(certifiedFormDTO.getPageNo() - NumConstant.ONE);
+		int pageIndex = (certifiedFormDTO.getPageNo() - NumConstant.ONE) * certifiedFormDTO.getPageSize();
+		certifiedFormDTO.setPageNo(pageIndex);
 		List<CertifiedResultDTO> certifiedResultDTOS = partyMemberInfoDao.selectCertifiedList(certifiedFormDTO);
 		if (certifiedResultDTOS.size()==0){
 			return new ArrayList<>();

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@@ -60,7 +60,7 @@
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
-            pi.CREATED_TIME AS applyTime,
+            unix_timestamp(pi.CREATED_TIME) AS applyTime,
             pcm.READ_FLAG AS readFlag,
             pi.id as partyMemberId,
             pca.id as autoId,
@@ -85,7 +85,7 @@
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
-            pi.CREATED_TIME AS applyTime,
+            unix_timestamp(pi.CREATED_TIME) AS applyTime,
             pi.CONFIRM_RESULT AS status,
             pi.id as partyMemberId,
             pca.id as autoId,
@@ -102,7 +102,7 @@
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
-            pi.CREATED_TIME AS applyTime,
+            unix_timestamp(pi.CREATED_TIME) AS applyTime,
             pi.CONFIRM_RESULT AS status,
             pi.id as partyMemberId,
             pca.id as autoId,

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -94,7 +94,7 @@
             organization_type AS extraOrganization,
             extra_certifier_name AS contactPeople,
             extra_certifier_mobile AS contactMobile,
-            CONCAT(street,estate,building) AS address
+            IFNULL(CONCAT(IFNULL(street,null),IFNULL(estate,null),IFNULL(building,null)),'') AS address
         FROM
             partymember_info pi
         WHERE

epmet-user/epmet-user-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.17
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.18
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-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.17</version>
+    <version>0.3.18</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>