#48 refactor package

WeBankPartners · May 11, 2021 · 705fed2 · 705fed2
1 parent c0fa381
commit 705fed2
Show file tree

Hide file tree

Showing 32 changed files with 60 additions and 60 deletions.
diff --git a/taskman-core/src/main/java/com/webank/taskman/controller/PlatformResourceController.java b/taskman-core/src/main/java/com/webank/taskman/controller/PlatformResourceController.java
@@ -22,10 +22,10 @@
 import com.webank.taskman.base.JsonResponse;
 import com.webank.taskman.commons.TaskmanRuntimeException;
 import com.webank.taskman.service.AttachFileService;
-import com.webank.taskman.support.core.PlatformCoreServiceRestClient;
-import com.webank.taskman.support.core.dto.DataModelEntityDto;
-import com.webank.taskman.support.core.dto.DynamicWorkflowInstCreationInfoDto;
-import com.webank.taskman.support.core.dto.ProcessDataPreviewDto;
+import com.webank.taskman.support.platform.PlatformCoreServiceRestClient;
+import com.webank.taskman.support.platform.dto.DataModelEntityDto;
+import com.webank.taskman.support.platform.dto.DynamicWorkflowInstCreationInfoDto;
+import com.webank.taskman.support.platform.dto.ProcessDataPreviewDto;
 import com.webank.taskman.support.s3.dto.DownloadAttachFileResponse;
 
 @RestController

diff --git a/taskman-core/src/main/java/com/webank/taskman/controller/TaskmanOutController.java b/taskman-core/src/main/java/com/webank/taskman/controller/TaskmanOutController.java
@@ -11,10 +11,10 @@
 import com.webank.taskman.dto.platform.CoreCancelTaskDto;
 import com.webank.taskman.service.FormItemTemplateService;
 import com.webank.taskman.service.TaskInfoService;
-import com.webank.taskman.support.core.CommonResponseDto;
-import com.webank.taskman.support.core.dto.PlatformPluginRequestDto;
-import com.webank.taskman.support.core.dto.PlatformPluginResponseDto;
-import com.webank.taskman.support.core.dto.TaskFormMetaResponseDto;
+import com.webank.taskman.support.platform.CommonResponseDto;
+import com.webank.taskman.support.platform.dto.PlatformPluginRequestDto;
+import com.webank.taskman.support.platform.dto.PlatformPluginResponseDto;
+import com.webank.taskman.support.platform.dto.TaskFormMetaResponseDto;
 
 @RestController
 @RequestMapping("/v1")

diff --git a/taskman-core/src/main/java/com/webank/taskman/converter/RoleRelationConverter.java b/taskman-core/src/main/java/com/webank/taskman/converter/RoleRelationConverter.java
@@ -9,7 +9,7 @@
 import com.webank.taskman.base.BaseConverter;
 import com.webank.taskman.domain.RoleRelation;
 import com.webank.taskman.dto.RoleDto;
