diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java
index 0c8573a8..e7c58031 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java
@@ -1,14 +1,12 @@
package com.cloud.kicc.commonbiz;
import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert;
-import com.cloud.kicc.common.datasource.annotation.EnableDynamicDataSource;
import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients;
import com.cloud.kicc.common.job.annotation.EnableKiccXxlJob;
import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer;
import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
/**
*
@@ -24,7 +22,6 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfi
@SpringBootApplication
@EnableKiccJacksonAutoConvert
@EnableKiccXxlJob
-@EnableDynamicDataSource
public class KiccCommonApplication {
public static void main(String[] args) {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableBpmnJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableBpmnJsonConverter.java
deleted file mode 100644
index 0f66388b..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableBpmnJsonConverter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.cloud.kicc.commonbiz.workflow.override.json;
-
-import org.flowable.bpmn.model.SequenceFlow;
-import org.flowable.bpmn.model.StartEvent;
-import org.flowable.bpmn.model.UserTask;
-import org.flowable.editor.language.json.converter.BpmnJsonConverter;
-
-public class FlowableBpmnJsonConverter extends BpmnJsonConverter {
- static {
- convertersToBpmnMap.put(STENCIL_SEQUENCE_FLOW, FlowableSequenceFlowJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_TASK_USER, FlowableUserTaskJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_NONE, FlowableStartEventJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_TIMER, FlowableStartEventJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_CONDITIONAL, FlowableStartEventJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_ERROR, FlowableStartEventJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_ESCALATION, FlowableStartEventJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_MESSAGE, FlowableStartEventJsonConverter.class);
- convertersToBpmnMap.put(STENCIL_EVENT_START_SIGNAL, FlowableStartEventJsonConverter.class);
-
- convertersToJsonMap.put(SequenceFlow.class, FlowableSequenceFlowJsonConverter.class);
- convertersToJsonMap.put(UserTask.class, FlowableUserTaskJsonConverter.class);
- convertersToJsonMap.put(StartEvent.class, FlowableStartEventJsonConverter.class);
- }
-}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
index dabfd586..621c36dc 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
@@ -1,15 +1,5 @@
server:
port: 8000
- undertow:
- threads:
- # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
- io: 16
- # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
- worker: 400
- # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
- buffer-size: 1024
- # 是否分配的直接内存
- direct-buffers: true
spring:
application:
@@ -17,9 +7,9 @@ spring:
cloud:
nacos:
discovery:
- server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
- #ip: @profiles.ip@
- #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+ #server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+ ip: @profiles.ip@
+ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml
deleted file mode 100644
index 98c307eb..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml
deleted file mode 100644
index 6308c280..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml
deleted file mode 100644
index 58e8faef..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml
deleted file mode 100644
index 766572cf..00000000
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml
index 89036630..9786a9b9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml
@@ -69,6 +69,31 @@
com.cloud
kicc-common-mock
+
+
+ org.flowable
+ flowable-ui-modeler-rest
+
+
+ org.liquibase
+ liquibase-core
+
+
+
+ com.cloud
+ kicc-common-datasource
+
+
+
+ com.bstek.ureport
+ ureport2-console
+
+
+ org.apache.poi
+ poi-ooxml
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java
index c5a45d98..1c2e84e8 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java
@@ -1,6 +1,7 @@
package com.cloud.kicc.system;
import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert;
+import com.cloud.kicc.common.datasource.annotation.EnableDynamicDataSource;
import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients;
import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer;
import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2;
@@ -20,6 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@EnableKiccFeignClients
@SpringBootApplication
@EnableKiccJacksonAutoConvert
+@EnableDynamicDataSource
public class KiccSystemApplication {
public static void main(String[] args) {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualCategoryController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java
index fe7b6f93..6d43c29f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualCategoryController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualCategoryService;
+import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -28,7 +28,7 @@ import java.util.List;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/category")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/category")
@Api(value = "可视化分类表", tags = "可视化分类接口")
public class VisualCategoryController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualComponentController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java
similarity index 93%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualComponentController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java
index 3a770149..122a1cbc 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualComponentController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@@ -9,7 +9,7 @@ import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualComponentService;
+import com.cloud.kicc.system.bigscreen.service.IVisualComponentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -30,7 +30,7 @@ import java.util.Map;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/component")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/component")
@Api(value = "可视化组件表", tags = "可视化组件接口")
public class VisualComponentController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java
index f892b633..343fbf2e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,8 +9,8 @@ import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualCategoryService;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualService;
+import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService;
+import com.cloud.kicc.system.bigscreen.service.IVisualService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -33,7 +33,7 @@ import java.util.Map;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual")
@Api(value = "可视化表", tags = "可视化数据接口")
public class VisualController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualDbController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java
similarity index 95%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualDbController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java
index 52d3f859..6352fc43 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualDbController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,7 +10,7 @@ import com.cloud.kicc.common.core.exception.CheckedException;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.DynamicModelDto;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualDbService;
+import com.cloud.kicc.system.bigscreen.service.IVisualDbService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -33,7 +33,7 @@ import java.util.List;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/db")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/db")
@Api(value = "可视化数据源配置表", tags = "可视化数据源配置接口")
public class VisualDbController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualMapController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
similarity index 93%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualMapController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
index e8a77f24..4a343376 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualMapController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@@ -9,7 +9,7 @@ import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualMapService;
+import com.cloud.kicc.system.bigscreen.service.IVisualMapService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -31,7 +31,7 @@ import java.util.Map;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/map")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/map")
@Api(value = "可视化地图配置表", tags = "可视化地图配置接口")
public class VisualMapController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualProxyController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java
similarity index 93%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualProxyController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java
index 743b90ff..bdbf5278 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualProxyController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
@@ -9,7 +9,7 @@ import cn.hutool.json.JSONUtil;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.core.constant.StringPool;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualProxyDto;
-import com.cloud.kicc.commonbiz.util.RequestUtil;
+import com.cloud.kicc.system.bigscreen.util.RequestUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -32,7 +32,7 @@ import java.util.Map;
@Slf4j
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual")
@ApiIgnore
@Api(value = "接口代理", tags = "接口代理")
public class VisualProxyController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualRecordController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualRecordController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java
index de25b34a..3cb5d245 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/controller/VisualRecordController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +8,7 @@ import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualRecordDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualRecordService;
+import com.cloud.kicc.system.bigscreen.service.IVisualRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -28,7 +28,7 @@ import java.util.Arrays;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/record")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/record")
@Api(value = "可视化数据集表", tags = "可视化数据集接口")
public class VisualRecordController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualCategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualCategoryMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualCategoryMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualCategoryMapper.java
index 52ba1c9c..3c223f5b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualCategoryMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualCategoryMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualComponentMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualComponentMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java
index 83af3f05..d4db7ed0 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualComponentMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualConfigMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualConfigMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualConfigMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualConfigMapper.java
index 113dd062..51a95828 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualConfigMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualConfigMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualDbMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualDbMapper.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualDbMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualDbMapper.java
index d3174743..cbb73d10 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualDbMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualDbMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualMapMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualMapMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java
index 764b0729..b50b88ff 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualMapMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapper.java
similarity index 84%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapper.java
index 9508054c..19942469 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualRecordMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualRecordMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java
index 29cbceee..53f2d59c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/mapper/VisualRecordMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualCategoryService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualCategoryService.java
similarity index 89%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualCategoryService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualCategoryService.java
index f8244d98..32bc3e1d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualCategoryService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualCategoryService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualComponentService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualComponentService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java
index d0c2d7c4..6416af9d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualComponentService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualConfigService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualConfigService.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualConfigService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualConfigService.java
index 28326cb6..aa91c3b9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualConfigService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualConfigService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualDbService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualDbService.java
similarity index 94%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualDbService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualDbService.java
index 0e492ab6..5f3e8439 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualDbService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualDbService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualMapService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java
similarity index 91%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualMapService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java
index 1eb47615..f956650a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualMapService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualRecordService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualRecordService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java
index c13fd29c..a280bcdf 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualRecordService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualService.java
similarity index 94%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualService.java
index 6a09bb37..23021eee 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/IVisualService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualCategoryServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualCategoryServiceImpl.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualCategoryServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualCategoryServiceImpl.java
index 3a12d9f5..954e917f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualCategoryServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualCategoryServiceImpl.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.common.core.exception.CheckedException;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualCategoryMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualCategoryService;
+import com.cloud.kicc.system.bigscreen.mapper.VisualCategoryMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualComponentServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java
similarity index 79%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualComponentServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java
index 8e9ad565..ebc25c7e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualComponentServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualComponentMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualComponentService;
+import com.cloud.kicc.system.bigscreen.mapper.VisualComponentMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualComponentService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualConfigServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualConfigServiceImpl.java
similarity index 68%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualConfigServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualConfigServiceImpl.java
index 1c67c2d1..8c4403f2 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualConfigServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualConfigServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualConfigMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualConfigService;
+import com.cloud.kicc.system.bigscreen.mapper.VisualConfigMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualConfigService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualDbServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java
similarity index 89%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualDbServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java
index 39ee9180..29dee127 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualDbServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.map.MapUtil;
@@ -12,9 +12,9 @@ import com.cloud.kicc.common.datasource.util.DynamicDataSourceUtil;
import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualDbMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualDbService;
-import com.cloud.kicc.commonbiz.bigscreen.util.PlaceholderUtil;
+import com.cloud.kicc.system.bigscreen.mapper.VisualDbMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualDbService;
+import com.cloud.kicc.system.bigscreen.util.PlaceholderUtil;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualMapServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java
similarity index 79%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualMapServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java
index bd9f1791..e29eac2b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualMapServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualMapMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualMapService;
+import com.cloud.kicc.system.bigscreen.mapper.VisualMapMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualMapService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualRecordServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java
similarity index 79%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualRecordServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java
index 6e3d9aed..b414d5ef 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualRecordServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualRecordDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualRecordMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualRecordService;
+import com.cloud.kicc.system.bigscreen.mapper.VisualRecordMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualRecordService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualServiceImpl.java
similarity index 90%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualServiceImpl.java
index b347de6e..f901bb63 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/service/impl/VisualServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualServiceImpl.java
@@ -1,13 +1,13 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual;
import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualConfigService;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualService;
+import com.cloud.kicc.system.bigscreen.mapper.VisualMapper;
+import com.cloud.kicc.system.bigscreen.service.IVisualConfigService;
+import com.cloud.kicc.system.bigscreen.service.IVisualService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/util/PlaceholderUtil.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/PlaceholderUtil.java
similarity index 98%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/util/PlaceholderUtil.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/PlaceholderUtil.java
index 74f68068..0da24562 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/bigscreen/util/PlaceholderUtil.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/PlaceholderUtil.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.util;
+package com.cloud.kicc.system.bigscreen.util;
import java.util.Map;
import java.util.Properties;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/RequestUtil.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/RequestUtil.java
similarity index 98%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/RequestUtil.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/RequestUtil.java
index d1c4254e..7ec308d5 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/util/RequestUtil.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/RequestUtil.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.util;
+package com.cloud.kicc.system.bigscreen.util;
import cn.hutool.core.util.StrUtil;
import com.cloud.kicc.common.core.constant.StringPool;
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/config/ReportConfiguration.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/config/ReportConfiguration.java
new file mode 100644
index 00000000..c7de297e
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/config/ReportConfiguration.java
@@ -0,0 +1,63 @@
+package com.cloud.kicc.system.report.config;
+
+import com.bstek.ureport.UReportPropertyPlaceholderConfigurer;
+import com.bstek.ureport.console.UReportServlet;
+import com.bstek.ureport.provider.report.ReportProvider;
+import com.cloud.kicc.system.report.datasource.ReportDataSource;
+import com.cloud.kicc.system.report.props.ReportDatabaseProperties;
+import com.cloud.kicc.system.report.props.ReportProperties;
+import com.cloud.kicc.system.report.provider.DatabaseProvider;
+import com.cloud.kicc.system.report.provider.ReportPlaceholderProvider;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.core.annotation.Order;
+
+import javax.servlet.Servlet;
+import javax.sql.DataSource;
+
+/**
+ *
+ * UReport配置类øø
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Order
+@Configuration
+@ConditionalOnProperty(value = "report.enabled", havingValue = "true", matchIfMissing = true)
+@EnableConfigurationProperties({ReportProperties.class, ReportDatabaseProperties.class})
+@ImportResource("classpath:ureport-console-context.xml")
+public class ReportConfiguration {
+
+ @Bean
+ public ServletRegistrationBean registrationBean() {
+ return new ServletRegistrationBean<>(new UReportServlet(), "/ureport/*");
+ }
+
+ @Bean
+ public UReportPropertyPlaceholderConfigurer uReportPropertyPlaceholderConfigurer(ReportProperties properties) {
+ return new ReportPlaceholderProvider(properties);
+ }
+
+ @Bean
+ @ConditionalOnMissingBean
+ public ReportProvider reportProvider(ReportDatabaseProperties properties, IReportFileService service) {
+ return new DatabaseProvider(properties, service);
+ }
+
+ /**
+ * 自定义报表可选数据源
+ */
+ @Bean
+ public ReportDataSource reportDataSource(DataSource dataSource) {
+ return new ReportDataSource(dataSource);
+ }
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/datasource/ReportDataSource.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/datasource/ReportDataSource.java
new file mode 100644
index 00000000..ec3ab913
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/datasource/ReportDataSource.java
@@ -0,0 +1,42 @@
+package com.cloud.kicc.system.report.datasource;
+
+import com.bstek.ureport.definition.datasource.BuildinDatasource;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ *
+ * UReport数据源配置
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Slf4j
+@AllArgsConstructor
+public class ReportDataSource implements BuildinDatasource {
+ private static final String NAME = "ReportDataSource";
+
+ private final DataSource dataSource;
+
+ @Override
+ public String name() {
+ return NAME;
+ }
+
+ @Override
+ public Connection getConnection() {
+ try {
+ return dataSource.getConnection();
+ } catch (SQLException e) {
+ log.error("report数据源链接失败");
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/endpoint/ReportEndpoint.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/endpoint/ReportEndpoint.java
new file mode 100644
index 00000000..06b51729
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/endpoint/ReportEndpoint.java
@@ -0,0 +1,61 @@
+package com.cloud.kicc.system.report.endpoint;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ *
+ * UReport API端点
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@ApiIgnore
+@RestController
+@AllArgsConstructor
+@RequestMapping(AppConstants.APP_SYSTEM + "/report/rest")
+public class ReportEndpoint {
+
+ private final IReportFileService service;
+
+ /**
+ * 详情
+ */
+ @GetMapping("/detail")
+ public R detail(ReportFileEntity file) {
+ ReportFileEntity detail = service.getOne(Wrappers.lambdaQuery());
+ return R.ok(detail);
+ }
+
+ /**
+ * 分页
+ */
+ @GetMapping("/list")
+ public R> list(Page page, @RequestParam Map file) {
+ IPage pages = service.page(page, Wrappers.lambdaQuery());
+ return R.ok(pages);
+ }
+
+ /**
+ * 删除
+ */
+ @PostMapping("/remove")
+ public R remove(@RequestParam String ids) {
+ boolean temp = service.removeByIds(Arrays.asList(StrUtil.join(",", ids)));
+ return R.ok(temp);
+ }
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/entity/ReportFileEntity.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/entity/ReportFileEntity.java
new file mode 100644
index 00000000..45bf3891
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/entity/ReportFileEntity.java
@@ -0,0 +1,39 @@
+package com.cloud.kicc.system.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * UReport实体类
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Data
+@TableName("sys_report_file")
+public class ReportFileEntity extends CommonEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 文件名
+ */
+ private String name;
+ /**
+ * 文件内容
+ */
+ private byte[] content;
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/mapper/ReportFileMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/mapper/ReportFileMapper.java
new file mode 100644
index 00000000..b5dceeb2
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/mapper/ReportFileMapper.java
@@ -0,0 +1,15 @@
+package com.cloud.kicc.system.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+
+/**
+ *
+ * UReport Mapper
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+public interface ReportFileMapper extends BaseMapper {
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportDatabaseProperties.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportDatabaseProperties.java
new file mode 100644
index 00000000..723f2a96
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportDatabaseProperties.java
@@ -0,0 +1,20 @@
+package com.cloud.kicc.system.report.props;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ *
+ * UReport配置类
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Data
+@ConfigurationProperties(prefix = "report.database.provider")
+public class ReportDatabaseProperties {
+ private String name = "数据库文件系统";
+ private String prefix = "kicc-";
+ private boolean disabled = false;
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportProperties.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportProperties.java
new file mode 100644
index 00000000..1ae16c0f
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportProperties.java
@@ -0,0 +1,23 @@
+package com.cloud.kicc.system.report.props;
+
+import com.cloud.kicc.common.core.constant.StringPool;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ *
+ * UReport配置类
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Data
+@ConfigurationProperties(prefix = "report")
+public class ReportProperties {
+ private Boolean enabled = true;
+ private Boolean disableHttpSessionReportCache = false;
+ private Boolean disableFileProvider = true;
+ private String fileStoreDir = StringPool.EMPTY;
+ private Boolean debug = false;
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/DatabaseProvider.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/DatabaseProvider.java
new file mode 100644
index 00000000..3121b91a
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/DatabaseProvider.java
@@ -0,0 +1,94 @@
+package com.cloud.kicc.system.report.provider;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bstek.ureport.provider.report.ReportFile;
+import com.bstek.ureport.provider.report.ReportProvider;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+import com.cloud.kicc.system.report.props.ReportDatabaseProperties;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import lombok.AllArgsConstructor;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 数据库文件处理
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@AllArgsConstructor
+public class DatabaseProvider implements ReportProvider {
+
+ private final ReportDatabaseProperties properties;
+ private final IReportFileService service;
+
+ @Override
+ public InputStream loadReport(String file) {
+ ReportFileEntity reportFileEntity = service.getOne(Wrappers.lambdaQuery().eq(ReportFileEntity::getName, getFileName(file)));
+ byte[] content = reportFileEntity.getContent();
+ return new ByteArrayInputStream(content);
+ }
+
+ @Override
+ public void deleteReport(String file) {
+ service.remove(Wrappers.lambdaUpdate().eq(ReportFileEntity::getName, getFileName(file)));
+ }
+
+ @Override
+ public List getReportFiles() {
+ List list = service.list();
+ List reportFiles = new ArrayList<>();
+ list.forEach(reportFileEntity -> reportFiles.add(new ReportFile(reportFileEntity.getName(),
+ Date.from(reportFileEntity.getUpdateTime().toInstant(OffsetDateTime.now().getOffset())))));
+ return reportFiles;
+ }
+
+ @Override
+ public void saveReport(String file, String content) {
+ String fileName = getFileName(file);
+ ReportFileEntity reportFileEntity = service.getOne(Wrappers.lambdaQuery().eq(ReportFileEntity::getName, fileName));
+ if (reportFileEntity == null) {
+ reportFileEntity = new ReportFileEntity();
+ reportFileEntity.setName(fileName);
+ reportFileEntity.setContent(content.getBytes());
+ } else {
+ reportFileEntity.setContent(content.getBytes());
+ }
+ service.saveOrUpdate(reportFileEntity);
+ }
+
+ @Override
+ public String getName() {
+ return properties.getName();
+ }
+
+ @Override
+ public boolean disabled() {
+ return properties.isDisabled();
+ }
+
+ @Override
+ public String getPrefix() {
+ return properties.getPrefix();
+ }
+
+ /**
+ * 获取标准格式文件名
+ *
+ * @param name 原文件名
+ */
+ private String getFileName(String name) {
+ if (name.startsWith(getPrefix())) {
+ name = name.substring(getPrefix().length());
+ }
+ return name;
+ }
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/ReportPlaceholderProvider.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/ReportPlaceholderProvider.java
new file mode 100644
index 00000000..8b6a4fd7
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/ReportPlaceholderProvider.java
@@ -0,0 +1,27 @@
+package com.cloud.kicc.system.report.provider;
+
+import com.bstek.ureport.UReportPropertyPlaceholderConfigurer;
+import com.cloud.kicc.system.report.props.ReportProperties;
+
+import java.util.Properties;
+
+/**
+ *
+ * UReport自定义配置
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+public class ReportPlaceholderProvider extends UReportPropertyPlaceholderConfigurer {
+
+ public ReportPlaceholderProvider(ReportProperties properties) {
+ Properties props = new Properties();
+ props.setProperty("ureport.disableHttpSessionReportCache", properties.getDisableHttpSessionReportCache().toString());
+ props.setProperty("ureport.disableFileProvider", properties.getDisableFileProvider().toString());
+ props.setProperty("ureport.fileStoreDir", properties.getFileStoreDir());
+ props.setProperty("ureport.debug", properties.getDebug().toString());
+ this.setProperties(props);
+ }
+
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/IReportFileService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/IReportFileService.java
new file mode 100644
index 00000000..13bc45b5
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/IReportFileService.java
@@ -0,0 +1,15 @@
+package com.cloud.kicc.system.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+
+/**
+ *
+ * UReport Service
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+public interface IReportFileService extends IService {
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/impl/ReportFileServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/impl/ReportFileServiceImpl.java
new file mode 100644
index 00000000..b98df190
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/impl/ReportFileServiceImpl.java
@@ -0,0 +1,19 @@
+package com.cloud.kicc.system.report.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+import com.cloud.kicc.system.report.mapper.ReportFileMapper;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * UReport Service
+ *
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Service
+public class ReportFileServiceImpl extends ServiceImpl implements IReportFileService {
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/cmd/RollBackUserTaskCmd.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java
similarity index 99%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/cmd/RollBackUserTaskCmd.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java
index 707a04ea..d456dcff 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/cmd/RollBackUserTaskCmd.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java
@@ -1,7 +1,7 @@
-package com.cloud.kicc.commonbiz.workflow.cmd;
+package com.cloud.kicc.system.workflow.cmd;
import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant;
-import com.cloud.kicc.commonbiz.workflow.util.WorkflowUtil;
+import com.cloud.kicc.system.workflow.util.WorkflowUtil;
import org.apache.commons.compress.utils.Sets;
import org.flowable.bpmn.model.FlowNode;
import org.flowable.bpmn.model.Process;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/FlowableConfig.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java
similarity index 94%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/FlowableConfig.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java
index 3cd5376e..a210b0ad 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/FlowableConfig.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java
@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.config;
+package com.cloud.kicc.system.workflow.config;
-import com.cloud.kicc.commonbiz.workflow.parser.factory.WorkflowActivityBehaviorFactory;
+import com.cloud.kicc.system.workflow.parser.factory.WorkflowActivityBehaviorFactory;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.flowable.spring.boot.EngineConfigurationConfigurer;
import org.flowable.spring.boot.FlowableProperties;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/LiquibaseConfig.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java
similarity index 96%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/LiquibaseConfig.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java
index 1feea7f8..e81eb49a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/LiquibaseConfig.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.config;
+package com.cloud.kicc.system.workflow.config;
import liquibase.Liquibase;
import liquibase.database.Database;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/WebMvcConfig.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java
similarity index 81%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/WebMvcConfig.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java
index dc0d02b8..1be346a1 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/config/WebMvcConfig.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java
@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.config;
+package com.cloud.kicc.system.workflow.config;
-import com.cloud.kicc.commonbiz.workflow.interceptor.ModelHandlerInterceptor;
+import com.cloud.kicc.system.workflow.interceptor.ModelHandlerInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowFormController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java
similarity index 97%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowFormController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java
index 92871b58..8b62be05 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowFormController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
@@ -7,7 +7,7 @@ import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant;
import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowTaskService;
+import com.cloud.kicc.system.workflow.service.WorkflowTaskService;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
@@ -37,7 +37,7 @@ import java.util.Map;
* @Date: 2022/1/4
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/form")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/form")
@AllArgsConstructor
public class WorkflowFormController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowModelController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java
similarity index 98%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowModelController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java
index 737f0a6f..deb81e22 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowModelController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
@@ -13,8 +13,8 @@ import com.cloud.kicc.common.data.entity.KiccUser;
import com.cloud.kicc.common.security.exception.ServerErrorException;
import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowModelService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.service.WorkflowModelService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.AllArgsConstructor;
@@ -55,7 +55,7 @@ import java.util.UUID;
*/
@Slf4j
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/model")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/model")
@AllArgsConstructor
public class WorkflowModelController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowProcessController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java
similarity index 96%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowProcessController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java
index 6bf3bea9..85dcd5ef 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowProcessController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
import cn.hutool.core.io.IoUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -10,8 +10,8 @@ import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo;
-import com.cloud.kicc.commonbiz.workflow.extension.service.WorkflowCopyService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
@@ -38,7 +38,7 @@ import java.util.Map;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/process")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/process")
public class WorkflowProcessController {
private final TaskService taskService;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowTaskController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java
similarity index 96%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowTaskController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java
index 423b23a0..2d392719 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/controller/WorkflowTaskController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
@@ -13,9 +13,9 @@ import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionP
import com.cloud.kicc.commonbiz.api.workflow.vo.ActivityCommentInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.HistoryTaskInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowTaskService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.service.WorkflowTaskService;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.common.engine.impl.identity.Authentication;
@@ -39,7 +39,7 @@ import java.util.Map;
*/
@RestController
@AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/task")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/task")
public class WorkflowTaskController {
private final WorkflowTaskService workflowTaskService;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ActivityExtensionDataController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ActivityExtensionDataController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java
index c4096c0f..79653717 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ActivityExtensionDataController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@ import java.util.List;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/activityExtensionData")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/activityExtensionData")
@AllArgsConstructor
public class ActivityExtensionDataController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ActivityExtensionPropertyController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ActivityExtensionPropertyController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java
index 9605613d..bc376900 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ActivityExtensionPropertyController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@ import java.util.List;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/activityExtensionProperty")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/activityExtensionProperty")
@AllArgsConstructor
public class ActivityExtensionPropertyController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ButtonController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java
similarity index 90%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ButtonController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java
index 5db81381..8150bd69 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ButtonController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ButtonService;
+import com.cloud.kicc.system.workflow.extension.service.ButtonService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import java.util.Arrays;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/button")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/button")
@AllArgsConstructor
public class ButtonController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/CategoryController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java
similarity index 88%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/CategoryController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java
index d91fc583..4b926aea 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/CategoryController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;
-import com.cloud.kicc.commonbiz.workflow.extension.service.CategoryService;
+import com.cloud.kicc.system.workflow.extension.service.CategoryService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,7 @@ import java.util.List;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/category")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/category")
@AllArgsConstructor
public class CategoryController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ConditionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java
similarity index 90%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ConditionController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java
index 059b963e..e63afe0d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ConditionController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ConditionService;
+import com.cloud.kicc.system.workflow.extension.service.ConditionService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@ import java.util.Arrays;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/condition")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/condition")
@AllArgsConstructor
public class ConditionController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java
similarity index 86%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormCategoryController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java
index 87eaf70e..3c6abb4d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormCategoryController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormCategoryService;
+import com.cloud.kicc.system.workflow.extension.service.FormCategoryService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@ import java.util.List;
* @Date: 2021/12/3
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/formCategory")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/formCategory")
@AllArgsConstructor
public class FormCategoryController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormDefinitionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java
similarity index 88%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormDefinitionController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java
index 9e3cef68..e4a5ad79 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormDefinitionController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinition;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionService;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,7 @@ import java.util.Arrays;
* @Date: 2021/12/4
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/formDefinition")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/formDefinition")
@AllArgsConstructor
public class FormDefinitionController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormDefinitionJsonController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java
similarity index 95%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormDefinitionJsonController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java
index dba6edba..53975fca 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/FormDefinitionJsonController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionJsonService;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionJsonService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@ import java.util.Arrays;
* @Date: 2021/12/4
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/formDefinitionJson")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/formDefinitionJson")
@AllArgsConstructor
public class FormDefinitionJsonController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ListenerController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java
similarity index 90%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ListenerController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java
index b4526a6b..d0c64a8f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/ListenerController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ListenerService;
+import com.cloud.kicc.system.workflow.extension.service.ListenerService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@ import java.util.Arrays;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/listener")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/listener")
@AllArgsConstructor
public class ListenerController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/WorkflowCopyController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java
similarity index 89%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/WorkflowCopyController.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java
index bac8df49..ba9568e7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/controller/WorkflowCopyController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,7 +6,7 @@ import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy;
-import com.cloud.kicc.commonbiz.workflow.extension.service.WorkflowCopyService;
+import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,7 +21,7 @@ import java.util.Arrays;
* @Date: 2021/5/13
*/
@RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/workflowCopy")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/workflowCopy")
@AllArgsConstructor
public class WorkflowCopyController {
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ActivityExtensionDataMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ActivityExtensionDataMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java
index 5e32b0d0..8efb66a4 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ActivityExtensionDataMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ActivityExtensionPropertyMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ActivityExtensionPropertyMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java
index 0192ce02..318b1f6d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ActivityExtensionPropertyMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ButtonMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ButtonMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java
index 5ce6755f..cc0016dd 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ButtonMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/CategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/CategoryMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java
index acf9cfa9..7ebba909 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/CategoryMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ConditionMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ConditionMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java
index 9cb9ede3..23aea17c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ConditionMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormCategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java
similarity index 84%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormCategoryMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java
index 63f7f9ac..39ee9adb 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormCategoryMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormDefinitionJsonMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java
similarity index 87%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormDefinitionJsonMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java
index 08ed160c..517ca687 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormDefinitionJsonMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormDefinitionMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java
similarity index 94%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormDefinitionMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java
index 89c22603..e60af7c1 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/FormDefinitionMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ListenerMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ListenerMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java
index 861265b0..a8f41652 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/ListenerMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowAssigneeMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java
similarity index 84%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowAssigneeMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java
index 08dc1309..e99c9178 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowAssigneeMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowButtonMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java
similarity index 84%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowButtonMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java
index 025fb970..594c76a7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowButtonMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowConditionMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowConditionMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java
index 5cbeccae..eb5fa66a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowConditionMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowCopyMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java
similarity index 90%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowCopyMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java
index 9bfac5af..41d765d7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/mapper/WorkflowCopyMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ActivityExtensionDataService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java
similarity index 88%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ActivityExtensionDataService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java
index cb94a139..1a39e2a8 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ActivityExtensionDataService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ActivityExtensionPropertyService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ActivityExtensionPropertyService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java
index d6124577..b9424eac 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ActivityExtensionPropertyService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ButtonService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ButtonService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java
index 692b4d59..4730900b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ButtonService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/CategoryService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/CategoryService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java
index 51bc70c4..46509d77 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/CategoryService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ConditionService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ConditionService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java
index 2e2bd748..5f1444a9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ConditionService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormCategoryService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java
similarity index 84%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormCategoryService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java
index b7703507..4dbc1a03 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormCategoryService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormDefinitionJsonService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java
similarity index 87%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormDefinitionJsonService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java
index 2f91cd82..333bf373 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormDefinitionJsonService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormDefinitionService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java
similarity index 89%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormDefinitionService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java
index 2d643288..18823e6d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/FormDefinitionService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ListenerService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java
similarity index 83%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ListenerService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java
index 67f8863f..ca6e7214 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/ListenerService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/WorkflowCopyService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java
similarity index 89%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/WorkflowCopyService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java
index 1f159521..efffff1b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/WorkflowCopyService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java
similarity index 90%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java
index c19d7439..6c2166f5 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -7,11 +7,11 @@ import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionD
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ActivityExtensionDataMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowAssigneeMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowButtonMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowConditionMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.mapper.ActivityExtensionDataMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowAssigneeMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowButtonMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowConditionMapper;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java
similarity index 69%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java
index 3d5da973..84160388 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ActivityExtensionPropertyMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.extension.mapper.ActivityExtensionPropertyMapper;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ButtonServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java
similarity index 65%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ButtonServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java
index 90391cd4..5708fb2c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ButtonServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ButtonMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ButtonService;
+import com.cloud.kicc.system.workflow.extension.mapper.ButtonMapper;
+import com.cloud.kicc.system.workflow.extension.service.ButtonService;
import org.springframework.stereotype.Service;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/CategoryServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java
similarity index 66%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/CategoryServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java
index b02a6a23..21c3d636 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/CategoryServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.CategoryMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.CategoryService;
+import com.cloud.kicc.system.workflow.extension.mapper.CategoryMapper;
+import com.cloud.kicc.system.workflow.extension.service.CategoryService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ConditionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java
similarity index 66%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ConditionServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java
index 68c87757..498055a3 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ConditionServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ConditionMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ConditionService;
+import com.cloud.kicc.system.workflow.extension.mapper.ConditionMapper;
+import com.cloud.kicc.system.workflow.extension.service.ConditionService;
import org.springframework.stereotype.Service;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormCategoryServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java
similarity index 66%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormCategoryServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java
index 3ef88f24..2fc1439d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormCategoryServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.FormCategoryMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormCategoryService;
+import com.cloud.kicc.system.workflow.extension.mapper.FormCategoryMapper;
+import com.cloud.kicc.system.workflow.extension.service.FormCategoryService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java
similarity index 72%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java
index 4258a23e..97b90189 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.FormDefinitionJsonMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionJsonService;
+import com.cloud.kicc.system.workflow.extension.mapper.FormDefinitionJsonMapper;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionJsonService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormDefinitionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionServiceImpl.java
similarity index 76%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormDefinitionServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionServiceImpl.java
index 87c28a54..6904c4e0 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/FormDefinitionServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinition;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.FormDefinitionMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionService;
+import com.cloud.kicc.system.workflow.extension.mapper.FormDefinitionMapper;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionService;
import org.springframework.stereotype.Service;
/**
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ListenerServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ListenerServiceImpl.java
similarity index 65%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ListenerServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ListenerServiceImpl.java
index 24920f08..60fcbd8f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/ListenerServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ListenerServiceImpl.java
@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ListenerMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ListenerService;
+import com.cloud.kicc.system.workflow.extension.mapper.ListenerMapper;
+import com.cloud.kicc.system.workflow.extension.service.ListenerService;
import org.springframework.stereotype.Service;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/WorkflowCopyServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/WorkflowCopyServiceImpl.java
similarity index 76%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/WorkflowCopyServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/WorkflowCopyServiceImpl.java
index 323613f3..8f530a4f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/extension/service/impl/WorkflowCopyServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/WorkflowCopyServiceImpl.java
@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowCopyMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.WorkflowCopyService;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowCopyMapper;
+import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService;
import org.springframework.stereotype.Service;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/interceptor/ModelHandlerInterceptor.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/interceptor/ModelHandlerInterceptor.java
similarity index 95%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/interceptor/ModelHandlerInterceptor.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/interceptor/ModelHandlerInterceptor.java
index 2f81a20e..b4473200 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/interceptor/ModelHandlerInterceptor.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/interceptor/ModelHandlerInterceptor.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.interceptor;
+package com.cloud.kicc.system.workflow.interceptor;
import cn.hutool.core.util.StrUtil;
import com.cloud.kicc.common.data.entity.KiccUser;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/listener/MyExecutionListener.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/listener/MyExecutionListener.java
similarity index 93%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/listener/MyExecutionListener.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/listener/MyExecutionListener.java
index 4edd923b..8c7f9417 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/listener/MyExecutionListener.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/listener/MyExecutionListener.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.listener;
+package com.cloud.kicc.system.workflow.listener;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/mapper/WorkflowMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/mapper/WorkflowMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowMapper.java
index e399e8e6..d1ba3977 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/mapper/WorkflowMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.mapper;
+package com.cloud.kicc.system.workflow.mapper;
import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/mapper/WorkflowModelMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowModelMapper.java
similarity index 85%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/mapper/WorkflowModelMapper.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowModelMapper.java
index 980ef102..33c6672f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/mapper/WorkflowModelMapper.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowModelMapper.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.mapper;
+package com.cloud.kicc.system.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/FlowableModelService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/FlowableModelService.java
similarity index 99%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/FlowableModelService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/FlowableModelService.java
index 70f185af..b1152ded 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/FlowableModelService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/FlowableModelService.java
@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.override;
+package com.cloud.kicc.system.workflow.override;
-import com.cloud.kicc.commonbiz.workflow.override.json.FlowableBpmnJsonConverter;
+import com.cloud.kicc.system.workflow.override.json.FlowableBpmnJsonConverter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -53,7 +53,7 @@ public class FlowableModelService extends ModelServiceImpl {
if (model == null) {
NotFoundException modelNotFound = new NotFoundException("No model found with the given id: " + modelId);
- modelNotFound.setMessageKey(PROCESS_NOT_FOUND_MESSAGE_KEY);
+ modelNotFound.setMessageKey(ModelServiceImpl.PROCESS_NOT_FOUND_MESSAGE_KEY);
throw modelNotFound;
}
@@ -595,7 +595,7 @@ public class FlowableModelService extends ModelServiceImpl {
} else {
extensionElement = new ExtensionElement();
}
- extensionElement.setNamespace(NAMESPACE);
+ extensionElement.setNamespace(ModelServiceImpl.NAMESPACE);
extensionElement.setNamespacePrefix("modeler");
extensionElement.setName(name);
extensionElement.setElementText(value);
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableBpmnJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableBpmnJsonConverter.java
new file mode 100644
index 00000000..6fd6c984
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableBpmnJsonConverter.java
@@ -0,0 +1,25 @@
+package com.cloud.kicc.system.workflow.override.json;
+
+import org.flowable.bpmn.model.SequenceFlow;
+import org.flowable.bpmn.model.StartEvent;
+import org.flowable.bpmn.model.UserTask;
+import org.flowable.editor.constants.StencilConstants;
+import org.flowable.editor.language.json.converter.BpmnJsonConverter;
+
+public class FlowableBpmnJsonConverter extends BpmnJsonConverter {
+ static {
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_SEQUENCE_FLOW, FlowableSequenceFlowJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_TASK_USER, FlowableUserTaskJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_NONE, FlowableStartEventJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_TIMER, FlowableStartEventJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_CONDITIONAL, FlowableStartEventJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_ERROR, FlowableStartEventJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_ESCALATION, FlowableStartEventJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_MESSAGE, FlowableStartEventJsonConverter.class);
+ BpmnJsonConverter.convertersToBpmnMap.put(StencilConstants.STENCIL_EVENT_START_SIGNAL, FlowableStartEventJsonConverter.class);
+
+ BpmnJsonConverter.convertersToJsonMap.put(SequenceFlow.class, FlowableSequenceFlowJsonConverter.class);
+ BpmnJsonConverter.convertersToJsonMap.put(UserTask.class, FlowableUserTaskJsonConverter.class);
+ BpmnJsonConverter.convertersToJsonMap.put(StartEvent.class, FlowableStartEventJsonConverter.class);
+ }
+}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableSequenceFlowJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableSequenceFlowJsonConverter.java
similarity index 94%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableSequenceFlowJsonConverter.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableSequenceFlowJsonConverter.java
index ce02f9a0..350ca146 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableSequenceFlowJsonConverter.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableSequenceFlowJsonConverter.java
@@ -1,12 +1,12 @@
-package com.cloud.kicc.commonbiz.workflow.override.json;
+package com.cloud.kicc.system.workflow.override.json;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cloud.kicc.common.core.util.SpringContextHolderUtil;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
import com.fasterxml.jackson.databind.JsonNode;
import org.flowable.bpmn.model.ExtensionAttribute;
import org.flowable.bpmn.model.ExtensionElement;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableStartEventJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableStartEventJsonConverter.java
similarity index 97%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableStartEventJsonConverter.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableStartEventJsonConverter.java
index 0c24c789..2c17c3df 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableStartEventJsonConverter.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableStartEventJsonConverter.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.override.json;
+package com.cloud.kicc.system.workflow.override.json;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableUserTaskJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableUserTaskJsonConverter.java
similarity index 99%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableUserTaskJsonConverter.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableUserTaskJsonConverter.java
index e1ee3dd1..24b7163b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/override/json/FlowableUserTaskJsonConverter.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableUserTaskJsonConverter.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.override.json;
+package com.cloud.kicc.system.workflow.override.json;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/factory/WorkflowActivityBehaviorFactory.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/factory/WorkflowActivityBehaviorFactory.java
similarity index 78%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/factory/WorkflowActivityBehaviorFactory.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/factory/WorkflowActivityBehaviorFactory.java
index 0da20e67..c4e20382 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/factory/WorkflowActivityBehaviorFactory.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/factory/WorkflowActivityBehaviorFactory.java
@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.parser.factory;
+package com.cloud.kicc.system.workflow.parser.factory;
-import com.cloud.kicc.commonbiz.workflow.parser.handler.ExtendUserTaskActivityBehavior;
+import com.cloud.kicc.system.workflow.parser.handler.ExtendUserTaskActivityBehavior;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.impl.bpmn.parser.factory.DefaultActivityBehaviorFactory;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/handler/ExtendUserTaskActivityBehavior.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/ExtendUserTaskActivityBehavior.java
similarity index 97%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/handler/ExtendUserTaskActivityBehavior.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/ExtendUserTaskActivityBehavior.java
index 9b7d0618..19522be7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/handler/ExtendUserTaskActivityBehavior.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/ExtendUserTaskActivityBehavior.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.parser.handler;
+package com.cloud.kicc.system.workflow.parser.handler;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
@@ -9,8 +9,8 @@ import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.workflow.constant.SqlConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
-import com.cloud.kicc.commonbiz.workflow.util.WorkflowUtil;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.util.WorkflowUtil;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.UserTask;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/handler/MultiInstanceHandler.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/MultiInstanceHandler.java
similarity index 97%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/handler/MultiInstanceHandler.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/MultiInstanceHandler.java
index eb013ca0..5e54a0c4 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/parser/handler/MultiInstanceHandler.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/MultiInstanceHandler.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.parser.handler;
+package com.cloud.kicc.system.workflow.parser.handler;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
@@ -8,7 +8,7 @@ import com.cloud.kicc.common.security.util.SecurityUtils;
import com.cloud.kicc.commonbiz.api.workflow.constant.SqlConstants;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
import org.flowable.bpmn.model.Process;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RepositoryService;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowBpmnModelService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowBpmnModelService.java
similarity index 91%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowBpmnModelService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowBpmnModelService.java
index 333872bf..0a0a4fda 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowBpmnModelService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowBpmnModelService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.service;
+package com.cloud.kicc.system.workflow.service;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.EndEvent;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowModelService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowModelService.java
similarity index 94%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowModelService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowModelService.java
index 4fc49713..6acfb295 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowModelService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowModelService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.service;
+package com.cloud.kicc.system.workflow.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowProcessService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowProcessService.java
similarity index 98%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowProcessService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowProcessService.java
index 86155aae..8db2b7e9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowProcessService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowProcessService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.service;
+package com.cloud.kicc.system.workflow.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowTaskService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowTaskService.java
similarity index 97%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowTaskService.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowTaskService.java
index 66c4ac3b..1960b8ce 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/WorkflowTaskService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowTaskService.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.service;
+package com.cloud.kicc.system.workflow.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowBpmnModelServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowBpmnModelServiceImpl.java
similarity index 88%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowBpmnModelServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowBpmnModelServiceImpl.java
index fdf18144..29734d57 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowBpmnModelServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowBpmnModelServiceImpl.java
@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.service.impl;
+package com.cloud.kicc.system.workflow.service.impl;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowBpmnModelService;
+import com.cloud.kicc.system.workflow.service.WorkflowBpmnModelService;
import lombok.AllArgsConstructor;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.EndEvent;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowModelServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowModelServiceImpl.java
similarity index 93%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowModelServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowModelServiceImpl.java
index 1b99a0ad..ae572aa2 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowModelServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowModelServiceImpl.java
@@ -1,15 +1,15 @@
-package com.cloud.kicc.commonbiz.workflow.service.impl;
+package com.cloud.kicc.system.workflow.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel;
import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
-import com.cloud.kicc.commonbiz.workflow.mapper.WorkflowModelMapper;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowModelService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.mapper.WorkflowModelMapper;
+import com.cloud.kicc.system.workflow.service.WorkflowModelService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowProcessServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowProcessServiceImpl.java
similarity index 98%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowProcessServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowProcessServiceImpl.java
index 225edf53..289219c5 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowProcessServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowProcessServiceImpl.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.service.impl;
+package com.cloud.kicc.system.workflow.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
@@ -17,10 +17,10 @@ import com.cloud.kicc.commonbiz.api.workflow.vo.ActivityCommentInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.TaskInfoVo;
-import com.cloud.kicc.commonbiz.workflow.mapper.WorkflowMapper;
-import com.cloud.kicc.commonbiz.workflow.mapper.WorkflowModelMapper;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowBpmnModelService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.mapper.WorkflowMapper;
+import com.cloud.kicc.system.workflow.mapper.WorkflowModelMapper;
+import com.cloud.kicc.system.workflow.service.WorkflowBpmnModelService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
import lombok.AllArgsConstructor;
import org.flowable.bpmn.constants.BpmnXMLConstants;
import org.flowable.bpmn.model.EndEvent;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowTaskServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowTaskServiceImpl.java
similarity index 98%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowTaskServiceImpl.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowTaskServiceImpl.java
index 2b706e10..0c47f167 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/service/impl/WorkflowTaskServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowTaskServiceImpl.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.service.impl;
+package com.cloud.kicc.system.workflow.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil;
@@ -15,10 +15,10 @@ import com.cloud.kicc.commonbiz.api.workflow.vo.ActivityCommentInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.HistoryTaskInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo;
import com.cloud.kicc.commonbiz.api.workflow.vo.TaskInfoVo;
-import com.cloud.kicc.commonbiz.workflow.cmd.RollBackUserTaskCmd;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowTaskService;
-import com.cloud.kicc.commonbiz.workflow.util.WorkflowUtil;
+import com.cloud.kicc.system.workflow.cmd.RollBackUserTaskCmd;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.service.WorkflowTaskService;
+import com.cloud.kicc.system.workflow.util.WorkflowUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.constants.BpmnXMLConstants;
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/util/WorkflowUtil.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/util/WorkflowUtil.java
similarity index 99%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/util/WorkflowUtil.java
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/util/WorkflowUtil.java
index ace69adb..9a4545b4 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/workflow/util/WorkflowUtil.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/util/WorkflowUtil.java
@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.util;
+package com.cloud.kicc.system.workflow.util;
import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant;
import lombok.experimental.UtilityClass;
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
index eea2f501..cbe3e039 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
@@ -11,8 +11,8 @@ spring:
cloud:
nacos:
discovery:
- ip: @profiles.ip@
#server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+ ip: @profiles.ip@
server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@
config:
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml
similarity index 86%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml
index b4498f14..56c007b9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml
similarity index 86%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml
index ae3dffaa..a0e491b6 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml
similarity index 86%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml
index c5e42b62..a94bd8bf 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml
similarity index 95%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml
index daf6c661..7e8c23d7 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml
similarity index 87%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml
index ec72bc7b..0896921b 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml
similarity index 92%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml
index e88768ec..e0d753cb 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml
similarity index 96%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml
index a518506a..3b5c1f74 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml
similarity index 80%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml
index 52055e5c..383b5457 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml
@@ -1,6 +1,6 @@
-
+
UPDATE ${businessTable} SET process_ins_id = #{processInsId} WHERE id = #{businessId}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml
similarity index 65%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml
index 247b116a..762667a6 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml
new file mode 100644
index 00000000..991aab6e
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml
similarity index 61%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml
index 42eeadfc..a290e14d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml
similarity index 65%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml
index b4aab786..f7caf977 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml
similarity index 64%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml
index ea02d4bd..1a493f8c 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml
new file mode 100644
index 00000000..e5a3524d
--- /dev/null
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormCategoryMapper.xml
similarity index 64%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormCategoryMapper.xml
index b8836e47..3fc8f7db 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormCategoryMapper.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml
similarity index 79%
rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml
rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml
index 3313eccd..26d9e03a 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml
@@ -1,7 +1,7 @@
-
+