删除事件（删除议题、议题分类、议题标签、删除项目、项目分类）

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/DelIssueFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/12 11:00
+ */
+@Data
+public class DelIssueFormDTO {
+    @NotBlank(message = "customerId不能为空")
+    private String customerId;
+    @NotBlank(message = "userId不能为空")
+    private String userId;
+    @Valid
+    @NotEmpty(message = "issueIds不能为空")
+    private List<String> issueIds;
+}
+

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -423,4 +423,13 @@ public interface GovIssueOpenFeignClient {
 	 */
 	@PostMapping("/gov/issue/issueprocess/issueprocess")
 	Result<IssueAdvanceResDTO> queryIssueProcess(@RequestBody IssueIdFormDTO formDTO);
+
+	/**
+	 * 删除事件时，事件转了议题，调用此方法，删除议题
+	 * 批量删除议题（议题如果转了项目，此方法不删除项目！）
+	 * @param delIssueFormDTO
+	 * @return 删除的议题中，转为了项目，返回议题id，上层再单独去删除项目
+	 */
+	@PostMapping("/gov/issue/issue/deleteIssueInternal")
+	Result<List<String>> deleteIssueInternal(@RequestBody DelIssueFormDTO delIssueFormDTO);
 }

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -365,4 +365,15 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
 		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "queryIssueProcess", formDTO);
 	}
 
+	/**
+	 * 删除事件时，事件转了议题，调用此方法，删除议题
+	 * 批量删除议题（议题如果转了项目，此方法不删除项目！）
+	 *
+	 * @param delIssueFormDTO
+	 * @return 删除的议题中，转为了项目，返回项目id，上层再单独去删除项目
+	 */
+	@Override
+	public Result<List<String>> deleteIssueInternal(DelIssueFormDTO delIssueFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "deleteIssueInternal", delIssueFormDTO);
+	}
 }

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

@@ -403,5 +403,17 @@ public class IssueController {
         ValidatorUtils.validateEntity(issueFormDTO, PublishIssueFormDTO.AddUserShowGroup.class);
         return new Result<IssueDTO>().ok(issueService.publishIssue(issueFormDTO));
     }
+
+    /**
+     * 删除事件时，事件转了议题，调用此方法，删除议题
+     * 批量删除议题（议题如果转了项目，此方法不删除项目！）
+     * @param delIssueFormDTO
+     * @return 删除的议题中，转为了项目，返回项目id，上层再单独去删除项目
+     */
+    @PostMapping("deleteIssueInternal")
+    public Result<List<String>> deleteIssueInternal(@RequestBody DelIssueFormDTO delIssueFormDTO){
+        ValidatorUtils.validateEntity(delIssueFormDTO);
+        return new Result<List<String>>().ok(issueService.deleteIssueInternal(delIssueFormDTO));
+    }
 }
 

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

@@ -27,6 +27,7 @@ import com.epmet.dto.result.IssueCategoryTagListResultDTO;
 import com.epmet.dto.result.ProjectCategoryTagResultDTO;
 import com.epmet.entity.IssueCategoryEntity;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -132,4 +133,5 @@ public interface IssueCategoryService extends BaseService<IssueCategoryEntity> {
      **/
     void saveCategory(IssueSaveCategoryFormDTO formDTO);
 
+    void delByIssueId(String issueId, String userId, Date delTime);
 }

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

@@ -13,7 +13,6 @@ import com.epmet.resi.group.dto.group.result.GroupClosedListResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupShiftProjectListResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupVotingListResultDTO;
 import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
-import com.github.pagehelper.Page;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -419,4 +418,12 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @return
      */
     IssueDTO publishIssue(PublishIssueFormDTO issueFormDTO);
+
+    /**
+     * 删除事件时，事件转了议题，调用此方法，删除议题
+     * 批量删除议题（议题如果转了项目，此方法不删除项目！）
+     * @param delIssueFormDTO
+     * @return 删除的议题中，转为了项目，返回议题id，上层再单独去删除项目
+     */
+    List<String> deleteIssueInternal(DelIssueFormDTO delIssueFormDTO);
 }

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

