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

epmet-auth/docker-compose.yml

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

epmet-auth/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>epmet-cloud</artifactId>

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

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -248,7 +249,7 @@ public class LoginServiceImpl implements LoginService {
 		//1、验证码是否正确
 		boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
 		if (!flag) {
-			return new Result<UserTokenResultDTO>().error(ErrorCode.CAPTCHA_ERROR);
+			return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
 		}
 		//2、账号是否存在
 		//获取用户信息

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -9,6 +9,7 @@ public enum EpmetErrorCode {
 	ERR10005(10005, "token不能为空"),
 	ERR10006(10006, "登录超时，请重新登录"),
 	ERR10007(10007, "当前帐号已在别处登录"),
+	ERR10019(10019, "验证码不正确"),
 	ERR401(401, "未授权"),
 	VALIDATE_ERROR(7000, "数据校验异常"),
 	SERVER_ERROR(8000, "服务器开小差了..."),

epmet-gateway/docker-compose.yml

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

epmet-gateway/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.5</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@@ -100,6 +100,10 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 					// 政府端
 					GovTokenDto govTokenDto = getLoginUserInfoByToken(token, jwtTokenUtils, cpUserDetailRedis, GovTokenDto.class);
 					validateTokenDto(govTokenDto, token);
+				} else if(AppClientConstant.APP_OPER.equals(baseTokenDto.getApp())){
+					//运营端
+					TokenDto resiTokenDto = getLoginUserInfoByToken(token, jwtTokenUtils, cpUserDetailRedis, TokenDto.class);
+					validateTokenDto(resiTokenDto, token);
 				}
 
 				//当前登录用户userId，添加到header中

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.7
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.8
     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.7</version>
+    <version>0.3.8</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

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

@@ -52,7 +52,7 @@ public class CertifiedDetailResultDTO implements Serializable {
     /**
      * 注册时间（进入本平台的时间）
      */
-    private Long certifyTime;
+    private Long registerTime;
 
     /**
      * 工作单位/所处街道

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.12
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.13
     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.12</version>
+    <version>0.3.13</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>

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.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.30
     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.29</version>
+    <version>0.3.30</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

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

@@ -51,6 +51,12 @@
         <foreach item="id" collection="listStr" open="(" separator="," close=")" index="">
             #{id}
         </foreach>
+        ORDER BY field(
+            id,
+        <foreach item="id" collection="listStr" separator=",">
+            #{id}
+        </foreach>
+        )<!-- 按照foreach中遍历的Id顺序排序(按组织机构自上而下排序) -->
     </select>
 
     <select id="selectSubAgencyById" resultType="com.epmet.dto.result.SubListResultDTO">

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java

@@ -16,19 +16,16 @@ public class CustomerHomeFormDTO implements Serializable {
 	/**
 	 * 客户ID
 	 */
-	@NotBlank(message = "客户ID不能为空")
 	private String customerId;
 
 	/**
 	 * 所属端类型0.居民端，1.政府端
 	 */
-	@NotBlank(message = "所属端类型不能为空（0居民端1政府端）")
 	private String clientType;
 
 	/**
 	 * 状态：0.已发布 1.草稿
 	 */
-	@NotBlank(message = "状态（0已发布1草稿）")
 	private String status;
 
 }

epmet-module/oper-customize/oper-customize-server/docker-compose.yml

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

epmet-module/oper-customize/oper-customize-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.6</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java

@@ -53,6 +53,7 @@ public class HomeServiceImpl implements HomeService {
 	public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) {
 		HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
 		//根据客户id,所属端获取客户首页配置的设计稿
+		formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT);
 		List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO);
 		List<CommonComponentDesignResultDTO> titleList = new ArrayList<>();
 		List<CommonComponentDesignResultDTO> topList = new ArrayList<>();
@@ -118,7 +119,7 @@ public class HomeServiceImpl implements HomeService {
 		customerHomeDetailDao.deleteCustomerHomeDetailByHomeId(customerHomeEntity.getId());
 
 		List<CustomerHomeDetailEntity> list = ConvertUtils.sourceToTarget(formDTO.getComponentList(), CustomerHomeDetailEntity.class);
-
+		list.forEach(homeDetail -> homeDetail.setHomeId(customerHomeEntity.getId()));
 		//将数据存入客户首页详情表
 		customerHomeDetailService.insertBatch(list);
 

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.15
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:0.3.16
     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.15</version>
+    <version>0.3.16</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java

@@ -34,12 +34,12 @@ public interface UserMessageConstant {
     /**
      * 建组审核驳回时消息模板
      * */
-    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s小组，由于不符合%s条件的原因，已被驳回。";
+    String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已被驳回，原因：%s。";
 
     /**
      * 建组审核同意时消息模板
      * */
-    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s小组，已审核通过。";
+    String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已审核通过。";
 
     /**
      * 审核建组申请消息名称

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

@@ -57,7 +57,7 @@ public class CertifiedDetailResultDTO implements Serializable {
     /**
      * 注册时间（进入本平台的时间）
      */
-    private Long certifyTime;
+    private Long registerTime;
 
     /**
      * 工作单位/所处街道

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.14
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.17
     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.14</version>
+    <version>0.3.17</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

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

@@ -185,7 +185,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		time.setUserId(certifiedDetail.getUserId());
 		//查询用户注册时间
 		Result<CreatedTimeByUserIdResultDTO> registerTime = epmetUserFeignClient.createdTimeByUserId(time);
-		certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime());
+		certifiedDetail.setRegisterTime(registerTime.getData().getRegisterTime());
 		//查询gridFullName
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedDetail.getGridId());
 		String gridFullPath = "";

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java

@@ -22,8 +22,8 @@ public interface ResiWarmUserMessageConstant {
     String AUDIT_APPROVE_MSG = "您好，您申请的%s热心居民已审核通过，请查看。";
 
     /**
-     * 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，由于不符合条件的原因，已被驳回。
+     * 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，已被驳回，原因：不符合要求。
      */
-    String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，由于不符合条件的原因，已被驳回。";
+    String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，已被驳回，原因：%s";
 
 }

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

@@ -419,7 +419,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		if (result.success() && null != result.getData()) {
 			gridName = result.getData().getGridName();
 		}
-		String messageContent = String.format(userMsg, gridName);
+		String messageContent = String.format(userMsg, gridName,formDTO.getRefuseReason());
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
 		//保存消息

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

@@ -91,7 +91,7 @@
                 WHEN ( pi.confirm_result = 'approved' ) THEN 'manual'
             END AS certifyType,
             UNIX_TIMESTAMP(pi.created_time) AS applyTime,
-            organization_type AS extraOrganization,
+            IFNULL(extra_organization,'') AS extraOrganization,
             extra_certifier_name AS contactPeople,
             extra_certifier_mobile AS contactMobile,
             IFNULL(CONCAT(IFNULL(street,null),IFNULL(estate,null),IFNULL(building,null)),'') AS address

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.22
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.24
     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.22</version>
+    <version>0.3.24</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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

@@ -122,7 +122,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO) {
         CreatedTimeByUserIdResultDTO registerTime = baseDao.createdTimeByUserId(formDTO);
-        registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L);
+//        registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L);
         return registerTime;
     }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -90,7 +90,7 @@
                 WHERE
                     ROLE_KEY IN
                         <foreach item="roleKey" collection="roleKeys" open="(" separator="," close=")">
-                        #{rolekey}
+                        #{roleKey}
                         </foreach>
                     AND DEL_FLAG = '0' )
             AND staffrole.STAFF_ID IN