From 2a91b54a439543a2ecea3d1d6b5bc83fb3977a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Wed, 27 Nov 2019 18:41:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/mybatis/entity/BaseEntity.java | 3 ++- .../epdc/commons/tools/constant/Constant.java | 2 +- .../epdc/controller/ApiIssueController.java | 10 ++++++++++ .../esua/epdc/feign/IssueFeignClient.java | 9 +++++++++ .../fallback/IssueFeignClientFallback.java | 6 ++++++ .../elink/esua/epdc/service/IssueService.java | 8 ++++++++ .../epdc/service/impl/IssueServiceImpl.java | 6 ++++++ .../controller/CategoryController.java | 13 ++++++++---- .../category/entity/CategoryEntity.java | 20 +------------------ .../service/impl/CategoryServiceImpl.java | 12 +++++++++-- .../controller/EpdcAppIssueController.java | 12 +++++++++++ .../issue/service/impl/IssueServiceImpl.java | 6 +++--- 12 files changed, 77 insertions(+), 30 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEntity.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEntity.java index 31332fbed..dc15053d9 100644 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEntity.java +++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/BaseEntity.java @@ -9,6 +9,7 @@ package com.elink.esua.epdc.commons.mybatis.entity; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -27,7 +28,7 @@ public abstract class BaseEntity implements Serializable { /** * id */ - @TableId + @TableId(type = IdType.ID_WORKER) private Long id; /** * 创建者 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java index 9ffd1d4aa..293fbd03b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java @@ -42,7 +42,7 @@ public interface Constant { /** * 分类根节点标识 */ - String CATEGORY_ROOT = "0"; + Long CATEGORY_ROOT = 0L; /** * 数据字典根节点标识 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index bf6dda1a8..d0d0fa18f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -142,4 +144,12 @@ public class ApiIssueController { return issueService.getEventDetail(eventId); } + /** + * 分类列表 + */ + @GetMapping("category/list") + public Result> categorylist(){ + return issueService.categorylist(); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java index daf1e1518..551adb01d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -100,4 +101,12 @@ public interface IssueFeignClient { */ @GetMapping(value = "events/epdc-app/issue/eventDetail/{eventId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result eventDetail(@PathVariable String eventId); + + + /** + * 分类列表 + * @return + */ + @GetMapping(value = "events/epdc-app/issue/categorylist", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> categorylist(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java index deed9f692..d72b87b9a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -58,4 +59,9 @@ public class IssueFeignClientFallback implements IssueFeignClient { public Result eventDetail(String eventId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "eventDetail", eventId); } + + @Override + public Result> categorylist() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "categorylist", null); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java index 0bb557bb8..34ec47d52 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; @@ -96,4 +97,11 @@ public interface IssueService { * @Date: 2019/9/17 17:36 */ Result getEventDetail(String eventId); + + + /** + * 分类列表 + * @return + */ + Result> categorylist(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 146c72c36..f22b3c0cd 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.UploadFormDTO; +import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; @@ -167,4 +168,9 @@ public class IssueServiceImpl implements IssueService { public Result getEventDetail(String eventId) { return issueFeignClient.eventDetail(eventId); } + + @Override + public Result> categorylist() { + return issueFeignClient.categorylist(); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java index e10396208..5dc5aae29 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.modules.category.controller; +import com.elink.esua.epdc.commons.tools.annotation.LogOperation; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; @@ -27,10 +28,12 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.modules.category.excel.CategoryExcel; import com.elink.esua.epdc.modules.category.service.CategoryService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -49,8 +52,8 @@ public class CategoryController { private CategoryService categoryService; @GetMapping("list") - public Result> list(@RequestParam Map params){ - List list = categoryService.list(params); + public Result> list(){ + List list = categoryService.list(new HashMap<>(1)); return new Result>().ok(list); } @@ -76,8 +79,10 @@ public class CategoryController { return new Result(); } - @DeleteMapping - public Result delete(@RequestBody Long id){ + @DeleteMapping("{id}") + @ApiOperation("删除") + @LogOperation("Delete Dept") + public Result delete(@PathVariable("id") Long id) { categoryService.delete(id); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index 616be36fe..68d3b1049 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -35,16 +35,10 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("epdc_category") -public class CategoryEntity implements Serializable { +public class CategoryEntity extends BaseEntity { private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId(type = IdType.ID_WORKER) - private Long id; - /** * 上级分类ID */ @@ -82,18 +76,6 @@ public class CategoryEntity implements Serializable { @TableField(fill = FieldFill.INSERT) private Integer delFlag; - /** - * 创建者 - */ - @TableField(fill = FieldFill.INSERT) - private Long creator; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private Date createDate; - /** * 更新者 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index c3257f063..c1b8185fd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.modules.category.dao.CategoryDao; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; @@ -54,7 +55,10 @@ public class CategoryServiceImpl extends BaseServiceImpl list(Map params) { List entityList = baseDao.getList(params); - return ConvertUtils.sourceToTarget(entityList, CategoryDTO.class); + + List dtoList = ConvertUtils.sourceToTarget(entityList, CategoryDTO.class); + + return TreeUtils.build(dtoList); } @Override @@ -150,6 +154,7 @@ public class CategoryServiceImpl extends BaseServiceImpl 1) { throw new RenException(ErrorCode.DEPT_SUB_DELETE_ERROR); } + baseDao.deleteBatchIds(Arrays.asList(new Long[]{id})); + // 逻辑删除（@TableLogic 注解） - logicDelete(new Long[]{id}, CategoryEntity.class); + //logicDelete(new Long[]{id}, CategoryEntity.class); } @Override public List getSubCategoryIdList(Long id) { List subCategoryIdList = baseDao.getSubCategoryIdList("%" + id + "%"); + subCategoryIdList.add(id); return subCategoryIdList; } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java index 7f3850829..2df4b4f3c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java @@ -3,15 +3,19 @@ package com.elink.esua.epdc.modules.issue.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; +import com.elink.esua.epdc.modules.category.service.CategoryService; import com.elink.esua.epdc.modules.issue.service.EventUserAttitudeService; import com.elink.esua.epdc.modules.issue.service.IssueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 移动端-议题表 @@ -28,6 +32,8 @@ public class EpdcAppIssueController { @Autowired private EventUserAttitudeService eventUserAttitudeService; + @Autowired + private CategoryService categoryService; /** * 最新最热列表 @@ -116,4 +122,10 @@ public class EpdcAppIssueController { return issueService.getEventDetail(eventId); } + @GetMapping("categorylist") + public Result> categorylist(){ + List list = categoryService.list(new HashMap<>(1)); + return new Result>().ok(list); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 433544630..9d90c1f8f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -451,11 +451,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public Result> selectWorkIssueListOfNewOrHot(WorkIssueListFormDTO formDto) { List list; - if (formDto.getDeptId() == null){ - list = SecurityUser.getUser().getDeptIdList(); - }else { + if (formDto.getDeptId() > 0){ list = new ArrayList<>(); list.add(formDto.getDeptId()); + }else { + list = SecurityUser.getUser().getDeptIdList(); } formDto.setDeptIdList(list); List data = baseDao.selectWorkIssueListOfNewOrHot(formDto);