分类管理

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;
     /**
      * 创建者

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;
     /**
      * 数据字典根节点标识
      */

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<List<CategoryDTO>> categorylist(){
+        return issueService.categorylist();
+    }
+
 }

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<EventAppDetailResultDTO> eventDetail(@PathVariable String eventId);
+
+
+    /**
+     * 分类列表
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/issue/categorylist", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<CategoryDTO>> categorylist();
 }

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<EventAppDetailResultDTO> eventDetail(String eventId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "eventDetail", eventId);
     }
+
+    @Override
+    public Result<List<CategoryDTO>> categorylist() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "categorylist", null);
+    }
 }

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<EventAppDetailResultDTO> getEventDetail(String eventId);
+
+
+    /**
+     * 分类列表
+     * @return
+     */
+    Result<List<CategoryDTO>> categorylist();
 }

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<EventAppDetailResultDTO> getEventDetail(String eventId) {
         return issueFeignClient.eventDetail(eventId);
     }
+
+    @Override
+    public Result<List<CategoryDTO>> categorylist() {
+        return issueFeignClient.categorylist();
+    }
 }

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<CategoryDTO>> list(@RequestParam Map<String, Object> params){
-        List<CategoryDTO> list = categoryService.list(params);
+    public Result<List<CategoryDTO>> list(){
+        List<CategoryDTO> list = categoryService.list(new HashMap<>(1));
         return new Result<List<CategoryDTO>>().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();
     }

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;
-
     /**
      * 更新者
      */

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<CategoryDao, CategoryEn
     @Override
     public List<CategoryDTO> list(Map<String, Object> params) {
         List<CategoryEntity> entityList = baseDao.getList(params);
-        return ConvertUtils.sourceToTarget(entityList, CategoryDTO.class);
+
+        List<CategoryDTO> dtoList = ConvertUtils.sourceToTarget(entityList, CategoryDTO.class);
+
+        return TreeUtils.build(dtoList);
     }
 
     @Override
@@ -150,6 +154,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
         wrapper.eq("category_code", dto.getCategoryCode());
         Long id = dto.getId();
         wrapper.ne(id!=null, "id", dto.getId());
+        wrapper.eq("del_flag","0");
         return baseDao.selectCount(wrapper);
     }
 
@@ -194,14 +199,17 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
         if (subList.size() > 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<Long> getSubCategoryIdList(Long id) {
         List<Long> subCategoryIdList = baseDao.getSubCategoryIdList("%" + id + "%");
+        subCategoryIdList.add(id);
         return subCategoryIdList;
     }
 }

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<List<CategoryDTO>> categorylist(){
+        List<CategoryDTO> list = categoryService.list(new HashMap<>(1));
+        return new Result<List<CategoryDTO>>().ok(list);
+    }
+
 }

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<IssueDao, IssueEntity> imp
     @Override
     public Result<List<WorkIssueListResultDTO>> selectWorkIssueListOfNewOrHot(WorkIssueListFormDTO formDto) {
         List<Long> 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<WorkIssueListResultDTO> data = baseDao.selectWorkIssueListOfNewOrHot(formDto);