Merge branch 'dev_thirdplatform' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java

@@ -23,6 +23,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * ApiService，对接第三方平台的抽象类。每一个子类都对应一个第三方平台，每个第三方平台都实现唯一一个子类
@@ -189,9 +190,9 @@ public abstract class ApiService {
      * @author wxz
      * @date 2021.03.24 15:32
     */
-    protected void addAccessTokenToCache(String platformId, String accessToken) {
+    protected void addAccessTokenToCache(String platformId, String accessToken, long expire, TimeUnit timeUnit) {
         RedisTemplate<String, String> stringRedisTemplate = SpringContextUtils.getBean("redisTemplate", RedisTemplate.class);
-        stringRedisTemplate.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), accessToken);
+        stringRedisTemplate.opsForValue().set(RedisKeys.getThirdPlatformAccessTokenKey(platformId), accessToken, expire, timeUnit);
     }
 
     /**

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 泸州网格化平台ApiService
@@ -64,7 +65,7 @@ public class LuzhouGridPlatformApiService extends ApiService {
             judgeResultSuccess(platformResult);
 
             token = platformResult.getResult();
-            addAccessTokenToCache(platformId, token);
+            addAccessTokenToCache(platformId, token, (long)(3600*1.8*1000), TimeUnit.MILLISECONDS);
         }
         return token;
     }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -14,6 +14,7 @@ import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
+import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
@@ -153,4 +154,15 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<ResiTopicDTO> getTopicById(String topicId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicById", topicId);
     }
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 获取话题附件信息
+     **/
+    @Override
+    public Result<TopicAttachmentResultDTO> topicAttachmentList(TopicAttachmentFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicAttachmentList", formDTO);
+    }
 }