fix: 流程调整

bound-link-api/blink-base/src/main/resources/dev/sa-base.yaml

@@ -230,3 +230,12 @@ smart:
     # 数据库配置检测-执行间隔 默认120秒 可选
     db-refresh-interval: 60
 
+flow:
+  #流程图标的地址
+  baseIconUrl: https://www.dcxxb-xcx.top:8072/dcApp/antX6
+  #流程表单中的附近和图片的地址，为空则默认上传文件时的地址。示例：http://192.168.21.99:2024/upload/public/common/
+  fileBaseUrl:
+  aigcBaseUrl: http://192.168.21.197:3002/api
+  aigcBaseKey: JNAC5CS-ZQHM93K-QY6YNK3-3HDHNW4
+  RAGFlowBaseUrl: http://192.168.21.197:802/api
+  RAGFlowBaseKey: ragflow-dkZTVhNjc0ZjdmMjExZWY5ZGJhMDI0Mm

bound-link-api/blink-start/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>blink-backend</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.cloud</groupId>
+            <artifactId>sa-flow-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.cloud</groupId>
             <artifactId>blink-portal</artifactId>

bound-link-api/blink-start/src/main/java/com/wx/blink/AdminApplication.java

@@ -23,9 +23,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 @MapperScan(value = AdminApplication.COMPONENT_SCAN, annotationClass = Mapper.class)
-@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class, DruidDataSourceAutoConfigure.class, MybatisPlusAutoConfiguration.class})
+@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class, DruidDataSourceAutoConfigure.class, MybatisPlusAutoConfiguration.class},
+        scanBasePackages = {"com.wx.blink", "com.cloud.sa"})
 public class AdminApplication {
-    public static final String COMPONENT_SCAN = "com.wx.blink.*";
+    public static final String COMPONENT_SCAN = "com.wx.blink.*,com.cloud.sa.*";
 
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(AdminApplication.class);

bound-link-api/pom.xml

@@ -18,6 +18,8 @@
         <module>blink-init-db</module>
         <module>blink-portal</module>
         <module>blink-common-dto</module>
+        <module>sa-flow-api</module>
+        <module>sa-flow-common</module>
     </modules>
 
     <properties>
@@ -340,6 +342,17 @@
                 <artifactId>redisson-spring-data-27</artifactId>
                 <version>${redisson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.cloud</groupId>
+                <artifactId>sa-flow-api</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.cloud</groupId>
+                <artifactId>sa-flow-common</artifactId>
+                <version>3.0.0</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>

bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/AppEngineController.java

@@ -7,7 +7,6 @@ import com.cloud.sa.flow.commom.common.model.StResult;
 import com.cloud.sa.flow.commom.common.utils.StString;
 import com.cloud.sa.flow.commom.domain.virentity.ViewFormTop;
 import com.cloud.sa.flow.commom.service.setting.StSettingService;
-import com.cloud.sa.flow.engine.core.StExceptionUtil;
 import com.cloud.sa.flow.engine.service.StFlowService;
 import com.cloud.sa.flow.commom.service.flow.StTaskItemService;
 import com.cloud.sa.flow.commom.domain.entity.StFlowMenu;
@@ -15,6 +14,8 @@ import com.cloud.sa.flow.commom.domain.entity.StFlowTemplate;
 import com.cloud.sa.flow.commom.domain.entity.StTaskitem;
 import com.cloud.sa.flow.commom.domain.virentity.FlowEnteredParam;
 import com.cloud.sa.flow.commom.service.StMenuService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -39,6 +40,7 @@ import java.util.concurrent.ExecutionException;
  * @author lc
  * @date 2024/6/19 17:50
  */
+@Tag(name = "流程中心")
 @RequestMapping("/bpm/core")
 @RestController
 public class AppEngineController {
@@ -58,6 +60,7 @@ public class AppEngineController {
      * @param flowEnteredParam
      * @return
      */
+    @Operation(summary = "提交流程")
     @PostMapping("/instance/savesubmit")
     public StResult SaveSubmitInstance(@Validated @RequestBody FlowEnteredParam flowEnteredParam) {
         StTaskitem taskitem = null;

bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/PersonalSealListController.java

@@ -8,15 +8,11 @@ import com.wx.blink.base.common.domain.RequestUser;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkRequestUtil;
 import com.wx.blink.base.module.support.file.domain.vo.FileUploadVO;
-import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
 
 /**
  * 个人签章Controller

bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/SettingEngineController.java

@@ -3,7 +3,6 @@ package com.cloud.sa.api;
 import com.cloud.sa.flow.commom.common.model.StResult;
 import com.cloud.sa.flow.commom.common.system.StUserInfo;
 import com.cloud.sa.flow.commom.common.utils.StString;
-import com.cloud.sa.flow.commom.domain.common.RedisKeys;
 import com.cloud.sa.flow.commom.domain.entity.*;
 import com.cloud.sa.flow.commom.domain.virentity.TreeNode;
 import com.cloud.sa.flow.commom.service.StMenuService;
@@ -19,7 +18,6 @@ import com.wx.blink.base.common.domain.ResponseDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.naming.ldap.Rdn;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/common/system/StUserInfo.java

@@ -1,9 +1,9 @@
 package com.cloud.sa.flow.commom.common.system;
 
-import com.cloud.sa.base.common.util.SmartRequestUtil;
 import com.cloud.sa.flow.commom.common.utils.StString;
 import com.cloud.sa.flow.commom.domain.common.StGlobalConstant;
 import com.cloud.sa.flow.commom.domain.virentity.StUser;
+import com.wx.blink.base.common.util.BlinkRequestUtil;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.InvocationTargetException;
@@ -16,7 +16,7 @@ import java.lang.reflect.Method;
 @Service
 public class StUserInfo {
     public static Object getLoginUser() {
-        return SmartRequestUtil.getRequestUser();
+        return BlinkRequestUtil.getRequestUser();
     }
 
     public static final ThreadLocal<String> threadLocalValueUserCode = new ThreadLocal<>();

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/domain/UserTaskQueryForm.java

@@ -1,6 +1,6 @@
 package com.cloud.sa.flow.commom.domain;
 
-import com.cloud.sa.base.common.domain.PageParam;
+import com.wx.blink.base.common.domain.PageParam;
 import lombok.Data;
 
 /**

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/domain/virentity/PersonalSeal.java

@@ -3,8 +3,8 @@ package com.cloud.sa.flow.commom.domain.virentity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.cloud.sa.base.common.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.wx.blink.base.common.domain.BaseEntity;
 
 import java.util.Date;
 

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/service/flow/StTaskItemService.java

@@ -1,8 +1,6 @@
 package com.cloud.sa.flow.commom.service.flow;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cloud.sa.base.common.domain.PageResult;
-import com.cloud.sa.base.common.util.SmartPageUtil;
 import com.cloud.sa.flow.commom.common.utils.StConvert;
 import com.cloud.sa.flow.commom.common.utils.StString;
 import com.cloud.sa.flow.commom.domain.UserTaskQueryForm;
@@ -13,6 +11,8 @@ import com.cloud.sa.flow.commom.domain.virentity.FormLoadTemplate;
 import com.cloud.sa.flow.commom.domain.virentity.TaskItemDisplay;
 import com.cloud.sa.flow.commom.domain.virentity.ViewListPassed;
 import com.cloud.sa.flow.commom.domain.virenum.InstanceState;
+import com.wx.blink.base.common.domain.PageResult;
+import com.wx.blink.base.common.util.BlinkPageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,31 +61,31 @@ public class StTaskItemService {
     }
 
     public PageResult<Map> getUserTaskListTodo(UserTaskQueryForm form) {
-        Page<?> page = SmartPageUtil.convert2PageQuery(form);
+        Page<?> page = BlinkPageUtil.convert2PageQuery(form);
         form.setUserId(StUserInfo.getUserCode());
         List<Map> userTaskListTodo = taskItemMapper.getUserTaskListTodo(page, form);
         dealFlowCurStep(userTaskListTodo);
-        PageResult<Map> mapPageResult = SmartPageUtil.convert2PageResult(page, userTaskListTodo);
+        PageResult<Map> mapPageResult = BlinkPageUtil.convert2PageResult(page, userTaskListTodo);
         //TODO 根据filter，过滤数据
         return mapPageResult;
     }
 
     public PageResult<Map> getUserTaskListDone(UserTaskQueryForm form) {
-        Page<?> page = SmartPageUtil.convert2PageQuery(form);
+        Page<?> page = BlinkPageUtil.convert2PageQuery(form);
         form.setUserId(StUserInfo.getUserCode());
         List<Map> userTaskListDone = taskItemMapper.getUserTaskListDone(page, form);
         dealFlowCurStep(userTaskListDone);
-        PageResult<Map> mapPageResult = SmartPageUtil.convert2PageResult(page, userTaskListDone);
+        PageResult<Map> mapPageResult = BlinkPageUtil.convert2PageResult(page, userTaskListDone);
         //TODO 根据filter，过滤数据
         return mapPageResult;
     }
 
     public PageResult<Map> getUserTaskListMyTask(UserTaskQueryForm form) {
-        Page<?> page = SmartPageUtil.convert2PageQuery(form);
+        Page<?> page = BlinkPageUtil.convert2PageQuery(form);
         form.setUserId(StUserInfo.getUserCode());
         List<Map> userTaskListMy = taskItemMapper.getUserTaskListMyTask(page, form);
         dealFlowCurStep(userTaskListMy);
-        PageResult<Map> mapPageResult = SmartPageUtil.convert2PageResult(page, userTaskListMy);
+        PageResult<Map> mapPageResult = BlinkPageUtil.convert2PageResult(page, userTaskListMy);
         return mapPageResult;
     }
 
@@ -117,17 +117,17 @@ public class StTaskItemService {
     }
 
     public PageResult<Map> getUserTaskListQueryTask(UserTaskQueryForm form) {
-        Page<?> page = SmartPageUtil.convert2PageQuery(form);
+        Page<?> page = BlinkPageUtil.convert2PageQuery(form);
         List<Map> map = taskItemMapper.getUserTaskListQueryTask(page, form);
-        PageResult<Map> mapPageResult = SmartPageUtil.convert2PageResult(page, map);
+        PageResult<Map> mapPageResult = BlinkPageUtil.convert2PageResult(page, map);
         return mapPageResult;
     }
 
     public PageResult<Map> getUserTaskListCirculation(UserTaskQueryForm form) {
-        Page<?> page = SmartPageUtil.convert2PageQuery(form);
+        Page<?> page = BlinkPageUtil.convert2PageQuery(form);
         form.setUserId(StUserInfo.getUserCode());
         List<Map> map = taskItemMapper.getUserTaskListCirculation(page, form);
-        PageResult<Map> mapPageResult = SmartPageUtil.convert2PageResult(page, map);
+        PageResult<Map> mapPageResult = BlinkPageUtil.convert2PageResult(page, map);
         return mapPageResult;
     }
 

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/service/genSql/impl/GeneratorSqlForDM.java

@@ -20,7 +20,7 @@ import java.util.*;
  */
 @Service
 //@Profile("prod")
-@Primary
+
 public class GeneratorSqlForDM implements SqlGeneratorService {
     public static final List<String> containField = new ArrayList<>(new ArrayList<>(Arrays.asList(
             "create_by", "create_by", "update_by", "update_time")));

bound-link-api/sa-flow-common/src/main/java/com/cloud/sa/flow/commom/service/genSql/impl/GeneratorSqlForMysql.java

@@ -22,6 +22,7 @@ import java.util.Set;
  */
 @Service
 //@Profile("dev")
+@Primary
 public class GeneratorSqlForMysql implements SqlGeneratorService {
     public String createTableStatement(String tableName, List<Column> columns) {
         StringBuilder createTableSql = new StringBuilder("CREATE TABLE  " + tableName + " (\n");

bound-link-api/sa-flow-common/src/main/resources/mapper/StFlowTemplateMapper.xml

@@ -41,7 +41,6 @@
         </if>
         order by version desc
         limit 1
-        --#只获取发布的数据
     </select>
     <select id="getUnPublishID" resultType="java.util.Map">
         select id, "version"

bound-link-api/sa-flow-common/src/main/resources/mapper/StFormTemplateMapper.xml

@@ -118,7 +118,7 @@
         WHERE objectid = #{objectid}
     </select>
     <select id="getScriptByFlowCode" resultType="com.cloud.sa.flow.commom.domain.entity.StScript">
-        SELECT objectid, key, flow_code flowCode, script_value scriptValue
+        SELECT objectid, `key`, flow_code flowCode, script_value scriptValue
         FROM st_script
         WHERE flow_code = #{flowCode}
     </select>
@@ -126,15 +126,15 @@
     <select id="deleteAndInsertScript" parameterType="com.cloud.sa.flow.commom.domain.entity.StScript">
         DELETE
         from st_script
-        where flow_code = #{flowCode} and key=#{key};
-        INSERT INTO st_script (objectid, key, flow_code, script_value, update_by, update_time)
+        where flow_code = #{flowCode} and `key`=#{key};
+        INSERT INTO st_script (objectid, `key`, flow_code, script_value, update_by, update_time)
         VALUES (#{objectid}, #{key}, #{flowCode}, #{scriptValue}, #{updateBy}, NOW());
     </select>
     <select id="getHistoryScriptNum" resultType="java.lang.Integer">
-        select count(1) from st_script_history where key = #{key} and flow_code = #{flowCode}
+        select count(1) from st_script_history where `key` = #{key} and flow_code = #{flowCode}
     </select>
     <select id="historyScript" parameterType="com.cloud.sa.flow.commom.domain.entity.StScriptHistory">
-        INSERT INTO st_script_history (objectid, key, flow_code, script_value, version, create_by, create_time)
+        INSERT INTO st_script_history (objectid, `key`, flow_code, script_value, version, create_by, create_time)
         VALUES (#{objectid}, #{key}, #{flowCode}, #{scriptValue}, #{version}, #{createBy}, NOW());
     </select>
     <select id="getDictByType" resultType="com.cloud.sa.flow.commom.domain.virentity.DictionaryParam">
@@ -151,7 +151,7 @@
         FROM view_dict_type where dict_type=#{type}
     </select>
     <select id="getScriptHistory" resultType="com.cloud.sa.flow.commom.domain.entity.StScriptHistory">
-        SELECT  script_value scriptValue,version,create_by createBy,create_time createTime from st_script_history where flow_code =#{flowCode} and key =#{key} order by version desc limit 30
+        SELECT  script_value scriptValue,version,create_by createBy,create_time createTime from st_script_history where flow_code =#{flowCode} and `key` =#{key} order by version desc limit 30
     </select>
     <select id="getFormTemplateNum" resultType="java.lang.Integer">
         SELECT count(1) from st_form_template_history where flow_code = #{flowCode} and type =#{type}