chore: 抽离模块

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】

kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/pom.xml

@@ -29,10 +29,6 @@
             <groupId>com.cloud</groupId>
             <artifactId>kicc-common-data</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/pom.xml

@@ -29,10 +29,6 @@
             <groupId>com.cloud</groupId>
             <artifactId>kicc-common-data</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

kicc-common/kicc-common-bom/pom.xml

@@ -108,6 +108,16 @@
 				<artifactId>kicc-monitor-api</artifactId>
 				<version>${kicc.common.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.cloud</groupId>
+				<artifactId>kicc-report-api</artifactId>
+				<version>${kicc.common.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.cloud</groupId>
+				<artifactId>kicc-workflow-api</artifactId>
+				<version>${kicc.common.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.cloud</groupId>
 				<artifactId>kicc-template-api</artifactId>

kicc-common/kicc-common-data/pom.xml

@@ -58,6 +58,11 @@
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>
     </dependency>-->
+		<!--对外部api提供mvc相关服务-->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
 		<!--security 依赖-->
 		<dependency>
 			<groupId>org.springframework.security</groupId>

kicc-platform/kicc-platform-api/kicc-common-api/pom.xml

@@ -29,9 +29,5 @@
 			<groupId>com.cloud</groupId>
 			<artifactId>kicc-common-data</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.flowable</groupId>
-			<artifactId>flowable-spring-boot-starter-process-rest</artifactId>
-		</dependency>
 	</dependencies>
 </project>

kicc-platform/kicc-platform-api/kicc-report-api/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+    <parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-api</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-report-api</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 报表api模块</description>
+
+	<dependencies>
+		<!--断路器依赖-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-feign</artifactId>
+		</dependency>
+		<!--数据服务核心包-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-data</artifactId>
+		</dependency>
+	</dependencies>
+</project>

kicc-platform/kicc-platform-api/kicc-report-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

kicc-platform/kicc-platform-api/kicc-workflow-api/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+    <parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-api</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-workflow-api</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 工作流api模块</description>
+
+	<dependencies>
+		<!--断路器依赖-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-feign</artifactId>
+		</dependency>
+		<!--数据服务核心包-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-data</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.flowable</groupId>
+			<artifactId>flowable-spring-boot-starter-process-rest</artifactId>
+		</dependency>
+	</dependencies>
+</project>

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;
 
 /**
  *<p>

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;
 
 /**
  * <p>

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\

kicc-platform/kicc-platform-api/pom.xml

@@ -18,6 +18,8 @@
         <module>kicc-system-api</module>
         <module>kicc-common-api</module>
         <module>kicc-monitor-api</module>
+        <module>kicc-workflow-api</module>
+        <module>kicc-report-api</module>
         <module>kicc-template-api</module>
     </modules>
 

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

kicc-platform/kicc-platform-biz/kicc-report-biz/pom.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-biz</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-report-biz</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 报表模块</description>
+
+	<dependencies>
+		<!--report api模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-report-api</artifactId>
+		</dependency>
+		<!--安全模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-security</artifactId>
+		</dependency>
+		<!--日志处理-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-log</artifactId>
+		</dependency>
+		<!--接口文档-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-swagger</artifactId>
+		</dependency>
+		<!--注册中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+		<!--配置中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+		<!--undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+		<!--模拟测试-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-mock</artifactId>
+		</dependency>
+		<!--报表相关-->
+		<dependency>
+			<groupId>com.bstek.ureport</groupId>
+			<artifactId>ureport2-console</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

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;
+
+/**
+ *<p>
+ * 报表模块
+ *</p>
+ *
+ * @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);
+	}
+
+}

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;

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;

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;

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;

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;
 
 /**
  *<p>

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;

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;

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;

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;
 

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;
 
 /**
  *<p>

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;
 
 /**

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}

kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/logback-spring.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--基础日志配置,工程继承可以进行替换-->
+<configuration debug="false" scan="false">
+	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+	<property name="log.path" value="logs/${spring.application.name}"/>
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+	<!-- 控制台日志输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件调试输出 -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件错误输出 -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="INFO">
+		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
+		<appender-ref ref="error"/>
+	</root>
+</configuration>

kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/resources/mapper/ReportFileMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cloud.kicc.report.mapper.ReportFileMapper">
+
+</mapper>

kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml

@@ -19,7 +19,7 @@
 			<groupId>com.pig4cloud.plugin</groupId>
 			<artifactId>oss-spring-boot-starter</artifactId>
 		</dependency>
-		<!--system api模块-->
+		<!--common api模块-->
 		<dependency>
 			<groupId>com.cloud</groupId>
 			<artifactId>kicc-common-api</artifactId>
@@ -69,31 +69,11 @@
 			<groupId>com.cloud</groupId>
 			<artifactId>kicc-common-mock</artifactId>
 		</dependency>
-		<!--flowable工作流相关-->
-		<dependency>
-			<groupId>org.flowable</groupId>
-			<artifactId>flowable-ui-modeler-rest</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.liquibase</groupId>
-			<artifactId>liquibase-core</artifactId>
-		</dependency>
 		<!--多数据源-->
 		<dependency>
 			<groupId>com.cloud</groupId>
 			<artifactId>kicc-common-datasource</artifactId>
 		</dependency>
-		<!--报表相关-->
-		<dependency>
-			<groupId>com.bstek.ureport</groupId>
-			<artifactId>ureport2-console</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.poi</groupId>
-					<artifactId>poi-ooxml</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 	</dependencies>
 
 	<build>

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**
  *<p>

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;
 

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;
 
 /**
  *<p>

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;

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;
 

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;
 
 /**
  *<p>

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;
 

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;
 
 /**
  *<p>

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;
 
 /**
  *<p>

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;
 
 /**
  *<p>

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;

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;
 
 /**
  *<p>

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;
 
 /**
  *<p>

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;
 
 /**
  *<p>

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;

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;

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;

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;

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;

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;

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;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/override/json/FlowableBpmnJsonConverter.java

@@ -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);
-    }
-}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualCategoryMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cloud.kicc.system.bigscreen.mapper.VisualCategoryMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="visualCategoryResultMap" type="com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory">
+    <resultMap id="visualCategoryResultMap" type="com.cloud.kicc.system.api.bigscreen.entity.VisualCategory">
         <id column="id" property="id"/>
         <result column="category_key" property="categoryKey"/>
         <result column="category_value" property="categoryValue"/>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cloud.kicc.system.bigscreen.mapper.VisualComponentMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="visualComponentResultMap" type="com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto">
+    <resultMap id="visualComponentResultMap" type="com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
     </resultMap>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualConfigMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cloud.kicc.system.bigscreen.mapper.VisualConfigMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="visualConfigResultMap" type="com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig">
+    <resultMap id="visualConfigResultMap" type="com.cloud.kicc.system.api.bigscreen.entity.VisualConfig">
         <id column="id" property="id"/>
         <result column="visual_id" property="visualId"/>
         <result column="detail" property="detail"/>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualDbMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cloud.kicc.system.bigscreen.mapper.VisualDbMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="datasourceResultMap" type="com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb">
+    <resultMap id="datasourceResultMap" type="com.cloud.kicc.system.api.bigscreen.entity.VisualDb">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
@@ -20,7 +20,7 @@
     </resultMap>
 
     <!-- 数据源查询映射结果 -->
-    <resultMap id="visualDbResultMap" type="com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto">
+    <resultMap id="visualDbResultMap" type="com.cloud.kicc.system.api.bigscreen.dto.VisualDbDto">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="driver_class" property="driverClass"/>

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualMapMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cloud.kicc.system.bigscreen.mapper.VisualMapMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="visualMapResultMap" type="com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto">
+    <resultMap id="visualMapResultMap" type="com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
     </resultMap>