chore: 架构调整兼容

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

@@ -33,6 +33,7 @@
 		<velocity.version>2.3</velocity.version>
 		<flowable.version>6.4.2</flowable.version>
 		<liquibase.version>4.22.0</liquibase.version>
+		<ureport2.version>2.2.9</ureport2.version>
 	</properties>
 
 	<!-- 定义全局jar版本,模块使用需要再次引入但不用写版本号-->
@@ -253,6 +254,11 @@
 				<artifactId>liquibase-core</artifactId>
 				<version>${liquibase.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.bstek.ureport</groupId>
+				<artifactId>ureport2-console</artifactId>
+				<version>${ureport2.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

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

@@ -59,20 +59,6 @@
 			<groupId>com.cloud</groupId>
 			<artifactId>kicc-common-job</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>
 	</dependencies>
 
 	<build>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java

@@ -1,14 +1,12 @@
 package com.cloud.kicc.commonbiz;
 
 import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert;
-import com.cloud.kicc.common.datasource.annotation.EnableDynamicDataSource;
 import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients;
 import com.cloud.kicc.common.job.annotation.EnableKiccXxlJob;
 import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer;
 import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 
 /**
  *<p>
@@ -24,7 +22,6 @@ import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfi
 @SpringBootApplication
 @EnableKiccJacksonAutoConvert
 @EnableKiccXxlJob
-@EnableDynamicDataSource
 public class KiccCommonApplication {
 
 	public static void main(String[] args) {

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

@@ -1,24 +0,0 @@
-package com.cloud.kicc.commonbiz.workflow.override.json;
-
-import org.flowable.bpmn.model.SequenceFlow;
-import org.flowable.bpmn.model.StartEvent;
-import org.flowable.bpmn.model.UserTask;
-import org.flowable.editor.language.json.converter.BpmnJsonConverter;
-
-public class FlowableBpmnJsonConverter extends BpmnJsonConverter {
-    static {
-        convertersToBpmnMap.put(STENCIL_SEQUENCE_FLOW, FlowableSequenceFlowJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_TASK_USER, FlowableUserTaskJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_NONE, FlowableStartEventJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_TIMER, FlowableStartEventJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_CONDITIONAL, FlowableStartEventJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_ERROR, FlowableStartEventJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_ESCALATION, FlowableStartEventJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_MESSAGE, FlowableStartEventJsonConverter.class);
-        convertersToBpmnMap.put(STENCIL_EVENT_START_SIGNAL, FlowableStartEventJsonConverter.class);
-
-        convertersToJsonMap.put(SequenceFlow.class, FlowableSequenceFlowJsonConverter.class);
-        convertersToJsonMap.put(UserTask.class, FlowableUserTaskJsonConverter.class);
-        convertersToJsonMap.put(StartEvent.class, FlowableStartEventJsonConverter.class);
-    }
-}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml

@@ -1,15 +1,5 @@
 server:
   port: 8000
-  undertow:
-    threads:
-      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
-      io: 16
-      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
-      worker: 400
-    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
-    buffer-size: 1024
-    # 是否分配的直接内存
-    direct-buffers: true
 
 spring:
   application:
@@ -17,9 +7,9 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
+        #server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
-        #ip: @profiles.ip@
+        ip: @profiles.ip@
-        #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/ActivityExtensionPropertyMapper.xml

@@ -1,6 +0,0 @@
-<?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.commonbiz.workflow.extension.mapper.ActivityExtensionPropertyMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowAssigneeMapper.xml

@@ -1,6 +0,0 @@
-<?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.commonbiz.workflow.extension.mapper.WorkflowAssigneeMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowButtonMapper.xml

@@ -1,6 +0,0 @@
-<?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.commonbiz.workflow.extension.mapper.WorkflowButtonMapper">
-
-</mapper>

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/workflow/extension/WorkflowConditionMapper.xml

@@ -1,6 +0,0 @@
-<?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.commonbiz.workflow.extension.mapper.WorkflowConditionMapper">
-
-</mapper>

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

@@ -69,6 +69,31 @@
 			<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/KiccSystemApplication.java

@@ -1,6 +1,7 @@
 package com.cloud.kicc.system;
 
 import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert;
+import com.cloud.kicc.common.datasource.annotation.EnableDynamicDataSource;
 import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients;
 import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer;
 import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2;
@@ -20,6 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableKiccFeignClients
 @SpringBootApplication
 @EnableKiccJacksonAutoConvert
+@EnableDynamicDataSource
 public class KiccSystemApplication {
 
 	public static void main(String[] args) {

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualCategoryService;
+import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,7 +28,7 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/category")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/category")
 @Api(value = "可视化分类表", tags = "可视化分类接口")
 public class VisualCategoryController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -9,7 +9,7 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualComponentService;
+import com.cloud.kicc.system.bigscreen.service.IVisualComponentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,7 +30,7 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/component")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/component")
 @Api(value = "可视化组件表", tags = "可视化组件接口")
 public class VisualComponentController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,8 +9,8 @@ import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualCategoryService;
+import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualService;
+import com.cloud.kicc.system.bigscreen.service.IVisualService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -33,7 +33,7 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual")
 @Api(value = "可视化表", tags = "可视化数据接口")
 public class VisualController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,7 +10,7 @@ import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.DynamicModelDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualDbService;
+import com.cloud.kicc.system.bigscreen.service.IVisualDbService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -33,7 +33,7 @@ import java.util.List;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/db")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/db")
 @Api(value = "可视化数据源配置表", tags = "可视化数据源配置接口")
 public class VisualDbController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -9,7 +9,7 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualMapService;
+import com.cloud.kicc.system.bigscreen.service.IVisualMapService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -31,7 +31,7 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/map")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/map")
 @Api(value = "可视化地图配置表", tags = "可视化地图配置接口")
 public class VisualMapController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
@@ -9,7 +9,7 @@ import cn.hutool.json.JSONUtil;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.core.constant.StringPool;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualProxyDto;
-import com.cloud.kicc.commonbiz.util.RequestUtil;
+import com.cloud.kicc.system.bigscreen.util.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -32,7 +32,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual")
 @ApiIgnore
 @Api(value = "接口代理", tags = "接口代理")
 public class VisualProxyController {

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.controller;
+package com.cloud.kicc.system.bigscreen.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,7 +8,7 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualRecordDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualRecordService;
+import com.cloud.kicc.system.bigscreen.service.IVisualRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,7 +28,7 @@ import java.util.Arrays;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/visual/record")
+@RequestMapping(AppConstants.APP_SYSTEM + "/visual/record")
 @Api(value = "可视化数据集表", tags = "可视化数据集接口")
 public class VisualRecordController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualCategoryMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualConfigMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualDbMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.mapper;
+package com.cloud.kicc.system.bigscreen.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualCategoryService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualConfigService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualDbService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service;
+package com.cloud.kicc.system.bigscreen.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualCategoryServiceImpl.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualCategory;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualCategoryMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualCategoryMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualCategoryService;
+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

@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualComponentDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualComponent;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualComponentMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualComponentMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualComponentService;
+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,9 +1,9 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualConfigMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualConfigMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualConfigService;
+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

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
@@ -12,9 +12,9 @@ import com.cloud.kicc.common.datasource.util.DynamicDataSourceUtil;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDbDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualDb;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualDbMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualDbMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualDbService;
+import com.cloud.kicc.system.bigscreen.service.IVisualDbService;
-import com.cloud.kicc.commonbiz.bigscreen.util.PlaceholderUtil;
+import com.cloud.kicc.system.bigscreen.util.PlaceholderUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java

@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualMapDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualMap;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualMapMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualMapMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualMapService;
+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

@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualRecordDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualRecord;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualRecordMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualRecordMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualRecordService;
+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

@@ -1,13 +1,13 @@
-package com.cloud.kicc.commonbiz.bigscreen.service.impl;
+package com.cloud.kicc.system.bigscreen.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.bigscreen.dto.VisualDto;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.Visual;
 import com.cloud.kicc.commonbiz.api.bigscreen.entity.VisualConfig;
-import com.cloud.kicc.commonbiz.bigscreen.mapper.VisualMapper;
+import com.cloud.kicc.system.bigscreen.mapper.VisualMapper;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualConfigService;
+import com.cloud.kicc.system.bigscreen.service.IVisualConfigService;
-import com.cloud.kicc.commonbiz.bigscreen.service.IVisualService;
+import com.cloud.kicc.system.bigscreen.service.IVisualService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/PlaceholderUtil.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.bigscreen.util;
+package com.cloud.kicc.system.bigscreen.util;
 
 import java.util.Map;
 import java.util.Properties;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/RequestUtil.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.util;
+package com.cloud.kicc.system.bigscreen.util;
 
 import cn.hutool.core.util.StrUtil;
 import com.cloud.kicc.common.core.constant.StringPool;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/config/ReportConfiguration.java

@@ -0,0 +1,63 @@
+package com.cloud.kicc.system.report.config;
+
+import com.bstek.ureport.UReportPropertyPlaceholderConfigurer;
+import com.bstek.ureport.console.UReportServlet;
+import com.bstek.ureport.provider.report.ReportProvider;
+import com.cloud.kicc.system.report.datasource.ReportDataSource;
+import com.cloud.kicc.system.report.props.ReportDatabaseProperties;
+import com.cloud.kicc.system.report.props.ReportProperties;
+import com.cloud.kicc.system.report.provider.DatabaseProvider;
+import com.cloud.kicc.system.report.provider.ReportPlaceholderProvider;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.core.annotation.Order;
+
+import javax.servlet.Servlet;
+import javax.sql.DataSource;
+
+/**
+ *<p>
+ * UReport配置类øø
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Order
+@Configuration
+@ConditionalOnProperty(value = "report.enabled", havingValue = "true", matchIfMissing = true)
+@EnableConfigurationProperties({ReportProperties.class, ReportDatabaseProperties.class})
+@ImportResource("classpath:ureport-console-context.xml")
+public class ReportConfiguration {
+
+	@Bean
+	public ServletRegistrationBean<Servlet> registrationBean() {
+		return new ServletRegistrationBean<>(new UReportServlet(), "/ureport/*");
+	}
+
+	@Bean
+	public UReportPropertyPlaceholderConfigurer uReportPropertyPlaceholderConfigurer(ReportProperties properties) {
+		return new ReportPlaceholderProvider(properties);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ReportProvider reportProvider(ReportDatabaseProperties properties, IReportFileService service) {
+		return new DatabaseProvider(properties, service);
+	}
+
+	/**
+	 * 自定义报表可选数据源
+	 */
+	@Bean
+	public ReportDataSource reportDataSource(DataSource dataSource) {
+		return new ReportDataSource(dataSource);
+	}
+
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/datasource/ReportDataSource.java

@@ -0,0 +1,42 @@
+package com.cloud.kicc.system.report.datasource;
+
+import com.bstek.ureport.definition.datasource.BuildinDatasource;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ *<p>
+ * UReport数据源配置
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Slf4j
+@AllArgsConstructor
+public class ReportDataSource implements BuildinDatasource {
+	private static final String NAME = "ReportDataSource";
+
+	private final DataSource dataSource;
+
+	@Override
+	public String name() {
+		return NAME;
+	}
+
+	@Override
+	public Connection getConnection() {
+		try {
+			return dataSource.getConnection();
+		} catch (SQLException e) {
+			log.error("report数据源链接失败");
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/endpoint/ReportEndpoint.java

@@ -0,0 +1,61 @@
+package com.cloud.kicc.system.report.endpoint;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cloud.kicc.common.core.api.R;
+import com.cloud.kicc.common.core.constant.AppConstants;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ *<p>
+ * UReport API端点
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@ApiIgnore
+@RestController
+@AllArgsConstructor
+@RequestMapping(AppConstants.APP_SYSTEM + "/report/rest")
+public class ReportEndpoint {
+
+	private final IReportFileService service;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	public R<ReportFileEntity> detail(ReportFileEntity file) {
+		ReportFileEntity detail = service.getOne(Wrappers.lambdaQuery());
+		return R.ok(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	public R<IPage<ReportFileEntity>> list(Page page, @RequestParam Map<String, Object> file) {
+		IPage<ReportFileEntity> pages = service.page(page, Wrappers.lambdaQuery());
+		return R.ok(pages);
+	}
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	public R remove(@RequestParam String ids) {
+		boolean temp = service.removeByIds(Arrays.asList(StrUtil.join(",", ids)));
+		return R.ok(temp);
+	}
+
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/entity/ReportFileEntity.java

@@ -0,0 +1,39 @@
+package com.cloud.kicc.system.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.cloud.kicc.common.data.entity.CommonEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *<p>
+ * UReport实体类
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Data
+@TableName("sys_report_file")
+public class ReportFileEntity extends CommonEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+	/**
+	 * 文件名
+	 */
+	private String name;
+	/**
+	 * 文件内容
+	 */
+	private byte[] content;
+
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/mapper/ReportFileMapper.java

@@ -0,0 +1,15 @@
+package com.cloud.kicc.system.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+
+/**
+ *<p>
+ * UReport Mapper
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+public interface ReportFileMapper extends BaseMapper<ReportFileEntity> {
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportDatabaseProperties.java

@@ -0,0 +1,20 @@
+package com.cloud.kicc.system.report.props;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ *<p>
+ * UReport配置类
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Data
+@ConfigurationProperties(prefix = "report.database.provider")
+public class ReportDatabaseProperties {
+	private String name = "数据库文件系统";
+	private String prefix = "kicc-";
+	private boolean disabled = false;
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/props/ReportProperties.java

@@ -0,0 +1,23 @@
+package com.cloud.kicc.system.report.props;
+
+import com.cloud.kicc.common.core.constant.StringPool;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ *<p>
+ * UReport配置类
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Data
+@ConfigurationProperties(prefix = "report")
+public class ReportProperties {
+	private Boolean enabled = true;
+	private Boolean disableHttpSessionReportCache = false;
+	private Boolean disableFileProvider = true;
+	private String fileStoreDir = StringPool.EMPTY;
+	private Boolean debug = false;
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/DatabaseProvider.java

@@ -0,0 +1,94 @@
+package com.cloud.kicc.system.report.provider;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bstek.ureport.provider.report.ReportFile;
+import com.bstek.ureport.provider.report.ReportProvider;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+import com.cloud.kicc.system.report.props.ReportDatabaseProperties;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import lombok.AllArgsConstructor;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *<p>
+ * 数据库文件处理
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@AllArgsConstructor
+public class DatabaseProvider implements ReportProvider {
+
+	private final ReportDatabaseProperties properties;
+	private final IReportFileService service;
+
+	@Override
+	public InputStream loadReport(String file) {
+		ReportFileEntity reportFileEntity = service.getOne(Wrappers.<ReportFileEntity>lambdaQuery().eq(ReportFileEntity::getName, getFileName(file)));
+		byte[] content = reportFileEntity.getContent();
+		return new ByteArrayInputStream(content);
+	}
+
+	@Override
+	public void deleteReport(String file) {
+		service.remove(Wrappers.<ReportFileEntity>lambdaUpdate().eq(ReportFileEntity::getName, getFileName(file)));
+	}
+
+	@Override
+	public List<ReportFile> getReportFiles() {
+		List<ReportFileEntity> list = service.list();
+		List<ReportFile> reportFiles = new ArrayList<>();
+		list.forEach(reportFileEntity -> reportFiles.add(new ReportFile(reportFileEntity.getName(),
+				Date.from(reportFileEntity.getUpdateTime().toInstant(OffsetDateTime.now().getOffset())))));
+		return reportFiles;
+	}
+
+	@Override
+	public void saveReport(String file, String content) {
+		String fileName = getFileName(file);
+		ReportFileEntity reportFileEntity = service.getOne(Wrappers.<ReportFileEntity>lambdaQuery().eq(ReportFileEntity::getName, fileName));
+		if (reportFileEntity == null) {
+			reportFileEntity = new ReportFileEntity();
+			reportFileEntity.setName(fileName);
+			reportFileEntity.setContent(content.getBytes());
+		} else {
+			reportFileEntity.setContent(content.getBytes());
+		}
+		service.saveOrUpdate(reportFileEntity);
+	}
+
+	@Override
+	public String getName() {
+		return properties.getName();
+	}
+
+	@Override
+	public boolean disabled() {
+		return properties.isDisabled();
+	}
+
+	@Override
+	public String getPrefix() {
+		return properties.getPrefix();
+	}
+
+	/**
+	 * 获取标准格式文件名
+	 *
+	 * @param name 原文件名
+	 */
+	private String getFileName(String name) {
+		if (name.startsWith(getPrefix())) {
+			name = name.substring(getPrefix().length());
+		}
+		return name;
+	}
+
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/provider/ReportPlaceholderProvider.java

@@ -0,0 +1,27 @@
+package com.cloud.kicc.system.report.provider;
+
+import com.bstek.ureport.UReportPropertyPlaceholderConfigurer;
+import com.cloud.kicc.system.report.props.ReportProperties;
+
+import java.util.Properties;
+
+/**
+ *<p>
+ * UReport自定义配置
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+public class ReportPlaceholderProvider extends UReportPropertyPlaceholderConfigurer {
+
+	public ReportPlaceholderProvider(ReportProperties properties) {
+		Properties props = new Properties();
+		props.setProperty("ureport.disableHttpSessionReportCache", properties.getDisableHttpSessionReportCache().toString());
+		props.setProperty("ureport.disableFileProvider", properties.getDisableFileProvider().toString());
+		props.setProperty("ureport.fileStoreDir", properties.getFileStoreDir());
+		props.setProperty("ureport.debug", properties.getDebug().toString());
+		this.setProperties(props);
+	}
+
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/IReportFileService.java

@@ -0,0 +1,15 @@
+package com.cloud.kicc.system.report.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+
+/**
+ *<p>
+ * UReport Service
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+public interface IReportFileService extends IService<ReportFileEntity> {
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/report/service/impl/ReportFileServiceImpl.java

@@ -0,0 +1,19 @@
+package com.cloud.kicc.system.report.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.system.report.entity.ReportFileEntity;
+import com.cloud.kicc.system.report.mapper.ReportFileMapper;
+import com.cloud.kicc.system.report.service.IReportFileService;
+import org.springframework.stereotype.Service;
+
+/**
+ *<p>
+ * UReport Service
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @since: 2023/7/5
+ */
+@Service
+public class ReportFileServiceImpl extends ServiceImpl<ReportFileMapper, ReportFileEntity> implements IReportFileService {
+}

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/cmd/RollBackUserTaskCmd.java

@@ -1,7 +1,7 @@
-package com.cloud.kicc.commonbiz.workflow.cmd;
+package com.cloud.kicc.system.workflow.cmd;
 
 import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant;
-import com.cloud.kicc.commonbiz.workflow.util.WorkflowUtil;
+import com.cloud.kicc.system.workflow.util.WorkflowUtil;
 import org.apache.commons.compress.utils.Sets;
 import org.flowable.bpmn.model.FlowNode;
 import org.flowable.bpmn.model.Process;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/FlowableConfig.java

@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.config;
+package com.cloud.kicc.system.workflow.config;
 
-import com.cloud.kicc.commonbiz.workflow.parser.factory.WorkflowActivityBehaviorFactory;
+import com.cloud.kicc.system.workflow.parser.factory.WorkflowActivityBehaviorFactory;
 import org.flowable.spring.SpringProcessEngineConfiguration;
 import org.flowable.spring.boot.EngineConfigurationConfigurer;
 import org.flowable.spring.boot.FlowableProperties;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/LiquibaseConfig.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.config;
+package com.cloud.kicc.system.workflow.config;
 
 import liquibase.Liquibase;
 import liquibase.database.Database;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/config/WebMvcConfig.java

@@ -1,6 +1,6 @@
-package com.cloud.kicc.commonbiz.workflow.config;
+package com.cloud.kicc.system.workflow.config;
 
-import com.cloud.kicc.commonbiz.workflow.interceptor.ModelHandlerInterceptor;
+import com.cloud.kicc.system.workflow.interceptor.ModelHandlerInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowFormController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
@@ -7,7 +7,7 @@ import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.workflow.constant.WorkflowConstant;
 import com.cloud.kicc.commonbiz.api.workflow.entity.Workflow;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowTaskService;
+import com.cloud.kicc.system.workflow.service.WorkflowTaskService;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -37,7 +37,7 @@ import java.util.Map;
  * @Date: 2022/1/4
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/form")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/form")
 @AllArgsConstructor
 public class WorkflowFormController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowModelController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,8 +13,8 @@ import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.exception.ServerErrorException;
 import com.cloud.kicc.commonbiz.api.workflow.entity.WorkflowModel;
 import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowModelService;
+import com.cloud.kicc.system.workflow.service.WorkflowModelService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.AllArgsConstructor;
@@ -55,7 +55,7 @@ import java.util.UUID;
  */
 @Slf4j
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/model")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/model")
 @AllArgsConstructor
 public class WorkflowModelController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowProcessController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
 
 import cn.hutool.core.io.IoUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -10,8 +10,8 @@ import com.cloud.kicc.commonbiz.api.workflow.enums.ExtendMessage;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy;
 import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessDefinitionInfoVo;
 import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo;
-import com.cloud.kicc.commonbiz.workflow.extension.service.WorkflowCopyService;
+import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.HistoryService;
@@ -38,7 +38,7 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/process")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/process")
 public class WorkflowProcessController {
 
     private final TaskService taskService;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/controller/WorkflowTaskController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.controller;
+package com.cloud.kicc.system.workflow.controller;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
@@ -13,9 +13,9 @@ import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionP
 import com.cloud.kicc.commonbiz.api.workflow.vo.ActivityCommentInfoVo;
 import com.cloud.kicc.commonbiz.api.workflow.vo.HistoryTaskInfoVo;
 import com.cloud.kicc.commonbiz.api.workflow.vo.ProcessInstanceInfoVo;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowProcessService;
+import com.cloud.kicc.system.workflow.service.WorkflowProcessService;
-import com.cloud.kicc.commonbiz.workflow.service.WorkflowTaskService;
+import com.cloud.kicc.system.workflow.service.WorkflowTaskService;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.common.engine.impl.identity.Authentication;
@@ -39,7 +39,7 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/task")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/task")
 public class WorkflowTaskController {
 
     private final WorkflowTaskService workflowTaskService;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionDataController.java

@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +21,7 @@ import java.util.List;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/activityExtensionData")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/activityExtensionData")
 @AllArgsConstructor
 public class ActivityExtensionDataController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ActivityExtensionPropertyController.java

@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +21,7 @@ import java.util.List;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/activityExtensionProperty")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/activityExtensionProperty")
 @AllArgsConstructor
 public class ActivityExtensionPropertyController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ButtonController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ButtonService;
+import com.cloud.kicc.system.workflow.extension.service.ButtonService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +22,7 @@ import java.util.Arrays;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/button")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/button")
 @AllArgsConstructor
 public class ButtonController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/CategoryController.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;
-import com.cloud.kicc.commonbiz.workflow.extension.service.CategoryService;
+import com.cloud.kicc.system.workflow.extension.service.CategoryService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,7 +20,7 @@ import java.util.List;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/category")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/category")
 @AllArgsConstructor
 public class CategoryController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ConditionController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ConditionService;
+import com.cloud.kicc.system.workflow.extension.service.ConditionService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,7 +23,7 @@ import java.util.Arrays;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/condition")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/condition")
 @AllArgsConstructor
 public class ConditionController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormCategoryController.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormCategoryService;
+import com.cloud.kicc.system.workflow.extension.service.FormCategoryService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,7 +19,7 @@ import java.util.List;
  * @Date: 2021/12/3
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/formCategory")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/formCategory")
 @AllArgsConstructor
 public class FormCategoryController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionController.java

