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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
@@ -30,6 +31,9 @@ public class RedisUtils {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
     /**
      * 默认过期时长为24小时，单位：秒
      */
@@ -171,4 +175,39 @@ public class RedisUtils {
         return redisTemplate.opsForList().rightPop(key);
     }
 
+    /**
+     * 获取String
+     * @param key
+     * @param expire
+     * @return
+     */
+    public String getString(String key, long expire) {
+        String value = stringRedisTemplate.opsForValue().get(key);
+        if (expire != NOT_EXPIRE) {
+            expire(key, expire);
+        }
+        return value;
+    }
+
+    public String getString(String key) {
+        return getString(key, DEFAULT_EXPIRE);
+    }
+
+    /**
+     * 存储String
+     * @param key
+     * @param value
+     * @param expire
+     */
+    public void setString(String key, String value, long expire) {
+        stringRedisTemplate.opsForValue().set(key, value);
+        if (expire != NOT_EXPIRE) {
+            expire(key, expire);
+        }
+    }
+
+    public void setString(String key, String value) {
+        setString(key, value, DEFAULT_EXPIRE);
+    }
+
 }

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-access/gov-access-server/src/main/java/com/epmet/redis/RoleOpeScopeRedis.java

@@ -1,5 +1,7 @@
 package com.epmet.redis;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
@@ -36,7 +38,7 @@ public class RoleOpeScopeRedis {
      */
     public void setRoleAllOpeScopes(String roleId, List<RoleOpeScopeResultDTO> scopes) {
         String roleAllOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId);
-        redisUtils.set(roleAllOpeScopesKey, scopes);
+        redisUtils.setString(roleAllOpeScopesKey, JSON.toJSONString(scopes));
     }
 
     /**
@@ -57,8 +59,8 @@ public class RoleOpeScopeRedis {
      */
     public List<RoleOpeScopeResultDTO> getRoleAllOpeScopes(String roleId) {
         String roleOpeScopesKey = RedisKeys.getRoleAllOpeScopesKey(roleId);
-        Object o = redisUtils.get(roleOpeScopesKey);
+        String stringValue = redisUtils.getString(roleOpeScopesKey);
-        return (List<RoleOpeScopeResultDTO>)o;
+        return JSON.parseObject(stringValue, new TypeReference<List<RoleOpeScopeResultDTO>>(){});
     }
 
 }

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

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

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.11
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.14
     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.11</version>
+    <version>0.3.14</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

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
@@ -149,12 +150,19 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 			return new ArrayList<>();
 		}
 		for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) {
-			certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L);
+			certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime());
 		}
 		Result<List<CertifiedResultDTO>> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS);
-		Result<SelectGridNameByGridIdResultDTO> gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO);
+		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId());
+		String gridFullPath = "";
+		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
+			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
+					gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
+					gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
+			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+		}
 		for (CertifiedResultDTO datum : listResult.getData()) {
-			datum.setGridFullPath(gridName.getData().getGridName());
+			datum.setGridFullPath(gridFullPath);
 		}
 		return listResult.getData();
 	}
@@ -172,17 +180,22 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		if (certifiedDetail==null){
 			return new CertifiedDetailResultDTO();
 		}
-		certifiedDetail.setApplyTime(certifiedDetail.getApplyTime() * 1000L);//时间戳转换毫秒级
+		certifiedDetail.setApplyTime(certifiedDetail.getApplyTime());
 		CreatedTimeByUserIdFormDTO time = new CreatedTimeByUserIdFormDTO();
 		time.setUserId(certifiedDetail.getUserId());
 		//查询用户注册时间
 		Result<CreatedTimeByUserIdResultDTO> registerTime = epmetUserFeignClient.createdTimeByUserId(time);
 		certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime());
-		CertifiedFormDTO certifiedFormDTO = new CertifiedFormDTO();
+		//查询gridFullName
-		certifiedFormDTO.setGridId(certifiedDetail.getGridId());
+		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedDetail.getGridId());
-		//查询网格名称
+		String gridFullPath = "";
-		Result<SelectGridNameByGridIdResultDTO> gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO);
+		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
-		certifiedDetail.setGridFullPath(gridName.getData().getGridName());
+			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
+					gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
+					gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
+			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+		}
+		certifiedDetail.setGridFullPath(gridFullPath);
 		return certifiedDetail;
 	}
 

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,
-            unix_timestamp(pi.CREATED_TIME)*1000 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,
-            unix_timestamp(pi.CREATED_TIME)*1000 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,
-            unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime,
+            unix_timestamp(pi.CREATED_TIME) AS applyTime,
             pi.CONFIRM_RESULT AS status,
             pi.id as partyMemberId,
             pca.id as autoId,

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.21
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.22
     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.21</version>
+    <version>0.3.22</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;
     }
 }