Browse Source

议题项目分类旧程序逻辑调整

dev_shibei_match
sunyuchao 4 years ago
parent
commit
1d16f90d3e
  1. 6
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueSaveCategoryFormDTO.java
  2. 7
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
  3. 7
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
  4. 5
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
  5. 5
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
  6. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
  7. 12
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
  8. 1
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
  9. 25
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IssueProjectCategoryDictListFormDTO.java
  10. 8
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectSaveCategoryFormDTO.java
  11. 3
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java

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

@ -23,6 +23,12 @@ public class IssueSaveCategoryFormDTO implements Serializable {
* 议题分类集合 * 议题分类集合
*/ */
private List<SaveIssueCategoryFormDTO> categoryList; private List<SaveIssueCategoryFormDTO> categoryList;
/**
* 客户Id
*/
private String customerId;
public interface SaveCategory{} public interface SaveCategory{}
} }

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

@ -17,9 +17,9 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.AssertUtils;
@ -128,7 +128,8 @@ public class IssueCategoryController {
* @Author sun * @Author sun
**/ **/
@PostMapping("save") @PostMapping("save")
public Result saveCategory(@RequestBody IssueSaveCategoryFormDTO formDTO) { public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody IssueSaveCategoryFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class); ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class);
issueCategoryService.saveCategory(formDTO); issueCategoryService.saveCategory(formDTO);
return new Result(); return new Result();

