代码调整

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@@ -149,14 +149,14 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         if (null == dto) {
             throw new RenException(String.format("保存项目分类信息，获取项目对应的议题基本信息失败，projectId->%s", formDTO.getProjectId()));
         }
-        resultDTO.setIssueDTO(dto);
+        //resultDTO.setIssueDTO(dto);
         //2.批量查询分类信息
         List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
         List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(categoryIdList);
         if (null == categoryList) {
             throw new RenException(String.format("保存项目分类信息，根据分类Id获取分类信息失败"));
         }
-        resultDTO.setCategoryList(categoryList);
+       // resultDTO.setCategoryList(categoryList);
 
         return resultDTO;
     }

epmet-module/gov-project/gov-project-client/pom.xml

@@ -23,11 +23,5 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>gov-issue-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectIssueCategoryResultDTO.java

@@ -1,11 +1,8 @@
 package com.epmet.dto.result;
 
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @dscription 项目所属网格、分类基本信息-接口返参
@@ -18,10 +15,10 @@ public class ProjectIssueCategoryResultDTO implements Serializable {
 	/**
 	 * 项目Id
 	 */
-	private IssueDTO issueDTO;
-	/**
+	/*private IssueDTO issueDTO;
+	*//**
 	 * 项目标题
-	 */
-	private List<IssueProjectCategoryDictDTO> categoryList;
+	 *//*
+	private List<IssueProjectCategoryDictDTO> categoryList;*/
 
 }

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

@@ -28,14 +28,11 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectCategoryDao;
 import com.epmet.dao.ProjectTagsDao;
-import com.epmet.dto.IssueDTO;
-import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
-import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.redis.ProjectCategoryRedis;
@@ -45,7 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -155,7 +151,7 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
     public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {
 
         //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
-        Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
+        /*Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
         if (!result.success()) {
             throw new RenException(String.format("保存项目分类，获取项目对应的议题信息以及分类信息失败，projiectId->%s", formDTO.getProjectId()));
         }
@@ -184,7 +180,7 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         //4.批量保存议题分类信息
         if (!insertBatch(entityList)) {
             throw new RenException(String.format("项目分类信息保存失败"));
-        }
+        }*/
 
     }