@@ -1,11 +1,11 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinition;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionService;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,7 +20,7 @@ import java.util.Arrays;
  * @Date: 2021/12/4
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/formDefinition")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/formDefinition")
 @AllArgsConstructor
 public class FormDefinitionController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/FormDefinitionJsonController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionJsonService;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionJsonService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +24,7 @@ import java.util.Arrays;
  * @Date: 2021/12/4
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/formDefinitionJson")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/formDefinitionJson")
 @AllArgsConstructor
 public class FormDefinitionJsonController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/ListenerController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ListenerService;
+import com.cloud.kicc.system.workflow.extension.service.ListenerService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +24,7 @@ import java.util.Arrays;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/listener")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/listener")
 @AllArgsConstructor
 public class ListenerController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/controller/WorkflowCopyController.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.controller;
+package com.cloud.kicc.system.workflow.extension.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,7 +6,7 @@ import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCopy;
-import com.cloud.kicc.commonbiz.workflow.extension.service.WorkflowCopyService;
+import com.cloud.kicc.system.workflow.extension.service.WorkflowCopyService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @Date: 2021/5/13
  */
 @RestController
-@RequestMapping(AppConstants.APP_COMMON + "/workflow/extension/workflowCopy")
+@RequestMapping(AppConstants.APP_SYSTEM + "/workflow/extension/workflowCopy")
 @AllArgsConstructor
 public class WorkflowCopyController {
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionDataMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ActivityExtensionPropertyMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ButtonMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/CategoryMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ConditionMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormCategoryMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionJsonMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/FormDefinitionMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/ListenerMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowAssigneeMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowButtonMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowConditionMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/mapper/WorkflowCopyMapper.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.mapper;
+package com.cloud.kicc.system.workflow.extension.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionDataService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionData;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ActivityExtensionPropertyService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ButtonService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/CategoryService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ConditionService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormCategoryService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionJsonService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/FormDefinitionService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/ListenerService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Listener;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/WorkflowCopyService.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service;
+package com.cloud.kicc.system.workflow.extension.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionDataServiceImpl.java

@@ -1,4 +1,4 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -7,11 +7,11 @@ import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionD
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowAssignee;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowButton;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.WorkflowCondition;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ActivityExtensionDataMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.ActivityExtensionDataMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowAssigneeMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowAssigneeMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowButtonMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowButtonMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.WorkflowConditionMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.WorkflowConditionMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionDataService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionDataService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ActivityExtensionPropertyServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.ActivityExtensionProperty;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ActivityExtensionPropertyMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.ActivityExtensionPropertyMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ActivityExtensionPropertyService;
+import com.cloud.kicc.system.workflow.extension.service.ActivityExtensionPropertyService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ButtonServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Button;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ButtonMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.ButtonMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ButtonService;
+import com.cloud.kicc.system.workflow.extension.service.ButtonService;
 import org.springframework.stereotype.Service;
 
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/CategoryServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Category;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.CategoryMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.CategoryMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.CategoryService;
+import com.cloud.kicc.system.workflow.extension.service.CategoryService;
 import org.springframework.stereotype.Service;
 
 /**

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/ConditionServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.Condition;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.ConditionMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.ConditionMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.ConditionService;
+import com.cloud.kicc.system.workflow.extension.service.ConditionService;
 import org.springframework.stereotype.Service;
 
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormCategoryServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormCategory;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.FormCategoryMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.FormCategoryMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormCategoryService;
+import com.cloud.kicc.system.workflow.extension.service.FormCategoryService;
 import org.springframework.stereotype.Service;
 
 /**

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/workflow/extension/service/impl/FormDefinitionJsonServiceImpl.java

@@ -1,9 +1,9 @@
-package com.cloud.kicc.commonbiz.workflow.extension.service.impl;
+package com.cloud.kicc.system.workflow.extension.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.commonbiz.api.workflow.extension.entity.FormDefinitionJson;
-import com.cloud.kicc.commonbiz.workflow.extension.mapper.FormDefinitionJsonMapper;
+import com.cloud.kicc.system.workflow.extension.mapper.FormDefinitionJsonMapper;
-import com.cloud.kicc.commonbiz.workflow.extension.service.FormDefinitionJsonService;
+import com.cloud.kicc.system.workflow.extension.service.FormDefinitionJsonService;
 import org.springframework.stereotype.Service;
 
 /**