diff --git a/docker-cloud/docker-compose.yml b/docker-cloud/docker-compose.yml index 44ba2bf4..22ac3080 100644 --- a/docker-cloud/docker-compose.yml +++ b/docker-cloud/docker-compose.yml @@ -101,6 +101,32 @@ services: ports: - 6000:6000 + # report-biz配置 + kicc-report-biz: + build: + context: ../kicc-platform/kicc-platform-biz/kicc-report-biz + container_name: kicc-report + environment: + GATEWAY_HOST: 192.168.3.10 + image: kicc-report-biz + hostname: kicc-report + restart: always + ports: + - 8108:8108 + + # workflow-biz配置 + kicc-workflow-biz: + build: + context: ../kicc-platform/kicc-platform-biz/kicc-workflow-biz + container_name: kicc-workflow + environment: + GATEWAY_HOST: 192.168.3.10 + image: kicc-workflow-biz + hostname: kicc-workflow + restart: always + ports: + - 8109:8109 + # 新建业务工程docker-compose模板 # 注释命名规范:【xxx-biz】 # 名称命名规范:【kicc-xxx】 diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/pom.xml b/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/pom.xml index 403e2d7f..8fc00c51 100644 --- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/pom.xml +++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/pom.xml @@ -29,10 +29,6 @@ com.cloud kicc-common-data - - org.springframework - spring-webmvc - diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/pom.xml b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/pom.xml index 1977aab9..ac1bf950 100644 --- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/pom.xml +++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/pom.xml @@ -29,10 +29,6 @@ com.cloud kicc-common-data - - org.springframework - spring-webmvc - diff --git a/kicc-common/kicc-common-bom/pom.xml b/kicc-common/kicc-common-bom/pom.xml index 1498a7f6..3f4e1825 100644 --- a/kicc-common/kicc-common-bom/pom.xml +++ b/kicc-common/kicc-common-bom/pom.xml @@ -108,6 +108,16 @@ kicc-monitor-api ${kicc.common.version} + + com.cloud + kicc-report-api + ${kicc.common.version} + + + com.cloud + kicc-workflow-api + ${kicc.common.version} + com.cloud kicc-template-api diff --git a/kicc-common/kicc-common-data/pom.xml b/kicc-common/kicc-common-data/pom.xml index d504ca96..2d2ec56c 100644 --- a/kicc-common/kicc-common-data/pom.xml +++ b/kicc-common/kicc-common-data/pom.xml @@ -58,6 +58,11 @@ org.postgresql postgresql --> + + + org.springframework + spring-webmvc + org.springframework.security diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml index 15b2ad8c..d2db57ba 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml +++ b/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml @@ -29,9 +29,5 @@ com.cloud kicc-common-data - - org.flowable - flowable-spring-boot-starter-process-rest - diff --git a/kicc-platform/kicc-platform-api/kicc-report-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-report-api/pom.xml new file mode 100644 index 00000000..d07a5f72 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-report-api/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + com.cloud + kicc-platform-api + 1.0.0 + + + kicc-report-api + jar + + kicc 报表api模块 + + + + + com.cloud + kicc-common-feign + + + + com.cloud + kicc-common-data + + + diff --git a/kicc-platform/kicc-platform-api/kicc-report-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-report-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9d486397 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-report-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/DynamicModelDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/DynamicModelDto.java similarity index 81% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/DynamicModelDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/DynamicModelDto.java index 62251e0f..ff49e314 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/DynamicModelDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/DynamicModelDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualComponentDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualComponentDto.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualComponentDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualComponentDto.java index f9dd393f..6af966db 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualComponentDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualComponentDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualDbDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualDbDto.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualDbDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualDbDto.java index 8b441ad0..16a3804d 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualDbDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualDbDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualDto.java similarity index 72% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualDto.java index 0621d20c..0e891add 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualDto.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig; +import com.cloud.kicc.system.api.bigscreen.entity.Visual; +import com.cloud.kicc.system.api.bigscreen.entity.VisualConfig; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualMapDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualMapDto.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualMapDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualMapDto.java index 9e299538..61507780 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualMapDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualMapDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualProxyDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualProxyDto.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualProxyDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualProxyDto.java index 6b40c855..520701da 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualProxyDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualProxyDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualRecordDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualRecordDto.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualRecordDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualRecordDto.java index c882bf67..55b19137 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/dto/VisualRecordDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/dto/VisualRecordDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.dto; +package com.cloud.kicc.system.api.bigscreen.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/Visual.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/Visual.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/Visual.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/Visual.java index e21987e2..65e1c908 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/Visual.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/Visual.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualCategory.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualCategory.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualCategory.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualCategory.java index 6525a52d..f12d78dd 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualCategory.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualCategory.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualComponent.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualComponent.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualComponent.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualComponent.java index 0d181e7c..04abfa0e 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualComponent.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualComponent.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualConfig.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualConfig.java similarity index 94% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualConfig.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualConfig.java index d0610ed0..b51eb6b4 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualConfig.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualConfig.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualDb.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualDb.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualDb.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualDb.java index 8dc8687e..c21225e7 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualDb.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualDb.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualMap.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualMap.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualMap.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualMap.java index 27ce4e4e..8493fb7f 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualMap.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualMap.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualRecord.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualRecord.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualRecord.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualRecord.java index 0db27ae7..c48d1299 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/bigscreen/entity/VisualRecord.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/bigscreen/entity/VisualRecord.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.bigscreen.entity; +package com.cloud.kicc.system.api.bigscreen.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-workflow-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-workflow-api/pom.xml new file mode 100644 index 00000000..3339a904 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + + com.cloud + kicc-platform-api + 1.0.0 + + + kicc-workflow-api + jar + + kicc 工作流api模块 + + + + + com.cloud + kicc-common-feign + + + + com.cloud + kicc-common-data + + + org.flowable + flowable-spring-boot-starter-process-rest + + + diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/SqlConstants.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/SqlConstants.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java index 65feaa8e..9104be06 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/SqlConstants.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.constant; +package com.cloud.kicc.workflow.api.constant; /** *

diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/WorkflowConstant.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/WorkflowConstant.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/WorkflowConstant.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/WorkflowConstant.java index 9467c8c5..776471f8 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/constant/WorkflowConstant.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/WorkflowConstant.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.constant; +package com.cloud.kicc.workflow.api.constant; /** *

diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/Workflow.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/entity/Workflow.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/Workflow.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/entity/Workflow.java index 8d2c6215..6ea7e71f 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/Workflow.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/entity/Workflow.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.commonbiz.api.workflow.entity; +package com.cloud.kicc.workflow.api.entity; import com.cloud.kicc.common.core.util.TimeUtils; -import com.cloud.kicc.commonbiz.api.workflow.vo.ActivityCommentInfoVo; +import com.cloud.kicc.workflow.api.vo.ActivityCommentInfoVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/WorkflowModel.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/entity/WorkflowModel.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/WorkflowModel.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/entity/WorkflowModel.java index 1de69aae..61fd3e78 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/entity/WorkflowModel.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/entity/WorkflowModel.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.commonbiz.api.workflow.entity; +package com.cloud.kicc.workflow.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessDefinitionInfoVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/enums/ExtendMessage.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/enums/ExtendMessage.java similarity index 98% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/enums/ExtendMessage.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/enums/ExtendMessage.java index c4543c31..1643837e 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/enums/ExtendMessage.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/enums/ExtendMessage.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.enums; +package com.cloud.kicc.workflow.api.enums; import lombok.Getter; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionData.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/ActivityExtensionData.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionData.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/ActivityExtensionData.java index 455e97fd..85899817 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionData.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/ActivityExtensionData.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionProperty.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/ActivityExtensionProperty.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionProperty.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/ActivityExtensionProperty.java index cffe4b39..f74ef0da 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/ActivityExtensionProperty.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/ActivityExtensionProperty.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Button.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Button.java similarity index 90% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Button.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Button.java index 7c5bf10e..91dfbacd 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Button.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Button.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Category.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Category.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Category.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Category.java index 2ec2e0fe..6ce150d4 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Category.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Category.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.TreeEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Condition.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Condition.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Condition.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Condition.java index 88db1743..25feef5e 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Condition.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Condition.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormCategory.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormCategory.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormCategory.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormCategory.java index 6517a683..69ee870f 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormCategory.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormCategory.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.TreeEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinition.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormDefinition.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinition.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormDefinition.java index 8aeab634..04b213a4 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinition.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormDefinition.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinitionJson.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormDefinitionJson.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinitionJson.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormDefinitionJson.java index c0536973..1cba05d1 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/FormDefinitionJson.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/FormDefinitionJson.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Listener.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Listener.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Listener.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Listener.java index 3bff8a78..36c520fe 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/Listener.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/Listener.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowAssignee.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowAssignee.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowAssignee.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowAssignee.java index 9b66f766..1c62e6aa 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowAssignee.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowAssignee.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowButton.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowButton.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java index 958d90cb..6f30e934 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowButton.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowButton.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCondition.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowCondition.java similarity index 92% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCondition.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowCondition.java index e35e4d4b..8f16cc0d 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCondition.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowCondition.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCopy.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowCopy.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCopy.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowCopy.java index 928ee6f8..54882e8d 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/extension/entity/WorkflowCopy.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/extension/entity/WorkflowCopy.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.extension.entity; +package com.cloud.kicc.workflow.api.extension.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ActivityCommentInfoVo.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ActivityCommentInfoVo.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ActivityCommentInfoVo.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ActivityCommentInfoVo.java index c40c6cba..69c5285a 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ActivityCommentInfoVo.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ActivityCommentInfoVo.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.commonbiz.api.workflow.vo; +package com.cloud.kicc.workflow.api.vo; import cn.hutool.core.util.StrUtil; -import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant; -import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; +import com.cloud.kicc.workflow.api.constant.WorkflowConstant; +import com.cloud.kicc.workflow.api.enums.ExtendMessage; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/HistoryTaskInfoVo.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/HistoryTaskInfoVo.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/HistoryTaskInfoVo.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/HistoryTaskInfoVo.java index 56415775..054db028 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/HistoryTaskInfoVo.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/HistoryTaskInfoVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.vo; +package com.cloud.kicc.workflow.api.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessDefinitionInfoVo.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ProcessDefinitionInfoVo.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessDefinitionInfoVo.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ProcessDefinitionInfoVo.java index d71664ba..6a1902b2 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessDefinitionInfoVo.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ProcessDefinitionInfoVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.vo; +package com.cloud.kicc.workflow.api.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessInstanceInfoVo.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ProcessInstanceInfoVo.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessInstanceInfoVo.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ProcessInstanceInfoVo.java index 45460757..965a7ae2 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/ProcessInstanceInfoVo.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/ProcessInstanceInfoVo.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.commonbiz.api.workflow.vo; +package com.cloud.kicc.workflow.api.vo; -import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; +import com.cloud.kicc.workflow.api.enums.ExtendMessage; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/TaskInfoVo.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/TaskInfoVo.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/TaskInfoVo.java rename to kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/TaskInfoVo.java index d80434f5..3ff2256f 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/workflow/vo/TaskInfoVo.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/vo/TaskInfoVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz.api.workflow.vo; +package com.cloud.kicc.workflow.api.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9d486397 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ diff --git a/kicc-platform/kicc-platform-api/pom.xml b/kicc-platform/kicc-platform-api/pom.xml index d49fb7d0..0b9c7808 100644 --- a/kicc-platform/kicc-platform-api/pom.xml +++ b/kicc-platform/kicc-platform-api/pom.xml @@ -18,6 +18,8 @@ kicc-system-api kicc-common-api kicc-monitor-api + kicc-workflow-api + kicc-report-api kicc-template-api diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-report-biz/Dockerfile new file mode 100644 index 00000000..c3870f37 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/Dockerfile @@ -0,0 +1,15 @@ +FROM moxm/java:1.8-full + +RUN mkdir -p /kicc-report-biz + +WORKDIR /kicc-report-biz + +ARG JAR_FILE=target/kicc-report-biz.jar + +COPY ${JAR_FILE} app.jar + +EXPOSE 8108 + +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-report-biz/pom.xml new file mode 100644 index 00000000..b52a3186 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + com.cloud + kicc-platform-biz + 1.0.0 + + + kicc-report-biz + jar + + kicc 报表模块 + + + + + com.cloud + kicc-report-api + + + + com.cloud + kicc-common-security + + + + com.cloud + kicc-common-log + + + + com.cloud + kicc-common-swagger + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.boot + spring-boot-starter-undertow + + + + com.cloud + kicc-common-mock + + + + com.bstek.ureport + ureport2-console + + + + + + + io.fabric8 + docker-maven-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java new file mode 100644 index 00000000..e7e66a0d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java @@ -0,0 +1,29 @@ +package com.cloud.kicc.report; + +import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; +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; + +/** + *

+ * 报表模块 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/5/4 + */ +@EnableKiccSwagger2 +@EnableKiccResourceServer +@EnableKiccFeignClients +@SpringBootApplication +@EnableKiccJacksonAutoConvert +public class KiccReportApplication { + + public static void main(String[] args) { + SpringApplication.run(KiccReportApplication.class, args); + } + +} 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-report-biz/src/main/java/com/cloud/kicc/report/config/ReportConfiguration.java similarity index 80% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/config/ReportConfiguration.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/config/ReportConfiguration.java index c7de297e..ba11046b 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/config/ReportConfiguration.java @@ -1,14 +1,14 @@ -package com.cloud.kicc.system.report.config; +package com.cloud.kicc.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 com.cloud.kicc.report.provider.DatabaseProvider; +import com.cloud.kicc.report.datasource.ReportDataSource; +import com.cloud.kicc.report.props.ReportDatabaseProperties; +import com.cloud.kicc.report.props.ReportProperties; +import com.cloud.kicc.report.provider.ReportPlaceholderProvider; +import com.cloud.kicc.report.service.IReportFileService; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; 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-report-biz/src/main/java/com/cloud/kicc/report/datasource/ReportDataSource.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/datasource/ReportDataSource.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/datasource/ReportDataSource.java index ec3ab913..66049a0a 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/datasource/ReportDataSource.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.report.datasource; +package com.cloud.kicc.report.datasource; import com.bstek.ureport.definition.datasource.BuildinDatasource; import lombok.AllArgsConstructor; 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-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/endpoint/ReportEndpoint.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java index 06b51729..b5a02a7e 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/endpoint/ReportEndpoint.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.report.endpoint; +package com.cloud.kicc.report.endpoint; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,8 +6,8 @@ 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 com.cloud.kicc.report.entity.ReportFileEntity; +import com.cloud.kicc.report.service.IReportFileService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; 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-report-biz/src/main/java/com/cloud/kicc/report/entity/ReportFileEntity.java similarity index 93% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/entity/ReportFileEntity.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/entity/ReportFileEntity.java index 45bf3891..1c1a51be 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/entity/ReportFileEntity.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.report.entity; +package com.cloud.kicc.report.entity; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; 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-report-biz/src/main/java/com/cloud/kicc/report/mapper/ReportFileMapper.java similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/mapper/ReportFileMapper.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/mapper/ReportFileMapper.java index b5dceeb2..5e715ae3 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/mapper/ReportFileMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.report.mapper; +package com.cloud.kicc.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.system.report.entity.ReportFileEntity; +import com.cloud.kicc.report.entity.ReportFileEntity; /** *

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-report-biz/src/main/java/com/cloud/kicc/report/props/ReportDatabaseProperties.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportDatabaseProperties.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/props/ReportDatabaseProperties.java index 723f2a96..3b043500 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/props/ReportDatabaseProperties.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.report.props; +package com.cloud.kicc.report.props; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; 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-report-biz/src/main/java/com/cloud/kicc/report/props/ReportProperties.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportProperties.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/props/ReportProperties.java index 1ae16c0f..9a3950d1 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/props/ReportProperties.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.report.props; +package com.cloud.kicc.report.props; import com.cloud.kicc.common.core.constant.StringPool; import lombok.Data; 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-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java similarity index 91% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/DatabaseProvider.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java index 3121b91a..3b72457d 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/provider/DatabaseProvider.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.system.report.provider; +package com.cloud.kicc.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 com.cloud.kicc.report.entity.ReportFileEntity; +import com.cloud.kicc.report.props.ReportDatabaseProperties; +import com.cloud.kicc.report.service.IReportFileService; import lombok.AllArgsConstructor; import java.io.ByteArrayInputStream; 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-report-biz/src/main/java/com/cloud/kicc/report/provider/ReportPlaceholderProvider.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/ReportPlaceholderProvider.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/provider/ReportPlaceholderProvider.java index 8b6a4fd7..47933905 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/provider/ReportPlaceholderProvider.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.report.provider; +package com.cloud.kicc.report.provider; import com.bstek.ureport.UReportPropertyPlaceholderConfigurer; -import com.cloud.kicc.system.report.props.ReportProperties; +import com.cloud.kicc.report.props.ReportProperties; import java.util.Properties; 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-report-biz/src/main/java/com/cloud/kicc/report/service/IReportFileService.java similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/IReportFileService.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/service/IReportFileService.java index 13bc45b5..d56317bf 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/service/IReportFileService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.report.service; +package com.cloud.kicc.report.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.system.report.entity.ReportFileEntity; +import com.cloud.kicc.report.entity.ReportFileEntity; /** *

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-report-biz/src/main/java/com/cloud/kicc/report/service/impl/ReportFileServiceImpl.java similarity index 58% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/impl/ReportFileServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/service/impl/ReportFileServiceImpl.java index b98df190..0c8f768a 100644 --- 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-report-biz/src/main/java/com/cloud/kicc/report/service/impl/ReportFileServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.report.service.impl; +package com.cloud.kicc.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 com.cloud.kicc.report.entity.ReportFileEntity; +import com.cloud.kicc.report.mapper.ReportFileMapper; +import com.cloud.kicc.report.service.IReportFileService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..faf8e4d8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/bootstrap.yml @@ -0,0 +1,20 @@ +server: + port: 8108 + +spring: + application: + name: @artifactId@ + 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} + namespace: @profiles.namespace@ + service: @artifactId@ + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yml + namespace: @profiles.namespace@ + shared-configs: + - application.${spring.cloud.nacos.config.file-extension} diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/logback-spring.xml b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..9cd338b2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/mapper/ReportFileMapper.xml b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/mapper/ReportFileMapper.xml new file mode 100644 index 00000000..f6d9a8bf --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/mapper/ReportFileMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 9786a9b9..5c826afc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml @@ -19,7 +19,7 @@ com.pig4cloud.plugin oss-spring-boot-starter - + com.cloud kicc-common-api @@ -69,31 +69,11 @@ 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/bigscreen/controller/VisualCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java index 6d43c29f..aeb93293 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java @@ -6,7 +6,7 @@ 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.commonbiz.api.bigscreen.entity.VisualCategory; +import com.cloud.kicc.system.api.bigscreen.entity.VisualCategory; import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java index 122a1cbc..edd1a738 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java @@ -7,8 +7,8 @@ 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.commonbiz.api.bigscreen.dto.VisualComponentDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent; +import com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; import com.cloud.kicc.system.bigscreen.service.IVisualComponentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java index 343fbf2e..31212d44 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java @@ -6,9 +6,9 @@ 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.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.system.api.bigscreen.dto.VisualDto; +import com.cloud.kicc.system.api.bigscreen.entity.Visual; +import com.cloud.kicc.system.api.bigscreen.entity.VisualCategory; import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService; import com.cloud.kicc.system.bigscreen.service.IVisualService; import io.swagger.annotations.Api; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java index 6352fc43..128cec94 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java @@ -7,9 +7,9 @@ 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.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.system.api.bigscreen.dto.DynamicModelDto; +import com.cloud.kicc.system.api.bigscreen.dto.VisualDbDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualDb; import com.cloud.kicc.system.bigscreen.service.IVisualDbService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java index 4a343376..0ff26d8f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java @@ -7,8 +7,8 @@ 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.commonbiz.api.bigscreen.dto.VisualMapDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap; +import com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; import com.cloud.kicc.system.bigscreen.service.IVisualMapService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java index bdbf5278..f1fa37e1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java @@ -8,7 +8,7 @@ import cn.hutool.core.util.StrUtil; 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.system.api.bigscreen.dto.VisualProxyDto; import com.cloud.kicc.system.bigscreen.util.RequestUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java index 3cb5d245..a9452d08 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java @@ -6,8 +6,8 @@ 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.commonbiz.api.bigscreen.dto.VisualRecordDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord; +import com.cloud.kicc.system.api.bigscreen.dto.VisualRecordDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; import com.cloud.kicc.system.bigscreen.service.IVisualRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualCategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualCategoryMapper.java index 3c223f5b..f5d2f226 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,7 +1,7 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory; +import com.cloud.kicc.system.api.bigscreen.entity.VisualCategory; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java index d4db7ed0..d56353b8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java @@ -2,8 +2,8 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent; +import com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualConfigMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualConfigMapper.java index 51a95828..2dc75605 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,7 +1,7 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig; +import com.cloud.kicc.system.api.bigscreen.entity.VisualConfig; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualDbMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualDbMapper.java index cbb73d10..94f53a8e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,8 +1,8 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb; +import com.cloud.kicc.system.api.bigscreen.dto.VisualDbDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualDb; import java.util.LinkedHashMap; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java index b50b88ff..bde46e51 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java @@ -2,8 +2,8 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap; +import com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapper.java index 19942469..4ea7766e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,7 +1,7 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual; +import com.cloud.kicc.system.api.bigscreen.entity.Visual; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java index 53f2d59c..9f2d5c39 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java @@ -2,8 +2,8 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualRecordDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord; +import com.cloud.kicc.system.api.bigscreen.dto.VisualRecordDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualCategoryService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualCategoryService.java index 32bc3e1d..90265c89 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,7 +1,7 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory; +import com.cloud.kicc.system.api.bigscreen.entity.VisualCategory; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java index 6416af9d..034628ae 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java @@ -2,8 +2,8 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent; +import com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualConfigService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualConfigService.java index aa91c3b9..37fa351b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,7 +1,7 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig; +import com.cloud.kicc.system.api.bigscreen.entity.VisualConfig; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualDbService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualDbService.java index 5f3e8439..d09fea1c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,8 +1,8 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb; +import com.cloud.kicc.system.api.bigscreen.dto.VisualDbDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualDb; import java.util.LinkedHashMap; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java index f956650a..7ba572b8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java @@ -2,8 +2,8 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap; +import com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java index a280bcdf..0a3200d9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java @@ -2,8 +2,8 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualRecordDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord; +import com.cloud.kicc.system.api.bigscreen.dto.VisualRecordDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualService.java index 23021eee..cf526f0f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,8 +1,8 @@ package com.cloud.kicc.system.bigscreen.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto; -import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual; +import com.cloud.kicc.system.api.bigscreen.dto.VisualDto; +import com.cloud.kicc.system.api.bigscreen.entity.Visual; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 index 954e917f..3e704ac4 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.system.api.bigscreen.entity.VisualCategory; 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-system-biz/src/main/java/com/cloud/kicc/system/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 index ebc25c7e..086271cc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 @@ -2,8 +2,8 @@ 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.system.api.bigscreen.dto.VisualComponentDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; 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-system-biz/src/main/java/com/cloud/kicc/system/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 index 8c4403f2..d7b4a303 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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,7 +1,7 @@ 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.system.api.bigscreen.entity.VisualConfig; 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-system-biz/src/main/java/com/cloud/kicc/system/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 index 29dee127..fdc00185 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 @@ -10,8 +10,8 @@ import com.cloud.kicc.common.datasource.dynamic.DynamicDataSource; import com.cloud.kicc.common.datasource.util.ConnUtil; 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.system.api.bigscreen.dto.VisualDbDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualDb; import com.cloud.kicc.system.bigscreen.mapper.VisualDbMapper; import com.cloud.kicc.system.bigscreen.service.IVisualDbService; import com.cloud.kicc.system.bigscreen.util.PlaceholderUtil; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 index e29eac2b..c3ebdbbe 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 @@ -2,8 +2,8 @@ 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.system.api.bigscreen.dto.VisualMapDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; 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-system-biz/src/main/java/com/cloud/kicc/system/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 index b414d5ef..2a0081ac 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 @@ -2,8 +2,8 @@ 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.system.api.bigscreen.dto.VisualRecordDto; +import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; 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-system-biz/src/main/java/com/cloud/kicc/system/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 index f901bb63..ff5d2621 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/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 @@ -2,9 +2,9 @@ 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.system.api.bigscreen.dto.VisualDto; +import com.cloud.kicc.system.api.bigscreen.entity.Visual; +import com.cloud.kicc.system.api.bigscreen.entity.VisualConfig; import com.cloud.kicc.system.bigscreen.mapper.VisualMapper; import com.cloud.kicc.system.bigscreen.service.IVisualConfigService; import com.cloud.kicc.system.bigscreen.service.IVisualService; 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 deleted file mode 100644 index 6fd6c984..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableBpmnJsonConverter.java +++ /dev/null @@ -1,25 +0,0 @@ -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-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml index 56c007b9..2f816a25 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml index a0e491b6..97f41962 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml index a94bd8bf..50160e01 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml index 7e8c23d7..d7b627fe 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml index 0896921b..0f24ab10 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml index e0d753cb..8feb877e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml index 3b5c1f74..8d13b1c7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualRecordMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - + 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 deleted file mode 100644 index 991aab6e..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionDataMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml deleted file mode 100644 index a290e14d..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml deleted file mode 100644 index be95f842..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml deleted file mode 100644 index ecb46d83..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml deleted file mode 100644 index 46dc2258..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/Dockerfile new file mode 100644 index 00000000..cf28d4da --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/Dockerfile @@ -0,0 +1,15 @@ +FROM moxm/java:1.8-full + +RUN mkdir -p /kicc-workflow-biz + +WORKDIR /kicc-workflow-biz + +ARG JAR_FILE=target/kicc-template-biz.jar + +COPY ${JAR_FILE} app.jar + +EXPOSE 8109 + +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java $JAVA_OPTS -jar app.jar diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/pom.xml new file mode 100644 index 00000000..b96ba6ed --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + com.cloud + kicc-platform-biz + 1.0.0 + + + kicc-workflow-biz + jar + + kicc 工作流模块 + + + + + com.cloud + kicc-workflow-api + + + + com.cloud + kicc-common-security + + + + com.cloud + kicc-common-log + + + + com.cloud + kicc-common-swagger + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.boot + spring-boot-starter-undertow + + + + com.cloud + kicc-common-mock + + + + org.flowable + flowable-ui-modeler-rest + + + org.liquibase + liquibase-core + + + + + + + io.fabric8 + docker-maven-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java new file mode 100644 index 00000000..0ece6b71 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java @@ -0,0 +1,29 @@ +package com.cloud.kicc.workflow; + +import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; +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; + +/** + *

+ * 工作流模块 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/5/4 + */ +@EnableKiccSwagger2 +@EnableKiccResourceServer +@EnableKiccFeignClients +@SpringBootApplication +@EnableKiccJacksonAutoConvert +public class KiccWorkflowApplication { + + public static void main(String[] args) { + SpringApplication.run(KiccWorkflowApplication.class, args); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/cmd/RollBackUserTaskCmd.java similarity index 98% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/cmd/RollBackUserTaskCmd.java index d456dcff..88d91e15 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/cmd/RollBackUserTaskCmd.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.cmd; +package com.cloud.kicc.workflow.cmd; -import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant; -import com.cloud.kicc.system.workflow.util.WorkflowUtil; +import com.cloud.kicc.workflow.api.constant.WorkflowConstant; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/FlowableConfig.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/FlowableConfig.java index a210b0ad..5d261baf 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/FlowableConfig.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.config; +package com.cloud.kicc.workflow.config; -import com.cloud.kicc.system.workflow.parser.factory.WorkflowActivityBehaviorFactory; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/LiquibaseConfig.java similarity index 97% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/LiquibaseConfig.java index e81eb49a..515785a8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/LiquibaseConfig.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.config; +package com.cloud.kicc.workflow.config; import liquibase.Liquibase; import liquibase.database.Database; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java similarity index 82% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java index 1be346a1..400dadf0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.config; +package com.cloud.kicc.workflow.config; -import com.cloud.kicc.system.workflow.interceptor.ModelHandlerInterceptor; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowFormController.java similarity index 97% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowFormController.java index 8b62be05..2897e504 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowFormController.java @@ -1,13 +1,13 @@ -package com.cloud.kicc.system.workflow.controller; +package com.cloud.kicc.workflow.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; 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.constant.WorkflowConstant; -import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow; -import com.cloud.kicc.system.workflow.service.WorkflowTaskService; +import com.cloud.kicc.workflow.api.constant.WorkflowConstant; +import com.cloud.kicc.workflow.api.entity.Workflow; +import com.cloud.kicc.workflow.service.WorkflowTaskService; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowModelController.java similarity index 97% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowModelController.java index deb81e22..4d13f34b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowModelController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.controller; +package com.cloud.kicc.workflow.controller; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; @@ -11,10 +11,10 @@ import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.core.util.FileUtil; 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.system.workflow.service.WorkflowModelService; -import com.cloud.kicc.system.workflow.service.WorkflowProcessService; +import com.cloud.kicc.workflow.api.entity.WorkflowModel; +import com.cloud.kicc.workflow.api.vo.ProcessDefinitionInfoVo; +import com.cloud.kicc.workflow.service.WorkflowModelService; +import com.cloud.kicc.workflow.service.WorkflowProcessService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.AllArgsConstructor; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowProcessController.java similarity index 93% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowProcessController.java index 85dcd5ef..1554ca4b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowProcessController.java @@ -1,17 +1,17 @@ -package com.cloud.kicc.system.workflow.controller; +package com.cloud.kicc.workflow.controller; import cn.hutool.core.io.IoUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow; -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.system.workflow.extension.service.WorkflowCopyService; -import com.cloud.kicc.system.workflow.service.WorkflowProcessService; +import com.cloud.kicc.workflow.api.entity.Workflow; +import com.cloud.kicc.workflow.api.enums.ExtendMessage; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCopy; +import com.cloud.kicc.workflow.api.vo.ProcessDefinitionInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessInstanceInfoVo; +import com.cloud.kicc.workflow.extension.service.WorkflowCopyService; +import com.cloud.kicc.workflow.service.WorkflowProcessService; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.HistoryService; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowTaskController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowTaskController.java index 2d392719..49351d4d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/controller/WorkflowTaskController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.controller; +package com.cloud.kicc.workflow.controller; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.map.MapUtil; @@ -8,14 +8,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.entity.Workflow; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty; -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.system.workflow.extension.service.ActivityExtensionPropertyService; -import com.cloud.kicc.system.workflow.service.WorkflowProcessService; -import com.cloud.kicc.system.workflow.service.WorkflowTaskService; +import com.cloud.kicc.workflow.api.entity.Workflow; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.api.vo.ActivityCommentInfoVo; +import com.cloud.kicc.workflow.api.vo.HistoryTaskInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessInstanceInfoVo; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionPropertyService; +import com.cloud.kicc.workflow.service.WorkflowProcessService; +import com.cloud.kicc.workflow.service.WorkflowTaskService; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.flowable.common.engine.impl.identity.Authentication; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionDataController.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionDataController.java index 79653717..e3e4f204 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionDataController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.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.system.workflow.extension.service.ActivityExtensionDataService; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionDataService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java similarity index 91% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java index bc376900..43fdf461 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.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.system.workflow.extension.service.ActivityExtensionPropertyService; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionPropertyService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java index 8150bd69..57cc990a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.workflow.extension.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,8 +6,8 @@ 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.Button; -import com.cloud.kicc.system.workflow.extension.service.ButtonService; +import com.cloud.kicc.workflow.api.extension.entity.Button; +import com.cloud.kicc.workflow.extension.service.ButtonService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java index 4b926aea..967c3a6d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.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.system.workflow.extension.service.CategoryService; +import com.cloud.kicc.workflow.api.extension.entity.Category; +import com.cloud.kicc.workflow.extension.service.CategoryService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java index e63afe0d..776e5510 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.workflow.extension.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,8 +6,8 @@ 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.Condition; -import com.cloud.kicc.system.workflow.extension.service.ConditionService; +import com.cloud.kicc.workflow.api.extension.entity.Condition; +import com.cloud.kicc.workflow.extension.service.ConditionService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java similarity index 85% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java index 3c6abb4d..dcc72f31 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.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.system.workflow.extension.service.FormCategoryService; +import com.cloud.kicc.workflow.api.extension.entity.FormCategory; +import com.cloud.kicc.workflow.extension.service.FormCategoryService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java index e4a5ad79..1eeb35ce 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.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.system.workflow.extension.service.FormDefinitionService; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinition; +import com.cloud.kicc.workflow.extension.service.FormDefinitionService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java index 53975fca..8a258480 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.workflow.extension.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -8,8 +8,8 @@ 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.FormDefinitionJson; -import com.cloud.kicc.system.workflow.extension.service.FormDefinitionJsonService; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinitionJson; +import com.cloud.kicc.workflow.extension.service.FormDefinitionJsonService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java index d0c64a8f..db21a2d0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.workflow.extension.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -7,8 +7,8 @@ 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.Listener; -import com.cloud.kicc.system.workflow.extension.service.ListenerService; +import com.cloud.kicc.workflow.api.extension.entity.Listener; +import com.cloud.kicc.workflow.extension.service.ListenerService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java index ba9568e7..2bc62db5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java @@ -1,12 +1,12 @@ -package com.cloud.kicc.system.workflow.extension.controller; +package com.cloud.kicc.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.common.security.util.SecurityUtils; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy; -import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCopy; +import com.cloud.kicc.workflow.extension.service.WorkflowCopyService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ActivityExtensionDataMapper.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ActivityExtensionDataMapper.java index 8efb66a4..f18ca663 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ActivityExtensionDataMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ActivityExtensionPropertyMapper.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ActivityExtensionPropertyMapper.java index 318b1f6d..ae961b2e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ActivityExtensionPropertyMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ButtonMapper.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ButtonMapper.java index cc0016dd..f8928f12 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ButtonMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button; +import com.cloud.kicc.workflow.api.extension.entity.Button; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/CategoryMapper.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/CategoryMapper.java index 7ebba909..af13335e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/CategoryMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category; +import com.cloud.kicc.workflow.api.extension.entity.Category; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ConditionMapper.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ConditionMapper.java index 23aea17c..67bc3db2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ConditionMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition; +import com.cloud.kicc.workflow.api.extension.entity.Condition; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormCategoryMapper.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormCategoryMapper.java index 39ee9adb..c8c3162a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormCategoryMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory; +import com.cloud.kicc.workflow.api.extension.entity.FormCategory; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormDefinitionJsonMapper.java similarity index 69% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormDefinitionJsonMapper.java index 517ca687..f1a28556 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormDefinitionJsonMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinitionJson; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormDefinitionMapper.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormDefinitionMapper.java index e60af7c1..dc71f89f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/FormDefinitionMapper.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinition; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinition; import org.apache.ibatis.annotations.Param; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ListenerMapper.java similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ListenerMapper.java index a8f41652..0ca6f977 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/ListenerMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener; +import com.cloud.kicc.workflow.api.extension.entity.Listener; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowAssigneeMapper.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowAssigneeMapper.java index e99c9178..b47e5d73 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowAssigneeMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowAssignee; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowButtonMapper.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowButtonMapper.java index 594c76a7..e07c1fc7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowButtonMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowButton; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowConditionMapper.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowConditionMapper.java index eb5fa66a..a98cab58 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowConditionMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCondition; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowCopyMapper.java similarity index 78% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowCopyMapper.java index 41d765d7..686e5403 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/mapper/WorkflowCopyMapper.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.mapper; +package com.cloud.kicc.workflow.extension.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCopy; import org.apache.ibatis.annotations.Param; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ActivityExtensionDataService.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ActivityExtensionDataService.java index 1a39e2a8..d6673520 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ActivityExtensionDataService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ActivityExtensionPropertyService.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ActivityExtensionPropertyService.java index b9424eac..48850c79 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ActivityExtensionPropertyService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ButtonService.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ButtonService.java index 4730900b..609ff190 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ButtonService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button; +import com.cloud.kicc.workflow.api.extension.entity.Button; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/CategoryService.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/CategoryService.java index 46509d77..d5232fce 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/CategoryService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category; +import com.cloud.kicc.workflow.api.extension.entity.Category; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ConditionService.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ConditionService.java index 5f1444a9..d29ad662 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ConditionService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition; +import com.cloud.kicc.workflow.api.extension.entity.Condition; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormCategoryService.java similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormCategoryService.java index 4dbc1a03..050e01a2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormCategoryService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory; +import com.cloud.kicc.workflow.api.extension.entity.FormCategory; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormDefinitionJsonService.java similarity index 70% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormDefinitionJsonService.java index 333bf373..07cb5ff2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormDefinitionJsonService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinitionJson; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormDefinitionService.java similarity index 76% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormDefinitionService.java index 18823e6d..0726aa32 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/FormDefinitionService.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinition; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinition; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ListenerService.java similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ListenerService.java index ca6e7214..b3aabc08 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/ListenerService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener; +import com.cloud.kicc.workflow.api.extension.entity.Listener; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/WorkflowCopyService.java similarity index 76% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/WorkflowCopyService.java index efffff1b..66dee91a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/WorkflowCopyService.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service; +package com.cloud.kicc.workflow.extension.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCopy; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java similarity index 83% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java index 6c2166f5..1e26fd2b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.workflow.extension.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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.api.workflow.extension.entity.WorkflowButton; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition; -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 com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowAssignee; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowButton; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCondition; +import com.cloud.kicc.workflow.extension.mapper.ActivityExtensionDataMapper; +import com.cloud.kicc.workflow.extension.mapper.WorkflowAssigneeMapper; +import com.cloud.kicc.workflow.extension.mapper.WorkflowButtonMapper; +import com.cloud.kicc.workflow.extension.mapper.WorkflowConditionMapper; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java similarity index 58% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java index 84160388..c5e1ceb8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.ActivityExtensionPropertyMapper; -import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.extension.mapper.ActivityExtensionPropertyMapper; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionPropertyService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ButtonServiceImpl.java similarity index 55% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ButtonServiceImpl.java index 5708fb2c..1bffa1a2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ButtonServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.ButtonMapper; -import com.cloud.kicc.system.workflow.extension.service.ButtonService; +import com.cloud.kicc.workflow.api.extension.entity.Button; +import com.cloud.kicc.workflow.extension.mapper.ButtonMapper; +import com.cloud.kicc.workflow.extension.service.ButtonService; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/CategoryServiceImpl.java similarity index 55% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/CategoryServiceImpl.java index 21c3d636..860a5980 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/CategoryServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.CategoryMapper; -import com.cloud.kicc.system.workflow.extension.service.CategoryService; +import com.cloud.kicc.workflow.api.extension.entity.Category; +import com.cloud.kicc.workflow.extension.mapper.CategoryMapper; +import com.cloud.kicc.workflow.extension.service.CategoryService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ConditionServiceImpl.java similarity index 55% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ConditionServiceImpl.java index 498055a3..0fa52041 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ConditionServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.ConditionMapper; -import com.cloud.kicc.system.workflow.extension.service.ConditionService; +import com.cloud.kicc.workflow.api.extension.entity.Condition; +import com.cloud.kicc.workflow.extension.mapper.ConditionMapper; +import com.cloud.kicc.workflow.extension.service.ConditionService; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormCategoryServiceImpl.java similarity index 56% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormCategoryServiceImpl.java index 2fc1439d..b657be83 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormCategoryServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.FormCategoryMapper; -import com.cloud.kicc.system.workflow.extension.service.FormCategoryService; +import com.cloud.kicc.workflow.api.extension.entity.FormCategory; +import com.cloud.kicc.workflow.extension.mapper.FormCategoryMapper; +import com.cloud.kicc.workflow.extension.service.FormCategoryService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java index 97b90189..f6daae77 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.FormDefinitionJsonMapper; -import com.cloud.kicc.system.workflow.extension.service.FormDefinitionJsonService; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinitionJson; +import com.cloud.kicc.workflow.extension.mapper.FormDefinitionJsonMapper; +import com.cloud.kicc.workflow.extension.service.FormDefinitionJsonService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormDefinitionServiceImpl.java similarity index 68% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormDefinitionServiceImpl.java index 6904c4e0..78bb17f8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/FormDefinitionServiceImpl.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.FormDefinitionMapper; -import com.cloud.kicc.system.workflow.extension.service.FormDefinitionService; +import com.cloud.kicc.workflow.api.extension.entity.FormDefinition; +import com.cloud.kicc.workflow.extension.mapper.FormDefinitionMapper; +import com.cloud.kicc.workflow.extension.service.FormDefinitionService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ListenerServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ListenerServiceImpl.java similarity index 55% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ListenerServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ListenerServiceImpl.java index 60fcbd8f..344797cd 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ListenerServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/ListenerServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.ListenerMapper; -import com.cloud.kicc.system.workflow.extension.service.ListenerService; +import com.cloud.kicc.workflow.api.extension.entity.Listener; +import com.cloud.kicc.workflow.extension.mapper.ListenerMapper; +import com.cloud.kicc.workflow.extension.service.ListenerService; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/WorkflowCopyServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/WorkflowCopyServiceImpl.java similarity index 68% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/WorkflowCopyServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/WorkflowCopyServiceImpl.java index 8f530a4f..896647c5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/WorkflowCopyServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/service/impl/WorkflowCopyServiceImpl.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.system.workflow.extension.service.impl; +package com.cloud.kicc.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.system.workflow.extension.mapper.WorkflowCopyMapper; -import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCopy; +import com.cloud.kicc.workflow.extension.mapper.WorkflowCopyMapper; +import com.cloud.kicc.workflow.extension.service.WorkflowCopyService; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/interceptor/ModelHandlerInterceptor.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/interceptor/ModelHandlerInterceptor.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/interceptor/ModelHandlerInterceptor.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/interceptor/ModelHandlerInterceptor.java index b4473200..174df56a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/interceptor/ModelHandlerInterceptor.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/interceptor/ModelHandlerInterceptor.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.interceptor; +package com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/listener/MyExecutionListener.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/listener/MyExecutionListener.java similarity index 93% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/listener/MyExecutionListener.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/listener/MyExecutionListener.java index 8c7f9417..703ccfd2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/listener/MyExecutionListener.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/listener/MyExecutionListener.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.listener; +package com.cloud.kicc.workflow.listener; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/mapper/WorkflowMapper.java similarity index 69% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/mapper/WorkflowMapper.java index d1ba3977..0ce00ba3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/mapper/WorkflowMapper.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.mapper; +package com.cloud.kicc.workflow.mapper; -import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow; +import com.cloud.kicc.workflow.api.entity.Workflow; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowModelMapper.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/mapper/WorkflowModelMapper.java similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowModelMapper.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/mapper/WorkflowModelMapper.java index 33c6672f..38bfa9e1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/mapper/WorkflowModelMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/mapper/WorkflowModelMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.mapper; +package com.cloud.kicc.workflow.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel; +import com.cloud.kicc.workflow.api.entity.WorkflowModel; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/FlowableModelService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/FlowableModelService.java similarity index 99% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/FlowableModelService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/FlowableModelService.java index b1152ded..7dcd5f6c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/FlowableModelService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/FlowableModelService.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.override; +package com.cloud.kicc.workflow.override; -import com.cloud.kicc.system.workflow.override.json.FlowableBpmnJsonConverter; +import com.cloud.kicc.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(ModelServiceImpl.PROCESS_NOT_FOUND_MESSAGE_KEY); + modelNotFound.setMessageKey(PROCESS_NOT_FOUND_MESSAGE_KEY); throw modelNotFound; } @@ -595,7 +595,7 @@ public class FlowableModelService extends ModelServiceImpl { } else { extensionElement = new ExtensionElement(); } - extensionElement.setNamespace(ModelServiceImpl.NAMESPACE); + extensionElement.setNamespace(NAMESPACE); extensionElement.setNamespacePrefix("modeler"); extensionElement.setName(name); extensionElement.setElementText(value); diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableBpmnJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableBpmnJsonConverter.java new file mode 100644 index 00000000..6be62d4f --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableBpmnJsonConverter.java @@ -0,0 +1,24 @@ +package com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableSequenceFlowJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableSequenceFlowJsonConverter.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableSequenceFlowJsonConverter.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableSequenceFlowJsonConverter.java index 350ca146..dc5ed0f1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableSequenceFlowJsonConverter.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableSequenceFlowJsonConverter.java @@ -1,12 +1,12 @@ -package com.cloud.kicc.system.workflow.override.json; +package com.cloud.kicc.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.system.workflow.extension.service.ActivityExtensionDataService; -import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowCondition; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionDataService; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableStartEventJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableStartEventJsonConverter.java similarity index 97% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableStartEventJsonConverter.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableStartEventJsonConverter.java index 2c17c3df..a5db464c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableStartEventJsonConverter.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableStartEventJsonConverter.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.override.json; +package com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableUserTaskJsonConverter.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableUserTaskJsonConverter.java similarity index 97% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableUserTaskJsonConverter.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableUserTaskJsonConverter.java index 24b7163b..bbf6a149 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableUserTaskJsonConverter.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/override/json/FlowableUserTaskJsonConverter.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.override.json; +package com.cloud.kicc.workflow.override.json; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee; -import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowAssignee; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowButton; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/factory/WorkflowActivityBehaviorFactory.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/factory/WorkflowActivityBehaviorFactory.java similarity index 79% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/factory/WorkflowActivityBehaviorFactory.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/factory/WorkflowActivityBehaviorFactory.java index c4e20382..379e13d2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/factory/WorkflowActivityBehaviorFactory.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/factory/WorkflowActivityBehaviorFactory.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.parser.factory; +package com.cloud.kicc.workflow.parser.factory; -import com.cloud.kicc.system.workflow.parser.handler.ExtendUserTaskActivityBehavior; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/ExtendUserTaskActivityBehavior.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/ExtendUserTaskActivityBehavior.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/ExtendUserTaskActivityBehavior.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/ExtendUserTaskActivityBehavior.java index 19522be7..f881bca1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/ExtendUserTaskActivityBehavior.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/ExtendUserTaskActivityBehavior.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.parser.handler; +package com.cloud.kicc.workflow.parser.handler; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; @@ -6,11 +6,11 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cloud.kicc.common.core.util.SpringContextHolderUtil; 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.system.workflow.extension.service.ActivityExtensionDataService; -import com.cloud.kicc.system.workflow.util.WorkflowUtil; +import com.cloud.kicc.workflow.api.constant.SqlConstants; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowAssignee; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionDataService; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/MultiInstanceHandler.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/MultiInstanceHandler.java similarity index 93% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/MultiInstanceHandler.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/MultiInstanceHandler.java index 5e54a0c4..293605c0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/parser/handler/MultiInstanceHandler.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/parser/handler/MultiInstanceHandler.java @@ -1,14 +1,14 @@ -package com.cloud.kicc.system.workflow.parser.handler; +package com.cloud.kicc.workflow.parser.handler; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cloud.kicc.common.core.util.SpringContextHolderUtil; 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.system.workflow.extension.service.ActivityExtensionDataService; +import com.cloud.kicc.workflow.api.constant.SqlConstants; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionData; +import com.cloud.kicc.workflow.api.extension.entity.WorkflowAssignee; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowBpmnModelService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowBpmnModelService.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowBpmnModelService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowBpmnModelService.java index 0a0a4fda..582bfa0e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowBpmnModelService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowBpmnModelService.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.service; +package com.cloud.kicc.workflow.service; import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.EndEvent; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowModelService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowModelService.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowModelService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowModelService.java index 6acfb295..ce39c9ca 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowModelService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowModelService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.system.workflow.service; +package com.cloud.kicc.workflow.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel; +import com.cloud.kicc.workflow.api.entity.WorkflowModel; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowProcessService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowProcessService.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowProcessService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowProcessService.java index 8db2b7e9..dfca9ce5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowProcessService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowProcessService.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.system.workflow.service; +package com.cloud.kicc.workflow.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; -import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo; -import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo; +import com.cloud.kicc.workflow.api.enums.ExtendMessage; +import com.cloud.kicc.workflow.api.vo.ProcessDefinitionInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessInstanceInfoVo; import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowTaskService.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowTaskService.java similarity index 87% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowTaskService.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowTaskService.java index 1960b8ce..2ab14a1f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/WorkflowTaskService.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/WorkflowTaskService.java @@ -1,10 +1,10 @@ -package com.cloud.kicc.system.workflow.service; +package com.cloud.kicc.workflow.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow; -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.workflow.api.entity.Workflow; +import com.cloud.kicc.workflow.api.vo.ActivityCommentInfoVo; +import com.cloud.kicc.workflow.api.vo.HistoryTaskInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessInstanceInfoVo; import java.util.List; import java.util.Map; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowBpmnModelServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowBpmnModelServiceImpl.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowBpmnModelServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowBpmnModelServiceImpl.java index 29734d57..fdc36639 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowBpmnModelServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowBpmnModelServiceImpl.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.service.impl; +package com.cloud.kicc.workflow.service.impl; -import com.cloud.kicc.system.workflow.service.WorkflowBpmnModelService; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowModelServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowModelServiceImpl.java similarity index 91% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowModelServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowModelServiceImpl.java index ae572aa2..e31443c6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowModelServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowModelServiceImpl.java @@ -1,15 +1,15 @@ -package com.cloud.kicc.system.workflow.service.impl; +package com.cloud.kicc.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.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.cloud.kicc.workflow.api.entity.WorkflowModel; +import com.cloud.kicc.workflow.api.extension.entity.ActivityExtensionProperty; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionDataService; +import com.cloud.kicc.workflow.extension.service.ActivityExtensionPropertyService; +import com.cloud.kicc.workflow.mapper.WorkflowModelMapper; +import com.cloud.kicc.workflow.service.WorkflowModelService; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowProcessServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowProcessServiceImpl.java similarity index 96% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowProcessServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowProcessServiceImpl.java index 289219c5..b7384d63 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowProcessServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowProcessServiceImpl.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.service.impl; +package com.cloud.kicc.workflow.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; @@ -9,18 +9,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.constant.CommonConstants; import com.cloud.kicc.common.data.entity.KiccUser; 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.api.workflow.entity.WorkflowModel; -import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; -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.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 com.cloud.kicc.workflow.api.constant.WorkflowConstant; +import com.cloud.kicc.workflow.api.entity.Workflow; +import com.cloud.kicc.workflow.api.entity.WorkflowModel; +import com.cloud.kicc.workflow.api.enums.ExtendMessage; +import com.cloud.kicc.workflow.api.vo.ActivityCommentInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessDefinitionInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessInstanceInfoVo; +import com.cloud.kicc.workflow.api.vo.TaskInfoVo; +import com.cloud.kicc.workflow.mapper.WorkflowMapper; +import com.cloud.kicc.workflow.mapper.WorkflowModelMapper; +import com.cloud.kicc.workflow.service.WorkflowBpmnModelService; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowTaskServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java similarity index 96% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowTaskServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java index 0c47f167..77319e5f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/service/impl/WorkflowTaskServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/service/impl/WorkflowTaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.system.workflow.service.impl; +package com.cloud.kicc.workflow.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; @@ -7,18 +7,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.constant.CommonConstants; import com.cloud.kicc.common.security.util.SecurityUtils; -import com.cloud.kicc.commonbiz.api.workflow.constant.SqlConstants; -import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant; -import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow; -import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage; -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.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 com.cloud.kicc.workflow.api.constant.SqlConstants; +import com.cloud.kicc.workflow.api.constant.WorkflowConstant; +import com.cloud.kicc.workflow.api.entity.Workflow; +import com.cloud.kicc.workflow.api.enums.ExtendMessage; +import com.cloud.kicc.workflow.api.vo.ActivityCommentInfoVo; +import com.cloud.kicc.workflow.api.vo.HistoryTaskInfoVo; +import com.cloud.kicc.workflow.api.vo.ProcessInstanceInfoVo; +import com.cloud.kicc.workflow.api.vo.TaskInfoVo; +import com.cloud.kicc.workflow.cmd.RollBackUserTaskCmd; +import com.cloud.kicc.workflow.service.WorkflowProcessService; +import com.cloud.kicc.workflow.service.WorkflowTaskService; +import com.cloud.kicc.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-system-biz/src/main/java/com/cloud/kicc/system/workflow/util/WorkflowUtil.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/util/WorkflowUtil.java similarity index 98% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/util/WorkflowUtil.java rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/util/WorkflowUtil.java index 9a4545b4..53d152b9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/util/WorkflowUtil.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/util/WorkflowUtil.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.system.workflow.util; +package com.cloud.kicc.workflow.util; -import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant; +import com.cloud.kicc.workflow.api.constant.WorkflowConstant; import lombok.experimental.UtilityClass; import org.apache.commons.compress.utils.Sets; import org.flowable.bpmn.model.Process; @@ -120,7 +120,7 @@ public class WorkflowUtil { SubProcess flowElement = (SubProcess) flowElementsContainer; result.add(flowElement.getId()); flowElementsContainer = flowElement.getParentContainer(); - } else if (flowElementsContainer instanceof Process) { + } else if (flowElementsContainer instanceof java.lang.Process) { Process flowElement = (Process) flowElementsContainer; result.add(flowElement.getId()); flowElementsContainer = null; diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..11cb6fb8 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml @@ -0,0 +1,19 @@ +server: + port: 8109 + +spring: + application: + name: @artifactId@ + 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} + namespace: @profiles.namespace@ + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yml + namespace: @profiles.namespace@ + shared-configs: + - application.${spring.cloud.nacos.config.file-extension} diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/logback-spring.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..9cd338b2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/WorkflowMapper.xml similarity index 81% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/WorkflowMapper.xml index 383b5457..ae11d073 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/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-system-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/WorkflowModelMapper.xml similarity index 66% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/WorkflowModelMapper.xml index 762667a6..0c456b53 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/WorkflowModelMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/WorkflowModelMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormCategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ActivityExtensionDataMapper.xml similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormCategoryMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ActivityExtensionDataMapper.xml index 3fc8f7db..cf5d105a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormCategoryMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ActivityExtensionDataMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ActivityExtensionPropertyMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ActivityExtensionPropertyMapper.xml new file mode 100644 index 00000000..fcea203d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ActivityExtensionPropertyMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ButtonMapper.xml similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ButtonMapper.xml index f7caf977..10c2531a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ButtonMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ButtonMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/CategoryMapper.xml similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/CategoryMapper.xml index 1a493f8c..521f7ac4 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/CategoryMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/CategoryMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ConditionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ConditionMapper.xml new file mode 100644 index 00000000..50b65a56 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ConditionMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/FormCategoryMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/FormCategoryMapper.xml new file mode 100644 index 00000000..1ec3f8eb --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/FormCategoryMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/FormDefinitionJsonMapper.xml similarity index 79% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/FormDefinitionJsonMapper.xml index 26d9e03a..f7ee1b46 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/FormDefinitionJsonMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/FormDefinitionJsonMapper.xml @@ -1,7 +1,7 @@ - + SELECT diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ListenerMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ListenerMapper.xml similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ListenerMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ListenerMapper.xml index ffedcc26..69ef0ad6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ListenerMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/ListenerMapper.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-workflow-biz/src/main/resources/mapper/extension/WorkflowAssigneeMapper.xml similarity index 65% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowAssigneeMapper.xml index e5a3524d..9e9ad07d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/ConditionMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowAssigneeMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowButtonMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowButtonMapper.xml new file mode 100644 index 00000000..6da84b11 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowButtonMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowConditionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowConditionMapper.xml new file mode 100644 index 00000000..e9924fb0 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowConditionMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowCopyMapper.xml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowCopyMapper.xml similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowCopyMapper.xml rename to kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowCopyMapper.xml index 3a850f02..bb2b0529 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/workflow/extension/WorkflowCopyMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/mapper/extension/WorkflowCopyMapper.xml @@ -1,7 +1,7 @@ - + a.id AS "id", diff --git a/kicc-platform/kicc-platform-biz/pom.xml b/kicc-platform/kicc-platform-biz/pom.xml index 979b6119..f32ca30a 100644 --- a/kicc-platform/kicc-platform-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/pom.xml @@ -18,6 +18,8 @@ kicc-system-biz kicc-common-biz kicc-monitor-biz + kicc-report-biz + kicc-workflow-biz kicc-template-biz