完成 mysql 适配

build.gradle

@@ -76,7 +76,12 @@ dependencyManagement {
 }
 
 dependencies {
-    implementation("com.aizuda:aizuda-service-parent:1.0.0")
+    implementation("com.aizuda:aizuda-service-parent:1.0.0") {
+        // 纯 mysql 运行环境打开该配置排除 PG 依赖
+        // exclude group:"org.postgresql", module:"postgresql"
+    }
+    // mysql 驱动，纯 PG 环境可删除该依赖
+    implementation("mysql:mysql-connector-java:8.0.33")
     implementation("com.github.ben-manes.caffeine:caffeine")
     implementation("org.springframework.boot:spring-boot-starter-websocket")
 

pom.xml

@@ -50,8 +50,20 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-tomcat</artifactId>
 				</exclusion>
+				<!-- 纯 mysql 运行环境打开该配置排除 PG 依赖
+				<exclusion>
+					<groupId>org.postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</exclusion>
+				-->
 			</exclusions>
 		</dependency>
+		<!-- mysql 驱动，纯 PG 环境可删除该依赖 -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.33</version>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>

src/main/java/com/aizuda/boot/modules/flw/controller/ProcessController.java

@@ -15,7 +15,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 流程定义 前端控制器
@@ -67,16 +66,6 @@ public class ProcessController extends ApiController {
         return flwProcessService.getNodeModelById(id);
     }
 
-    @Operation(summary = "根据 id 获取节点 map 列表")
-    @Parameters({
-            @Parameter(name = "id", description = "流程ID")
-    })
-    @Permission("sys:process:get")
-    @PostMapping("/list-node-map")
-    public List<Map<String, Object>> listNodeMap(@RequestParam Long id) {
-        return flwProcessService.listNodeMapById(id);
-    }
-
     @Operation(summary = "查询 id 信息")
     @Parameters({
             @Parameter(name = "id", description = "流程ID")

src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessService.java

@@ -8,7 +8,6 @@ import com.aizuda.bpm.engine.entity.FlwProcess;
 import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 流程分类 服务类
@@ -47,8 +46,6 @@ public interface IFlwProcessService extends IBaseService<FlwProcess> {
      */
     String getNodeModelById(Long id);
 
-    List<Map<String, Object>> listNodeMapById(Long id);
-
     /**
      * 根据 id 查询流程定义相关信息
      *

src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessServiceImpl.java

@@ -140,12 +140,6 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
         return flwProcess.getModelContent();
     }
 
-    @Override
-    public List<Map<String, Object>> listNodeMapById(Long id) {
-        FlwProcess flwProcess = this.checkById(id);
-        return ModelHelper.getNodeMapList(flwProcess.model().getNodeConfig(), null);
-    }
-
     @Override
     public FlwProcessDTO getDtoById(Long id) {
         FlwProcess flwProcess = this.checkById(id);

src/main/java/com/aizuda/boot/modules/system/entity/SysConfigure.java

@@ -34,7 +34,7 @@ public class SysConfigure extends BaseEntity {
 	@Schema(description = "关键字")
 	@NotBlank(groups = Create.class)
 	@Size(max = 255)
-	private String key;
+	private String keyword;
 
 	@Schema(description = "内容")
 	@NotBlank(groups = Create.class)

src/main/resources/application-mysql.yml

@@ -0,0 +1,18 @@
+# mysql 开发环境
+spring:
+  datasource:
+    username: root
+    password:
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+    url: jdbc:p6spy:mysql://127.0.0.1:3306/aizuda-boot
+
+# orm config
+mybatis-plus:
+  configuration:
+    database-id: mysql
+
+aizuda:
+  oss:
+    local-storage:
+      platform: local
+      localFilePath: C://aizuda

src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: aizuda-boot
   profiles:
-    active: pro
+    active: postgresql
   messages:
     basename: i18n.messages
 

src/main/resources/mapper/FlowlongMapper.xml

@@ -39,8 +39,8 @@
         SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,i.create_by AS launch_by,i.create_time AS launch_time,
         t."id" AS task_id,t.create_time,t.task_name,t.display_name,t.task_type,t.perform_type,t.expire_time,t.remind_time,t.remind_repeat
         FROM flw_task t JOIN flw_task_actor a ON t.id=a.task_id LEFT JOIN flw_his_instance i ON i.id=t.instance_id LEFT JOIN flw_process p ON i.process_id=p.id
-        WHERE a.id IN (SELECT f.id FROM flw_task_actor f JOIN sys_user_role r ON r.role_id::TEXT=f.actor_id WHERE f.actor_type=1 AND r.user_id=#{dto.userId}
-        UNION ALL SELECT f.id FROM flw_task_actor f JOIN sys_user_department r ON r.department_id::TEXT=f.actor_id WHERE f.actor_type=2 AND r.user_id=#{dto.userId})
+        WHERE a.id IN (SELECT f.id FROM flw_task_actor f JOIN sys_user_role r ON r.role_id||''=f.actor_id WHERE f.actor_type=1 AND r.user_id=#{dto.userId}
+        UNION ALL SELECT f.id FROM flw_task_actor f JOIN sys_user_department r ON r.department_id||''=f.actor_id WHERE f.actor_type=2 AND r.user_id=#{dto.userId})
         <include refid="sqlConditionProcessTask"></include>
     </select>
 
@@ -78,7 +78,7 @@
     </select>
 
     <select id="selectListHisTaskActorVOByInstanceId" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwHisTaskActorVO">
-        SELECT a.task_id,a.actor_name,(SELECT avatar FROM sys_user WHERE id::TEXT=a.actor_id) AS avatar,a.weight
+        SELECT a.task_id,a.actor_name,(SELECT avatar FROM sys_user WHERE id||''=a.actor_id) AS avatar,a.weight
         FROM flw_his_task_actor a WHERE a.instance_id=#{instanceId}
     </select>