@@ -26,6 +26,7 @@ import com.epmet.dto.form.IssueTagsSaveFormDTO;
 import com.epmet.dto.result.AddTagResultDTO;
 import com.epmet.entity.IssueTagsEntity;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -122,4 +123,6 @@ public interface IssueTagsService extends BaseService<IssueTagsEntity> {
      * @date 2020/12/10 上午9:37
      */
     void issueTagSave(IssueTagsSaveFormDTO form, TokenDto tokenDto);
+
+    void delByIssueId(String issueId, String userId, Date delTime);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -44,10 +45,7 @@ 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.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -224,4 +222,13 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
 
     }
 
+    @Override
+    public void delByIssueId(String issueId, String userId, Date delTime) {
+        LambdaUpdateWrapper<IssueCategoryEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(IssueCategoryEntity::getIssueId, issueId)
+                .set(IssueCategoryEntity::getUpdatedTime, delTime)
+                .set(IssueCategoryEntity::getUpdatedBy, userId)
+                .set(IssueCategoryEntity::getDelFlag, NumConstant.ONE_STR);
+        baseDao.update(null, wrapper);
+    }
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.client.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -2155,4 +2156,39 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         issueDTO.setIssueId(issueEntity.getId());
         return issueDTO;
     }
+
+    /**
+     * 删除事件时，事件转了议题，调用此方法，删除议题
+     * 批量删除议题（议题如果转了项目，此方法不删除项目！）
+     * 删除issue、issue_category、issue_tags
+     * @param delIssueFormDTO
+     * @return 删除的议题中，转为了项目，返回议题id，上层再单独去删除项目
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public List<String> deleteIssueInternal(DelIssueFormDTO delIssueFormDTO) {
+        List<String> shiftProjectIssueIds = new ArrayList<>();
+        Date nowTime = new Date();
+        for (String issueId : delIssueFormDTO.getIssueIds()) {
+            IssueEntity issueEntity = baseDao.selectById(issueId);
+            if (null == issueEntity) {
+                continue;
+            }
+            // 删除议题主表
+            LambdaUpdateWrapper<IssueEntity> wrapper = new LambdaUpdateWrapper();
+            wrapper.eq(IssueEntity::getId, issueId)
+                    .set(IssueEntity::getUpdatedTime, nowTime)
+                    .set(IssueEntity::getUpdatedBy, delIssueFormDTO.getUserId())
+                    .set(IssueEntity::getDelFlag, NumConstant.ONE_STR);
+            baseDao.update(null, wrapper);
+            // 删除议题分类关系表
+            issueCategoryService.delByIssueId(issueId, delIssueFormDTO.getUserId(), nowTime);
+            // 删除议题标签关系表
+            issueTagsService.delByIssueId(issueId, delIssueFormDTO.getUserId(), nowTime);
+            if ("shift_project".equals(issueEntity.getIssueStatus())) {
+                shiftProjectIssueIds.add(issueEntity.getId());
+            }
+        }
+        return shiftProjectIssueIds;
+    }
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -49,6 +50,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -244,4 +246,13 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         }
     }
 
+    @Override
+    public void delByIssueId(String issueId, String userId, Date delTime) {
+        LambdaUpdateWrapper<IssueTagsEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(IssueTagsEntity::getIssueId, issueId)
+                .set(IssueTagsEntity::getUpdatedTime, delTime)
+                .set(IssueTagsEntity::getUpdatedBy, userId)
+                .set(IssueTagsEntity::getDelFlag, NumConstant.ONE_STR);
+        baseDao.update(null, wrapper);
+    }
 }

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

@@ -26,6 +26,7 @@ import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.ProjectCategoryTagListResultDTO;
 import com.epmet.entity.ProjectCategoryEntity;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -136,4 +137,13 @@ public interface ProjectCategoryService extends BaseService<ProjectCategoryEntit
      * @Date 2022/1/5 9:50
      */
     Map<String, Set<String>> getProjectCategoryMap(List<String> projectIds);
+
+    /**
+     * 根据项目id,删除项目分类，记录删除人、删除时间
+     * @param projectId
+     * @param userId
+     * @param delTime
+     * @return
+     */
+    int delByProjectId(String projectId, String userId, Date delTime);
 }

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

@@ -399,11 +399,10 @@ public interface ProjectService extends BaseService<ProjectEntity> {
     PageData<OrgProjectListResultDTO> orgProjectList(OrgProjectListFormDTO formDTO);
 
 	/**
-	 * desc:根据来源id和类型 删除项目 （只删了主表）
+	 * desc:根据来源id和类型 删除项目 （只删了主表、项目分类表）
 	 * @param originId
 	 * @param origin
 	 * @return
 	 */
 	Integer deleteByOriginId(String originId, String origin);
-
 }

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

