分类删除

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

@@ -144,7 +144,9 @@ public enum EpmetErrorCode {
 	TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核"),
     TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"),
     TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
-    TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题");
+    TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"),
+
+    CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除");
 
 	private int code;
 	private String msg;

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java

@@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CategoryTagInitFormDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -160,12 +161,14 @@ public class IssueProjectCategoryDictController {
     /**
      * @param formDTO
      * @return
-     * @Description 分类删除
+     * @Description 分类删除【存在客户在使用时不允许删除】
      * @Author sun
      **/
     @PostMapping("delcategory")
-    public Result<ProjectIssueCategoryResultDTO> delCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
+    public Result delCategory(@RequestBody DelCategoryFormDTO formDTO) {
-        return new Result<ProjectIssueCategoryResultDTO>().ok(issueProjectCategoryDictService.delCategory(formDTO));
+        ValidatorUtils.validateEntity(formDTO, DelCategoryFormDTO.DelCategory.class);
+        issueProjectCategoryDictService.delCategory(formDTO);
+        return new Result();
     }
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.result.IssueCategoryTagResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
@@ -65,4 +66,10 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Author sun
      **/
     void delByIssueId(@Param("issueId") String issueId);
+
+    /**
+     * @Description 查询客户分类有没有被议题使用
+     * @Author sun
+     **/
+    List<IssueCategoryDTO> selectIssueList(DelCategoryFormDTO formDTO);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
@@ -87,4 +88,18 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Date 14:10 2021-03-22
      **/
     List<ProjectCategoryDictResultDTO> selectListCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+
+    /**
+     * 查询客户某个分类信息
+     * @author sun
+     */
+    IssueProjectCategoryDictDTO selectByCustomerId(@Param("customerId") String customerId, @Param("categoryId") String categoryId);
+
+    /**
+     * 删除一级或二级分类，二级分类下默认有的标签不作处理
+     * @author sun
+     */
+    int delCategory(DelCategoryFormDTO formDTO);
+
+
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CategoryTagInitFormDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -142,7 +143,7 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
      * @Description 分类删除
      * @Author sun
      **/
-    ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO);
+    void delCategory(DelCategoryFormDTO formDTO);
 
     /**
      * 获取客户 分类字典 信息

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

@@ -21,29 +21,35 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.IssueCategoryDao;
 import com.epmet.dao.IssueProjectCategoryDictDao;
 import com.epmet.dao.IssueProjectRelationDao;
+import com.epmet.dto.IssueCategoryDTO;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
-import com.epmet.dto.form.CategoryTagInitFormDTO;
+import com.epmet.dto.ProjectCategoryDTO;
-import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
-import com.epmet.dto.form.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectCategoryDTOResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
 import com.epmet.dto.result.ProjectIssueDTOResultDTO;
 import com.epmet.entity.IssueProjectCategoryDictEntity;
 import com.epmet.entity.IssueProjectTagDictEntity;
+import com.epmet.feign.GovProjectOpenFeignClient;
 import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import com.epmet.redis.IssueProjectCategoryDictRedis;
 import com.epmet.service.IssueProjectCategoryDictService;
 import com.epmet.service.IssueProjectTagDictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +68,7 @@ import java.util.stream.Collectors;
 @Service
 public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssueProjectCategoryDictDao, IssueProjectCategoryDictEntity> implements IssueProjectCategoryDictService {
 
+    private static Logger logger = LoggerFactory.getLogger(IssueProjectCategoryDictServiceImpl.class);
     @Autowired
     private IssueProjectCategoryDictRedis issueProjectCategoryDictRedis;
     @Autowired
@@ -69,6 +76,11 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     @Autowired
     private IssueProjectTagDictService issueProjectTagDictService;
 
+    @Autowired
+    private IssueCategoryDao issueCategoryDao;
+    @Autowired
+    private GovProjectOpenFeignClient govProjectOpenFeignClient;
+
     @Override
     public PageData<IssueProjectCategoryDictDTO> page(Map<String, Object> params) {
         IPage<IssueProjectCategoryDictEntity> page = baseDao.selectPage(
@@ -215,11 +227,39 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
 
     /**
      * @Description 分类删除
+     * 分类客户没有使用过的可以直接删除 包括子类删除，只要客户用过 不管什么状态都不能再删除，允许删除的也跟标签没关系，不删标签
      * @Author sun
      **/
     @Override
-    public ProjectIssueCategoryResultDTO delCategory(ProjectSaveCategoryFormDTO formDTO) {
+    public void delCategory(DelCategoryFormDTO formDTO) {
-        return null;
+        //1.查询分类信息
+        IssueProjectCategoryDictDTO dto = baseDao.selectByCustomerId(formDTO.getCustomerId(), formDTO.getCategoryId());
+        if (null == dto) {
+            throw new RuntimeException("未查询到客户分类信息！");
+        }
+        //2.判断分类有没有被客户的议题、项目使用过
+        formDTO.setLevel(dto.getCategoryType());
+        //2-1.判断议题有无使用
+        List<IssueCategoryDTO> issueList = issueCategoryDao.selectIssueList(formDTO);
+        //已使用，不允许删除
+        if (null != issueList || issueList.size() > NumConstant.ZERO) {
+            throw new RenException(EpmetErrorCode.CUSTOMER_CATEGORY.getCode(), EpmetErrorCode.CUSTOMER_CATEGORY.getMsg());
+        }
+        //2-2.判断项目有无使用
+        Result<List<ProjectCategoryDTO>> resultList = govProjectOpenFeignClient.getProjectCategoryList(formDTO);
+        if (!resultList.success()) {
+            throw new RenException(resultList.getCode(), resultList.getMsg());
+        }
+        if (null != resultList.getData() || resultList.getData().size() > NumConstant.ZERO) {
+            throw new RenException(EpmetErrorCode.CUSTOMER_CATEGORY.getCode(), EpmetErrorCode.CUSTOMER_CATEGORY.getMsg());
+        }
+
+        //3.分类未被使用，则删除一级、二级分类，二级分类下默认有的标签不作处理
+        if (baseDao.delCategory(formDTO) < NumConstant.ONE) {
+            logger.error(String.format("分类删除失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
+            throw new RuntimeException("分类删除失败！");
+        }
+
     }
 
     @Override

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml

@@ -57,6 +57,20 @@
         AND ISSUE_ID = #{issueId}
     </select>
 
+    <select id="selectIssueList" resultType="com.epmet.dto.IssueCategoryDTO">
+        SELECT
+           *
+        FROM issue_category
+        WHERE del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="level != null and '' != level and '1' == level ">
+            AND category_pids = #{categoryId}
+        </if>
+        <if test="level != null and '' != level and '2' == level ">
+            AND category_id = #{categoryId}
+        </if>
+    </select>
+
     <delete id="delByIssueId">
         DELETE
         FROM

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -113,4 +113,29 @@
             AND d.PID != '0'
         </if>
     </select>
+
+    <select id="selectByCustomerId" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
+        SELECT
+            *
+        FROM
+            issue_project_category_dict
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND id = #{categoryId}
+    </select>
+
+    <update id="delCategory">
+        UPDATE issue_project_category_dict
+        SET DEL_FLAG = '1'
+        WHERE
+        CUSTOMER_ID = #{customerId}
+        <if test="level != null and '' != level and '1' == level ">
+            AND id = #{categoryId}
+        </if>
+        <if test="level != null and '' != level and '2' == level ">
+            AND pid = #{categoryId}
+        </if>
+    </update>
+
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/DelCategoryFormDTO.java

@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分类删除-接口入参
+ * @Author sun
+ */
+@Data
+public class DelCategoryFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2599592072265715951L;
+    public interface DelCategory{}
+
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "客户ID不能为空",groups = {DelCategory.class})
+    private String customerId;
+    /**
+     * 分类Id
+     */
+    @NotBlank(message = "分类ID不能为空",groups = {DelCategory.class})
+    private String categoryId;
+    /**
+     * 分类级别 1:一类  2:二类
+     */
+    private String level;
+
+
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -2,7 +2,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
@@ -77,4 +79,11 @@ public interface GovProjectOpenFeignClient {
 
 	@GetMapping("gov/project/project/queryprojectinfobyprojectid/{projectId}")
 	Result<ProjectInfoDTO> queryProjectInfoByProjectId(@PathVariable("projectId")String projectId);
+
+	/**
+	 * @Description 判断分类有没有被项目使用
+	 * @Author sun
+	 **/
+	@PostMapping("gov/project/projectcategory/getprojectcategorylist")
+	Result<List<ProjectCategoryDTO>> getProjectCategoryList(@RequestBody DelCategoryFormDTO formDTO);
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -3,7 +3,9 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.ProjectDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.ProjectByCreateTopicUserFormDTO;
 import com.epmet.dto.form.ProjectListFromDTO;
@@ -71,4 +73,9 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli
 	public Result<ProjectInfoDTO> queryProjectInfoByProjectId(String projectId) {
 		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "queryProjectInfoByProjectId", projectId);
 	}
+
+	@Override
+	public Result<List<ProjectCategoryDTO>> getProjectCategoryList(DelCategoryFormDTO formDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getProjectCategoryList", formDTO);
+	}
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
@@ -125,4 +126,14 @@ public class ProjectCategoryController {
         return new Result();
     }
 
+    /**
+     * @param formDTO
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    @PostMapping("getprojectcategorylist")
+    public Result<List<ProjectCategoryDTO>> getProjectCategoryList(@RequestBody DelCategoryFormDTO formDTO) {
+        return new Result<List<ProjectCategoryDTO>>().ok(projectCategoryService.getProjectCategoryList(formDTO));
+    }
+
 }

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

@@ -18,6 +18,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -44,4 +46,10 @@ public interface ProjectCategoryDao extends BaseDao<ProjectCategoryEntity> {
      * @Author sun
      **/
     void delByProjectId(@Param("projectId") String projectId);
+
+    /**
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    List<ProjectCategoryDTO> selectProjectCategoryList(DelCategoryFormDTO formDTO);
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
@@ -111,4 +112,11 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @Author sun
      **/
     void saveCategory(ProjectSaveCategoryFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    List<ProjectCategoryDTO> getProjectCategoryList(DelCategoryFormDTO formDTO);
 }

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

@@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.ProjectCategoryDao;
 import com.epmet.dao.ProjectTagsDao;
 import com.epmet.dto.ProjectCategoryDTO;
+import com.epmet.dto.form.DelCategoryFormDTO;
 import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.*;
@@ -192,4 +193,14 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
 
     }
 
+    /**
+     * @param formDTO
+     * @Description 判断分类有没有被项目使用
+     * @Author sun
+     **/
+    @Override
+    public List<ProjectCategoryDTO> getProjectCategoryList(DelCategoryFormDTO formDTO) {
+        return baseDao.selectProjectCategoryList(formDTO);
+    }
+
 }

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

@@ -13,6 +13,20 @@
         AND project_id = #{projectId}
     </select>
 
+    <select id="selectProjectCategoryList" resultType="com.epmet.dto.ProjectCategoryDTO">
+        SELECT
+        *
+        FROM project_category
+        WHERE del_flag = '0'
+        AND customer_id = #{customerId}
+        <if test="level != null and '' != level and '1' == level ">
+            AND category_pids = #{categoryId}
+        </if>
+        <if test="level != null and '' != level and '2' == level ">
+            AND category_id = #{categoryId}
+        </if>
+    </select>
+
     <delete id="delByProjectId">
         DELETE
         FROM