Merge branch 'dev_thirdplatform' into dev_temp

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSubProcessDao.java

@@ -52,12 +52,12 @@ public interface ProjectSubProcessDao extends BaseDao<ProjectSubProcessEntity> {
     List<SubProcessDTO> selectSubProcessAndAttachment(@Param("processIds")List<String> processIds);
 
     /**
-     * 根据platformId查找最新的记录
+     * 根据taskId查找最新的记录
      * @author zhaoqifeng
      * @date 2021/3/19 15:26
-     * @param platformId
+     * @param taskId
      * @return com.epmet.dto.ProjectSubProcessDTO
      */
-    ProjectSubProcessDTO selectSubProcessByPlatformId(@Param("platformId") String platformId);
+    ProjectSubProcessDTO selectSubProcessByTaskId(@Param("taskId") String taskId);
 
 }

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

@@ -115,8 +115,8 @@ public interface ProjectSubProcessService extends BaseService<ProjectSubProcessE
      *
      * @author zhaoqifeng
      * @date 2021/3/19 15:24
-     * @param platformId
+     * @param taskId
      * @return com.epmet.dto.ProjectSubProcessDTO
      */
-    ProjectSubProcessDTO getSubProcessByPlatformId(String platformId);
+    ProjectSubProcessDTO getSubProcessByTaskId(String taskId);
 }

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

@@ -56,6 +56,7 @@ import com.google.gson.GsonBuilder;
 import org.apache.commons.collections4.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -2254,7 +2255,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (String url : issueDetail.getData().getTopicInfo().getPhotoList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(url, UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(url, "image." + FilenameUtils.getExtension(url));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2274,7 +2275,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (TopicFileResultDTO item : topicAttachment.getData().getVoiceList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), "voice." + FilenameUtils.getExtension(item.getUrl()));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2293,7 +2294,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (TopicFileResultDTO item : topicAttachment.getData().getVideoList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), "video." + FilenameUtils.getExtension(item.getUrl()));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2312,7 +2313,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			List<String> files = new ArrayList<>();
 			for (TopicFileResultDTO item : topicAttachment.getData().getDocList()) {
 				Result<MultipartFile> multipartFileResult =
-						HttpClientManager.getInstance().getFileItem(item.getUrl(), UUID.randomUUID().toString().replace("-", ""));
+						HttpClientManager.getInstance().getFileItem(item.getUrl(), "doc." + FilenameUtils.getExtension(item.getUrl()));
 				if (!multipartFileResult.success()) {
 					throw new RenException(multipartFileResult.getCode(), multipartFileResult.getMsg());
 				}
@@ -2402,7 +2403,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
 	@Override
 	public void platformCallBack(PlatformCallBackFormDTO formDTO) {
-		ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.getSubProcessByPlatformId(formDTO.getEventId());
+		ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.getSubProcessByTaskId(formDTO.getEventId());
 		projectSubProcessDTO.setExternalStatus(formDTO.getStatus());
 		projectSubProcessDTO.setResult(formDTO.getNote());
 		projectSubProcessDTO.setHandleDate(DateUtils.stringToDate(formDTO.getHandleDate(), DateUtils.DATE_TIME_PATTERN));
@@ -2504,4 +2505,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return gson.toJson(object);
 	}
 
+	private String getFileName(String url) {
+		return UUID.randomUUID().toString().replace("-", "") + "." + FilenameUtils.getExtension(url);
+	}
+
 }

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

@@ -132,14 +132,14 @@ public class ProjectSubProcessServiceImpl extends BaseServiceImpl<ProjectSubProc
     /**
      * 根据platformId查找最新的记录
      *
-     * @param platformId
+     * @param taskId
      * @return com.epmet.dto.ProjectSubProcessDTO
      * @author zhaoqifeng
      * @date 2021/3/19 15:24
      */
     @Override
-    public ProjectSubProcessDTO getSubProcessByPlatformId(String platformId) {
-        return baseDao.selectSubProcessByPlatformId(platformId);
+    public ProjectSubProcessDTO getSubProcessByTaskId(String taskId) {
+        return baseDao.selectSubProcessByTaskId(taskId);
     }
 
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml

@@ -84,7 +84,7 @@
           AND psa.SUB_ID = #{subId}
         order by psa.sort
     </select>
-    <select id="selectSubProcessByPlatformId" resultType="com.epmet.dto.ProjectSubProcessDTO">
+    <select id="selectSubProcessByTaskId" resultType="com.epmet.dto.ProjectSubProcessDTO">
         select
             ID,
             CUSTOMER_ID,
@@ -103,7 +103,7 @@
         from project_sub_process
         where
               DEL_FLAG = '0'
-            AND PLATFORM_ID = #{platformId}
+            AND TASK_ID = #{taskId}
         order by CREATED_TIME DESC limit 1
 
     </select>