重命名文件

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ReferenceTypeEnum.java

@@ -1,35 +0,0 @@
-package com.elink.esua.epdc.enums;
-
-/**
- * 议题或项目枚举
- *
- * @author work@yujt.net.cn
- * @date 2019/10/21 10:30
- */
-public enum ReferenceTypeEnum {
-
-    /**
-     * 议题
-     */
-    ISSUE("issue"),
-
-    /**
-     * 项目
-     */
-    ITEM("item"),
-
-    /**
-     * 事件
-     */
-    EVENT("event");
-
-    private String name;
-
-    ReferenceTypeEnum(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java

@@ -26,8 +26,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
-import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
-import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
+import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
+import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.excel.CategoryExcel;
 import com.elink.esua.epdc.modules.category.service.CategoryService;
 import io.swagger.annotations.ApiOperation;
@@ -134,7 +134,7 @@ public class CategoryController {
 
     /**
      * @param formDTO
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.CategoryInfoResultDTO>>
      * @Author yinzuomei
      * @Description 根据id查询事件分类基本信息
      * @Date 2019/12/4 9:43

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java

@@ -21,8 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
-import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
-import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
+import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
+import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -125,7 +125,7 @@ public interface CategoryService extends BaseService<CategoryEntity> {
 
     /**
      * @param formDTO
-     * @return java.util.List<com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO>
+     * @return java.util.List<com.elink.esua.epdc.dto.result.CategoryInfoResultDTO>
      * @Author yinzuomei
      * @Description 根据id查询事件分类基本信息
      * @Date 2019/12/4 9:43

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java

@@ -36,8 +36,8 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
 import com.elink.esua.epdc.dto.category.CategoryTreeDTO;
-import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
-import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
+import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
+import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.dao.CategoryDao;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
 import com.elink.esua.epdc.modules.category.redis.CategoryRedis;
@@ -550,7 +550,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 
     /**
      * @param formDTO
-     * @return java.util.List<com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO>
+     * @return java.util.List<com.elink.esua.epdc.dto.result.CategoryInfoResultDTO>
      * @Author yinzuomei
      * @Description 根据id查询事件分类基本信息
      * @Date 2019/12/4 9:43

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -27,9 +27,9 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
 import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
@@ -38,7 +38,6 @@ import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO;
 import com.elink.esua.epdc.modules.item.excel.ItemExcel;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -19,8 +19,8 @@ package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -22,8 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.*;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -41,8 +41,8 @@ import com.elink.esua.epdc.dto.MenuNoticeDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemDeptDTO;
@@ -51,7 +51,6 @@ import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
-import com.elink.esua.epdc.enums.KpiCycleEnum;
 import com.elink.esua.epdc.enums.kpiDataEnum;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/form/CategoryInfoFormDTO.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.category.form;
+package com.elink.esua.epdc.dto.form;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcEventsItemMataFromDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.events.form;
+package com.elink.esua.epdc.dto.form;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/KpiEventEvaluationFromDTO.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiEventEvaluationFromDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.events.form;
+package com.elink.esua.epdc.dto.form;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/result/CategoryInfoResultDTO.java → esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java

@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.category.result;
+package com.elink.esua.epdc.dto.result;
 
 import lombok.Data;
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml

@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-events-client</artifactId>
+            <artifactId>epdc-admin-client</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java

@@ -4,10 +4,10 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EventCountFromDTO;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
-import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
-import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java

@@ -5,10 +5,10 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EventCountFromDTO;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
-import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
-import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.feign.EventFeignClient;
 import org.springframework.stereotype.Component;
 

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java

@@ -31,9 +31,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.KpiMetaDataDao;
 import com.elink.esua.epdc.dto.EventCountFromDTO;
 import com.elink.esua.epdc.dto.KpiMetaDataDTO;
-import com.elink.esua.epdc.dto.events.form.EpdcEventsItemMataFromDTO;
-import com.elink.esua.epdc.dto.events.form.EventCountSqlFromDTO;
-import com.elink.esua.epdc.dto.events.form.KpiEventEvaluationFromDTO;
+import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
+import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
 import com.elink.esua.epdc.entity.KpiMetaDataEntity;
 import com.elink.esua.epdc.enums.KpiCycleEnum;
 import com.elink.esua.epdc.feign.EventFeignClient;

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java

@@ -29,8 +29,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.KpiTimeLimitItemDao;
 import com.elink.esua.epdc.dto.KpiTimeLimitItemDTO;
-import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
-import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
+import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
+import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.entity.KpiTimeLimitItemEntity;
 import com.elink.esua.epdc.feign.EventFeignClient;
 import com.elink.esua.epdc.redis.KpiTimeLimitItemRedis;