7
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.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.form.CategoryTagInitFormDTO; import com.epmet.dto.form.CategoryTagInitFormDTO;
import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO;
import com.epmet.dto.result.ProjectIssueCategoryResultDTO; import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
@ -122,14 +123,14 @@ public class IssueProjectCategoryDictController {
} }
/** /**
* @param cstegoryIdList * @param formDTO
* @return * @return
* @Description 批量查询分类信息 * @Description 批量查询分类信息
* @Author sun * @Author sun
**/ **/
@PostMapping("getcategorylist") @PostMapping("getcategorylist")
public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody List<String> cstegoryIdList) { public Result<List<IssueProjectCategoryDictDTO>> getCategoryList(@RequestBody IssueProjectCategoryDictListFormDTO formDTO) {
return new Result<List<IssueProjectCategoryDictDTO>>().ok(issueProjectCategoryDictService.getCategoryList(cstegoryIdList)); return new Result<List<IssueProjectCategoryDictDTO>>().ok(issueProjectCategoryDictService.getCategoryList(formDTO));
} }
/** /**

5
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.commons.mybatis.dao.BaseDao;
import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO;
import com.epmet.entity.IssueProjectCategoryDictEntity; import com.epmet.entity.IssueProjectCategoryDictEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -55,12 +56,12 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
List<IssueProjectCategoryDictEntity> selectCategoryListByCustomer(@Param("customerId") String customerId); List<IssueProjectCategoryDictEntity> selectCategoryListByCustomer(@Param("customerId") String customerId);
/** /**
* @param cstegoryIdList * @param formDTO
* @return * @return
* @Description 批量查询分类信息 * @Description 批量查询分类信息
* @Author sun * @Author sun
**/ **/
List<IssueProjectCategoryDictDTO> selectCategoryList(@Param("cstegoryIdList") List<String> cstegoryIdList); List<IssueProjectCategoryDictDTO> selectCategoryList(IssueProjectCategoryDictListFormDTO formDTO);
/** /**
* @Description 根据客户Id类别名称类型查询单个类别 默认查询二级分类 * @Description 根据客户Id类别名称类型查询单个类别 默认查询二级分类

5
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.commons.tools.page.PageData;
import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.form.CategoryTagInitFormDTO; import com.epmet.dto.form.CategoryTagInitFormDTO;
import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO;
import com.epmet.dto.result.ProjectIssueCategoryResultDTO; import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
@ -115,12 +116,12 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
void init(CategoryTagInitFormDTO formDTO); void init(CategoryTagInitFormDTO formDTO);
/** /**
* @param cstegoryIdList * @param formDTO
* @return * @return
* @Description 批量查询分类信息 * @Description 批量查询分类信息
* @Author sun * @Author sun
**/ **/
List<IssueProjectCategoryDictDTO> getCategoryList(List<String> cstegoryIdList); List<IssueProjectCategoryDictDTO> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO);
/** /**
* @param formDTO * @param formDTO

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

@ -29,10 +29,7 @@ import com.epmet.dao.IssueCategoryDao;
import com.epmet.dao.IssueTagsDao; import com.epmet.dao.IssueTagsDao;
import com.epmet.dto.IssueCategoryDTO; import com.epmet.dto.IssueCategoryDTO;
import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.form.IssueCategoryTagListFormDTO; import com.epmet.dto.form.*;
import com.epmet.dto.form.IssueSaveCategoryFormDTO;
import com.epmet.dto.form.ProjectCategoryTagListFormDTO;
import com.epmet.dto.form.SaveIssueCategoryFormDTO;
import com.epmet.dto.result.IssueCategoryTagListResultDTO; import com.epmet.dto.result.IssueCategoryTagListResultDTO;
import com.epmet.dto.result.IssueCategoryTagResultDTO; import com.epmet.dto.result.IssueCategoryTagResultDTO;
import com.epmet.dto.result.ProjectCategoryTagResultDTO; import com.epmet.dto.result.ProjectCategoryTagResultDTO;
@ -192,7 +189,10 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
//2.批量查询分类信息 //2.批量查询分类信息
List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList()); List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
List<IssueProjectCategoryDictDTO> categoryList = issueProjectCategoryDictService.getCategoryList(categoryIdList); IssueProjectCategoryDictListFormDTO dictDto = new IssueProjectCategoryDictListFormDTO();
dictDto.setCustomerId(formDTO.getCustomerId());
dictDto.setCstegoryIdList(categoryIdList);
List<IssueProjectCategoryDictDTO> categoryList = issueProjectCategoryDictService.getCategoryList(dictDto);
if (null == categoryList) { if (null == categoryList) {
throw new RenException(String.format("议题分类信息保存,根据分类Id获取分类信息失败")); throw new RenException(String.format("议题分类信息保存,根据分类Id获取分类信息失败"));
} }

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

@ -29,6 +29,7 @@ import com.epmet.dao.IssueProjectRelationDao;
import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueDTO;
import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.form.CategoryTagInitFormDTO; import com.epmet.dto.form.CategoryTagInitFormDTO;
import com.epmet.dto.form.IssueProjectCategoryDictListFormDTO;
import com.epmet.dto.form.ProjectSaveCategoryFormDTO; import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
import com.epmet.dto.form.SaveIssueCategoryFormDTO; import com.epmet.dto.form.SaveIssueCategoryFormDTO;
import com.epmet.dto.result.CustomerCategoryListResultDTO; import com.epmet.dto.result.CustomerCategoryListResultDTO;
@ -132,14 +133,14 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
} }
/** /**
* @param cstegoryIdList * @param formDTO
* @return * @return
* @Description 批量查询分类信息 * @Description 批量查询分类信息
* @Author sun * @Author sun
**/ **/
@Override @Override
public List<IssueProjectCategoryDictDTO> getCategoryList(List<String> cstegoryIdList) { public List<IssueProjectCategoryDictDTO> getCategoryList(IssueProjectCategoryDictListFormDTO formDTO) {
return baseDao.selectCategoryList(cstegoryIdList); return baseDao.selectCategoryList(formDTO);
} }
/** /**
@ -160,7 +161,10 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
resultDTO.setIssueDTO(issueDTO); resultDTO.setIssueDTO(issueDTO);
//2.批量查询分类信息 //2.批量查询分类信息
List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList()); List<String> categoryIdList = formDTO.getCategoryList().stream().map(SaveIssueCategoryFormDTO::getId).collect(Collectors.toList());
List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(categoryIdList); IssueProjectCategoryDictListFormDTO dictDto = new IssueProjectCategoryDictListFormDTO();
dictDto.setCustomerId(formDTO.getCustomerId());
dictDto.setCstegoryIdList(categoryIdList);
List<IssueProjectCategoryDictDTO> categoryList = getCategoryList(dictDto);
if (null == categoryList) { if (null == categoryList) {
throw new RenException(String.format("保存项目分类信息,根据分类Id获取分类信息失败")); throw new RenException(String.format("保存项目分类信息,根据分类Id获取分类信息失败"));
} }

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

@ -62,6 +62,7 @@
issue_project_category_dict issue_project_category_dict
WHERE WHERE
del_flag = '0' del_flag = '0'
AND customer_id = #{customerId}
<if test="cstegoryIdList != null and cstegoryIdList.size() > 0"> <if test="cstegoryIdList != null and cstegoryIdList.size() > 0">
<foreach collection="cstegoryIdList" item="id" open="AND( " separator=" OR " index="index" close=")"> <foreach collection="cstegoryIdList" item="id" open="AND( " separator=" OR " index="index" close=")">
id = #{id} id = #{id}

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

@ -0,0 +1,25 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 批量查询分类信息-接口入参
* @Author sun
*/
@Data
public class IssueProjectCategoryDictListFormDTO implements Serializable {
private static final long serialVersionUID = 2599592072265715951L;
/**
* 客户Id
*/
private String customerId;
/**
* 分类Id集合
*/
private List<String> cstegoryIdList;
}

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

@ -15,7 +15,7 @@ public class ProjectSaveCategoryFormDTO implements Serializable {
private static final long serialVersionUID = 2599592072265715951L; private static final long serialVersionUID = 2599592072265715951L;
/** /**
* 议题Id * 项目Id
*/ */
@NotBlank(message = "项目ID不能为空",groups = {SaveCategory.class}) @NotBlank(message = "项目ID不能为空",groups = {SaveCategory.class})
private String projectId; private String projectId;
@ -23,6 +23,12 @@ public class ProjectSaveCategoryFormDTO implements Serializable {
* 议题分类集合 * 议题分类集合
*/ */
private List<SaveIssueCategoryFormDTO> categoryList; private List<SaveIssueCategoryFormDTO> categoryList;
/**
* 客户Id
*/
private String customerId;
public interface SaveCategory{} public interface SaveCategory{}
} }

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

@ -118,7 +118,8 @@ public class ProjectCategoryController {
* @Author sun * @Author sun
**/ **/
@PostMapping("save") @PostMapping("save")
public Result saveCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) { public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody ProjectSaveCategoryFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class); ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class);
projectCategoryService.saveCategory(formDTO); projectCategoryService.saveCategory(formDTO);
return new Result(); return new Result();

Loading…
Cancel
Save