-import com.webank.taskman.support.core.dto.RolesDataResponse;
+import com.webank.taskman.support.platform.dto.RolesDataResponse;
 
 @Service
 public class RoleRelationConverter implements BaseConverter<RoleDto, RoleRelation> {

diff --git a/taskman-core/src/main/java/com/webank/taskman/service/RequestInfoService.java b/taskman-core/src/main/java/com/webank/taskman/service/RequestInfoService.java
@@ -8,7 +8,7 @@
 import com.webank.taskman.dto.CreateTaskDto;
 import com.webank.taskman.dto.req.RequestInfoQueryReqDto;
 import com.webank.taskman.dto.resp.RequestInfoQueryResultDto;
-import com.webank.taskman.support.core.dto.DynamicWorkflowInstInfoDto;
+import com.webank.taskman.support.platform.dto.DynamicWorkflowInstInfoDto;
 
 public interface RequestInfoService extends IService<RequestInfo> {
 

diff --git a/taskman-core/src/main/java/com/webank/taskman/service/TaskInfoService.java b/taskman-core/src/main/java/com/webank/taskman/service/TaskInfoService.java
@@ -11,7 +11,7 @@
 import com.webank.taskman.dto.req.TaskInfoQueryReqDto;
 import com.webank.taskman.dto.resp.RequestInfoInstanceResqDto;
 import com.webank.taskman.dto.resp.TaskInfoRespDto;
-import com.webank.taskman.support.core.CommonResponseDto;
+import com.webank.taskman.support.platform.CommonResponseDto;
 
 public interface TaskInfoService extends IService<TaskInfo> {
 

diff --git a/taskman-core/src/main/java/com/webank/taskman/service/impl/RequestInfoServiceImpl.java b/taskman-core/src/main/java/com/webank/taskman/service/impl/RequestInfoServiceImpl.java
@@ -36,12 +36,12 @@
 import com.webank.taskman.service.FormTemplateService;
 import com.webank.taskman.service.RequestInfoService;
 import com.webank.taskman.service.RequestTemplateService;
-import com.webank.taskman.support.core.PlatformCoreServiceRestClient;
-import com.webank.taskman.support.core.dto.DynamicEntityValueDto;
-import com.webank.taskman.support.core.dto.DynamicEntityValueDto.DynamicEntityAttrValueDto;
-import com.webank.taskman.support.core.dto.DynamicTaskNodeBindInfoDto;
-import com.webank.taskman.support.core.dto.DynamicWorkflowInstCreationInfoDto;
-import com.webank.taskman.support.core.dto.DynamicWorkflowInstInfoDto;
+import com.webank.taskman.support.platform.PlatformCoreServiceRestClient;
+import com.webank.taskman.support.platform.dto.DynamicEntityValueDto;
+import com.webank.taskman.support.platform.dto.DynamicTaskNodeBindInfoDto;
+import com.webank.taskman.support.platform.dto.DynamicWorkflowInstCreationInfoDto;
+import com.webank.taskman.support.platform.dto.DynamicWorkflowInstInfoDto;
+import com.webank.taskman.support.platform.dto.DynamicEntityValueDto.DynamicEntityAttrValueDto;
 
 @Service
 public class RequestInfoServiceImpl extends ServiceImpl<RequestInfoMapper, RequestInfo> implements RequestInfoService {

diff --git a/taskman-core/src/main/java/com/webank/taskman/service/impl/RequestTemplateServiceImpl.java b/taskman-core/src/main/java/com/webank/taskman/service/impl/RequestTemplateServiceImpl.java
@@ -44,7 +44,7 @@
 import com.webank.taskman.service.RequestTemplateGroupService;
 import com.webank.taskman.service.RequestTemplateService;
 import com.webank.taskman.service.RoleRelationService;
-import com.webank.taskman.support.core.PlatformCoreServiceRestClient;
+import com.webank.taskman.support.platform.PlatformCoreServiceRestClient;
 
 @Service
 public class RequestTemplateServiceImpl extends ServiceImpl<RequestTemplateMapper, RequestTemplate>

diff --git a/taskman-core/src/main/java/com/webank/taskman/service/impl/TaskInfoServiceImpl.java b/taskman-core/src/main/java/com/webank/taskman/service/impl/TaskInfoServiceImpl.java
@@ -37,8 +37,8 @@
 import com.webank.taskman.service.FormItemInfoService;
 import com.webank.taskman.service.RequestInfoService;
 import com.webank.taskman.service.TaskInfoService;
-import com.webank.taskman.support.core.CommonResponseDto;
-import com.webank.taskman.support.core.PlatformCoreServiceRestClient;
+import com.webank.taskman.support.platform.CommonResponseDto;
+import com.webank.taskman.support.platform.PlatformCoreServiceRestClient;
 
 @Service
 public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> implements TaskInfoService {

diff --git a/...skman/support/core/CommonResponseDto.java → ...n/support/platform/CommonResponseDto.java b/...skman/support/core/CommonResponseDto.java → ...n/support/platform/CommonResponseDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core;
+package com.webank.taskman.support.platform;
 
 public class CommonResponseDto {
     public final static String STATUS_OK = "OK";

diff --git a/...support/core/CoreRemoteCallException.java → ...ort/platform/CoreRemoteCallException.java b/...support/core/CoreRemoteCallException.java → ...ort/platform/CoreRemoteCallException.java
@@ -1,8 +1,8 @@
-package com.webank.taskman.support.core;
+package com.webank.taskman.support.platform;
 
 
 import com.webank.taskman.support.RemoteCallException;
-import com.webank.taskman.support.core.dto.PlatformResponseDto;
+import com.webank.taskman.support.platform.dto.PlatformResponseDto;
 
 public class CoreRemoteCallException extends RemoteCallException {
 

diff --git a/...askman/support/core/CoreRestTemplate.java → ...an/support/platform/CoreRestTemplate.java b/...askman/support/core/CoreRestTemplate.java → ...an/support/platform/CoreRestTemplate.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core;
+package com.webank.taskman.support.platform;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@
 
 import com.webank.taskman.base.JsonResponse;
 import com.webank.taskman.commons.AppProperties.ServiceTaskmanProperties;
-import com.webank.taskman.support.core.dto.PlatformResponseDto;
-import com.webank.taskman.support.core.dto.PlatformResponseDto.DefaultCoreResponse;
+import com.webank.taskman.support.platform.dto.PlatformResponseDto;
+import com.webank.taskman.support.platform.dto.PlatformResponseDto.DefaultCoreResponse;
 import com.webank.taskman.utils.GsonUtil;
 import com.webank.taskman.utils.JsonUtils;
 

diff --git a/...t/core/PlatformCoreServiceRestClient.java → ...atform/PlatformCoreServiceRestClient.java b/...t/core/PlatformCoreServiceRestClient.java → ...atform/PlatformCoreServiceRestClient.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core;
+package com.webank.taskman.support.platform;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,20 +16,20 @@
 
 import com.google.gson.reflect.TypeToken;
 import com.webank.taskman.commons.AppProperties.ServiceTaskmanProperties;
+import com.webank.taskman.support.platform.dto.DataModelEntityDto;
+import com.webank.taskman.support.platform.dto.DynamicWorkflowInstCreationInfoDto;
+import com.webank.taskman.support.platform.dto.DynamicWorkflowInstInfoDto;
+import com.webank.taskman.support.platform.dto.PluginPackageAttributeDto;
+import com.webank.taskman.support.platform.dto.PluginPackageDataModelDto;
+import com.webank.taskman.support.platform.dto.ProcessDataPreviewDto;
+import com.webank.taskman.support.platform.dto.RolesDataResponse;
+import com.webank.taskman.support.platform.dto.TaskNodeDefObjectBindInfoDto;
+import com.webank.taskman.support.platform.dto.WorkflowDefInfoDto;
+import com.webank.taskman.support.platform.dto.WorkflowNodeDefInfoDto;
+import com.webank.taskman.support.platform.dto.PlatformResponseDto.DefaultCoreResponse;
+import com.webank.taskman.support.platform.dto.PlatformResponseDto.LinkedHashMapResponse;
+import com.webank.taskman.support.platform.dto.PlatformResponseDto.ListDataResponse;
 import com.webank.taskman.commons.AuthenticationContextHolder;
-import com.webank.taskman.support.core.dto.DataModelEntityDto;
-import com.webank.taskman.support.core.dto.DynamicWorkflowInstCreationInfoDto;
-import com.webank.taskman.support.core.dto.DynamicWorkflowInstInfoDto;
-import com.webank.taskman.support.core.dto.PlatformResponseDto.DefaultCoreResponse;
-import com.webank.taskman.support.core.dto.PlatformResponseDto.LinkedHashMapResponse;
-import com.webank.taskman.support.core.dto.PlatformResponseDto.ListDataResponse;
-import com.webank.taskman.support.core.dto.PluginPackageAttributeDto;
-import com.webank.taskman.support.core.dto.PluginPackageDataModelDto;
-import com.webank.taskman.support.core.dto.ProcessDataPreviewDto;
-import com.webank.taskman.support.core.dto.RolesDataResponse;
-import com.webank.taskman.support.core.dto.TaskNodeDefObjectBindInfoDto;
-import com.webank.taskman.support.core.dto.WorkflowDefInfoDto;
-import com.webank.taskman.support.core.dto.WorkflowNodeDefInfoDto;
 import com.webank.taskman.utils.GsonUtil;
 
 @Service

diff --git a/.../support/core/dto/DataModelEntityDto.java → ...port/platform/dto/DataModelEntityDto.java b/.../support/core/dto/DataModelEntityDto.java → ...port/platform/dto/DataModelEntityDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...pport/core/dto/DynamicEntityValueDto.java → ...t/platform/dto/DynamicEntityValueDto.java b/...pport/core/dto/DynamicEntityValueDto.java → ...t/platform/dto/DynamicEntityValueDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../core/dto/DynamicTaskNodeBindInfoDto.java → ...tform/dto/DynamicTaskNodeBindInfoDto.java b/.../core/dto/DynamicTaskNodeBindInfoDto.java → ...tform/dto/DynamicTaskNodeBindInfoDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...o/DynamicWorkflowInstCreationInfoDto.java → ...o/DynamicWorkflowInstCreationInfoDto.java b/...o/DynamicWorkflowInstCreationInfoDto.java → ...o/DynamicWorkflowInstCreationInfoDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../core/dto/DynamicWorkflowInstInfoDto.java → ...tform/dto/DynamicWorkflowInstInfoDto.java b/.../core/dto/DynamicWorkflowInstInfoDto.java → ...tform/dto/DynamicWorkflowInstInfoDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 public class DynamicWorkflowInstInfoDto {
     private String id;

diff --git a/...rt/core/dto/PlatformPluginRequestDto.java → ...latform/dto/PlatformPluginRequestDto.java b/...rt/core/dto/PlatformPluginRequestDto.java → ...latform/dto/PlatformPluginRequestDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...t/core/dto/PlatformPluginResponseDto.java → ...atform/dto/PlatformPluginResponseDto.java b/...t/core/dto/PlatformPluginResponseDto.java → ...atform/dto/PlatformPluginResponseDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.List;
 

diff --git a/...support/core/dto/PlatformResponseDto.java → ...ort/platform/dto/PlatformResponseDto.java b/...support/core/dto/PlatformResponseDto.java → ...ort/platform/dto/PlatformResponseDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.LinkedHashMap;
 import java.util.List;

diff --git a/...t/core/dto/PluginPackageAttributeDto.java → ...atform/dto/PluginPackageAttributeDto.java b/...t/core/dto/PluginPackageAttributeDto.java → ...atform/dto/PluginPackageAttributeDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.Objects;
 

diff --git a/...t/core/dto/PluginPackageDataModelDto.java → ...atform/dto/PluginPackageDataModelDto.java b/...t/core/dto/PluginPackageDataModelDto.java → ...atform/dto/PluginPackageDataModelDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 
 import java.util.ArrayList;

diff --git a/...port/core/dto/PluginPackageEntityDto.java → .../platform/dto/PluginPackageEntityDto.java b/...port/core/dto/PluginPackageEntityDto.java → .../platform/dto/PluginPackageEntityDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/...pport/core/dto/ProcessDataPreviewDto.java → ...t/platform/dto/ProcessDataPreviewDto.java b/...pport/core/dto/ProcessDataPreviewDto.java → ...t/platform/dto/ProcessDataPreviewDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...port/core/dto/RegisteredEntityDefDto.java → .../platform/dto/RegisteredEntityDefDto.java b/...port/core/dto/RegisteredEntityDefDto.java → .../platform/dto/RegisteredEntityDefDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...n/support/core/dto/RolesDataResponse.java → ...pport/platform/dto/RolesDataResponse.java b/...n/support/core/dto/RolesDataResponse.java → ...pport/platform/dto/RolesDataResponse.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 public class RolesDataResponse {
 

diff --git a/...support/core/dto/TaskFormItemMetaDto.java → ...ort/platform/dto/TaskFormItemMetaDto.java b/...support/core/dto/TaskFormItemMetaDto.java → ...ort/platform/dto/TaskFormItemMetaDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 public class TaskFormItemMetaDto {
     private String formItemMetaId;

diff --git a/...man/support/core/dto/TaskFormMetaDto.java → ...support/platform/dto/TaskFormMetaDto.java b/...man/support/core/dto/TaskFormMetaDto.java → ...support/platform/dto/TaskFormMetaDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ort/core/dto/TaskFormMetaResponseDto.java → ...platform/dto/TaskFormMetaResponseDto.java b/...ort/core/dto/TaskFormMetaResponseDto.java → ...platform/dto/TaskFormMetaResponseDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 public class TaskFormMetaResponseDto {
     public final static String STATUS_OK = "OK";

diff --git a/...ore/dto/TaskNodeDefObjectBindInfoDto.java → ...orm/dto/TaskNodeDefObjectBindInfoDto.java b/...ore/dto/TaskNodeDefObjectBindInfoDto.java → ...orm/dto/TaskNodeDefObjectBindInfoDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

diff --git a/.../support/core/dto/WorkflowDefInfoDto.java → ...port/platform/dto/WorkflowDefInfoDto.java b/.../support/core/dto/WorkflowDefInfoDto.java → ...port/platform/dto/WorkflowDefInfoDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 public class WorkflowDefInfoDto {
     private String procDefId;

diff --git a/...port/core/dto/WorkflowNodeDefInfoDto.java → .../platform/dto/WorkflowNodeDefInfoDto.java b/...port/core/dto/WorkflowNodeDefInfoDto.java → .../platform/dto/WorkflowNodeDefInfoDto.java
@@ -1,4 +1,4 @@
-package com.webank.taskman.support.core.dto;
+package com.webank.taskman.support.platform.dto;
 
 public class WorkflowNodeDefInfoDto {
     private String nodeId;