diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ReferenceTypeEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ReferenceTypeEnum.java deleted file mode 100644 index 6921bcdd3..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ReferenceTypeEnum.java +++ /dev/null @@ -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; - } -} 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 2678142a1..a3d0e2eae 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 @@ -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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 根据id查询事件分类基本信息 * @Date 2019/12/4 9:43 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java index 967e6f85e..9165fdb1c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java +++ b/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 { /** * @param formDTO - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 根据id查询事件分类基本信息 * @Date 2019/12/4 9:43 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 79e957632..00f3c2eb2 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 @@ -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 + * @return java.util.List * @Author yinzuomei * @Description 根据id查询事件分类基本信息 * @Date 2019/12/4 9:43 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 536890ba3..7bb1e6c11 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index b3229cdea..725be224f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index d60075c9e..5388d5e6c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/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.*; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index bcbe23395..3e45fceae 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java similarity index 100% rename from esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/form/CategoryInfoFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java similarity index 86% rename from esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/form/CategoryInfoFormDTO.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java index 0d5221077..66915f16e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/form/CategoryInfoFormDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcEventsItemMataFromDTO.java similarity index 94% rename from esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcEventsItemMataFromDTO.java index 3284cdf76..7d1804ddf 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsItemMataFromDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/KpiEventEvaluationFromDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiEventEvaluationFromDTO.java similarity index 94% rename from esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/KpiEventEvaluationFromDTO.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiEventEvaluationFromDTO.java index 1da467047..82f35831f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/KpiEventEvaluationFromDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/result/CategoryInfoResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java similarity index 92% rename from esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/result/CategoryInfoResultDTO.java rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java index 201204679..3f47137ec 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/result/CategoryInfoResultDTO.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 1e7bad124..9d73071a8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -20,7 +20,7 @@ com.esua.epdc - epdc-events-client + epdc-admin-client 1.0.0 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java index 2ef7ea316..e7a3a370a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java index 4f16451d8..89b6f93f6 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java index cf8f5c900..0925b4484 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java index cdba31433..0cd45aba4 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java +++ b/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;