@@ -471,8 +471,16 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 Result<Integer> effectRow = epmetHeartOpenFeignClient.deleteUserDemandByOriginId(entity.getId(), ProjectOriginEnum.IC_EVENT.getCode());
                 // log.info("delete userDemand result:{},eventId:{}", effectRow, id);
             } else if(NumConstant.THREE_STR.equals(entity.getOperationType())){
-                // 删除议题
+                DelIssueFormDTO delIssueFormDTO = new DelIssueFormDTO();
-                // todo
+                delIssueFormDTO.setCustomerId(delIssueFormDTO.getCustomerId());
+                delIssueFormDTO.setUserId(loginUserUtil.getLoginUserId());
+                delIssueFormDTO.setIssueIds(Arrays.asList(entity.getOperationId()));
+                // 删除议题, 议题转了项目的，再单独去删除项目
+                Result<List<String>> delIssueRes = govIssueOpenFeignClient.deleteIssueInternal(delIssueFormDTO);
+                if(delIssueRes.success()&&!CollectionUtils.isEmpty(delIssueRes.getData())){
+                    // 议题被转了项目，需要删除项目
+                    SpringContextUtils.getBean(ProjectService.class).deleteByOriginId(delIssueRes.getData().get(0), ProjectOriginEnum.ISSUE.getCode());
+                }
             }
             LambdaUpdateWrapper<IcEventEntity> wrapper = new LambdaUpdateWrapper();
             wrapper.eq(IcEventEntity::getId,id).set(IcEventEntity::getUpdatedTime,new Date())

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

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -244,4 +245,20 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
         return list.stream().collect(Collectors.groupingBy(ProjectCategoryEntity::getProjectId, Collectors.mapping(ProjectCategoryEntity::getCategoryCode, Collectors.toSet())));
     }
 
+    /**
+     * 根据项目id,删除项目分类，记录删除人、删除时间
+     * @param projectId
+     * @param userId
+     * @param delTime
+     * @return
+     */
+    @Override
+    public int delByProjectId(String projectId,String userId,Date delTime) {
+        LambdaUpdateWrapper<ProjectCategoryEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(ProjectCategoryEntity::getProjectId, projectId)
+                .set(ProjectCategoryEntity::getUpdatedTime,delTime)
+                .set(ProjectCategoryEntity::getUpdatedBy,userId)
+                .set(ProjectCategoryEntity::getDelFlag,NumConstant.ONE_STR);
+        return baseDao.update(null, wrapper);
+    }
 }

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

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -3615,16 +3616,31 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return new PageData<>(list, pageInfo.getTotal());
 	}
 
+	/**
+	 * 根据项目来源id, 删除项目主表，项目分类关系表
+	 * @param originId
+	 * @param origin
+	 * @return
+	 */
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public Integer deleteByOriginId(String originId, String origin) {
+		LambdaQueryWrapper<ProjectEntity> queryWrapper = new LambdaQueryWrapper();
+		queryWrapper.eq(ProjectEntity::getOriginId, originId)
+				.eq(ProjectEntity::getOrigin, origin);
+		ProjectEntity projectEntity = baseDao.selectOne(queryWrapper);
+		if (null != projectEntity) {
+			Date nowTime = new Date();
 			LambdaUpdateWrapper<ProjectEntity> wrapper = new LambdaUpdateWrapper();
-		wrapper.eq(ProjectEntity::getOriginId, originId)
+			wrapper.eq(ProjectEntity::getId, projectEntity.getId())
-				.eq(ProjectEntity::getOrigin,origin)
+					.set(ProjectEntity::getUpdatedTime, nowTime)
-				.set(ProjectEntity::getUpdatedTime,new Date())
+					.set(ProjectEntity::getUpdatedBy, loginUserUtil.getLoginUserId())
-				.set(ProjectEntity::getUpdatedBy,loginUserUtil.getLoginUserId())
+					.set(ProjectEntity::getDelFlag, NumConstant.ONE_STR);
-				.set(ProjectEntity::getDelFlag,NumConstant.ONE_STR);
+			baseDao.update(null, wrapper);
-		return baseDao.update(null, wrapper);
+			projectCategoryService.delByProjectId(projectEntity.getId(), loginUserUtil.getLoginUserId(), nowTime);
+			return 1;
+		}
+		return 0;
 	}
-
 
 }