增加app_id字段

账户详情接口

.gitignore

@@ -63,3 +63,6 @@ $RECYCLE.BIN/
 /base-buildpackage/target/
 /base-common/target/
 /base-core/target/
+/base-webapp/target/classes/com/hzya/frame/
+/fw-weixin/target/
+/E:/yongansystem/log/2024-10-15/

base-buildpackage/pom.xml

@@ -38,6 +38,18 @@
                 <profile.active>llg</profile.active>
             </properties>
         </profile>
+        <profile>
+            <id>xel</id> <!--xel-->
+            <properties>
+                <profile.active>xel</profile.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>zqtlocal</id> <!--曾庆拓-->
+            <properties>
+                <profile.active>zqtlocal</profile.active>
+            </properties>
+        </profile>
        
     </profiles>
     <build>

base-buildpackage/src/main/java/com/hzya/frame/plugin/BackUpDatabase/plugin/BackUpDatabaseInitializer.java

@@ -0,0 +1,386 @@
+package com.hzya.frame.plugin.BackUpDatabase.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+import com.jcraft.jsch.Channel;
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.SftpATTRS;
+import com.jcraft.jsch.SftpException;
+import org.apache.commons.net.ftp.FTPClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+
+/**
+ * 主数据模版(MdmModule)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-18 10:33:32
+ */
+public class BackUpDatabaseInitializer extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(BackUpDatabaseInitializer.class);
+
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "BackUpDatabasePlugin";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "数据库备份下发";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "BackUpDatabasePlugin";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    @Value("${database.filePase:}")
+    private String filePase;//文件保存路径
+
+    @Value("${database.fileName:data.sql}")
+    private String fileName;//文件保存名称
+
+    @Value("${database.databaseName:}")
+    private String databaseName;//库名
+
+    @Value("${database.host:}")
+    private String host;//地址
+
+    @Value("${database.port:}")
+    private String port;//端口
+
+    @Value("${database.username:}")
+    private String username;//用户名
+
+    @Value("${database.password:}")
+    private String password;//密码
+
+
+    @Value("${sftp.host:}")
+    private String sftpHost;
+
+    @Value("${sftp.port:}")
+    private Integer sftpPort;
+
+    @Value("${sftp.username:}")
+    private String sftpUsername;
+
+    @Value("${sftp.password:}")
+    private String sftpPassword;
+
+    @Value("${sftp.filePase:}")
+    private String sftpFilePase;
+
+
+    private ChannelSftp sftp = null;
+    private Session sshSession = null;
+
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+        try {
+            if(filePase == null || "".equals(filePase)
+                || databaseName == null || "".equals(databaseName)
+                || fileName == null || "".equals(fileName)
+                || host == null || "".equals(host)
+                || port == null || "".equals(port)
+                || username == null || "".equals(username)
+                || password == null || "".equals(password)
+            ){
+                return BaseResult.getSuccessMessageEntity("系统参数未配置不执行，数据库备份");
+            }
+            //查找是否存在当天数据库
+            //格式化日期
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String data = sdf.format(new Date());
+            //当天路径
+            String nowDatabasePase = filePase + File.separator + data;
+            //不判断文件是否存在，直接执行
+            if(!backFile(nowDatabasePase)){
+                return BaseResult.getFailureMessageEntity("备份失败");
+            }
+            //判断是否有sftp配置，有的备份，没有的不备份
+            if(sftpHost != null && !"".equals(sftpHost)
+                && sftpPort != null && !"".equals(sftpPort)
+                && sftpUsername != null && !"".equals(sftpUsername)
+                && sftpPassword != null && !"".equals(sftpPassword)
+                && sftpFilePase != null && !"".equals(sftpFilePase)
+            ){
+                String sftpnowDatabasePase = sftpFilePase + File.separator + data;
+                if(!sendFile(nowDatabasePase,sftpnowDatabasePase)){
+                    return BaseResult.getFailureMessageEntity("备份失败");
+                }
+            }
+            logger.info("执行成功");
+            return BaseResult.getSuccessMessageEntity("执行成功");
+        } catch (Exception e) {
+            logger.error("执行失败{}", e.getMessage());
+            return BaseResult.getFailureMessageEntity("备份失败");
+        }
+    }
+
+    private boolean backFile(String nowDatabasePase) {
+        try {
+            // 构建 mysqldump 命令
+            ProcessBuilder processBuilder = new ProcessBuilder(
+                    "mysqldump",
+                    "--ssl-mode=DISABLED",
+                    "-h", host,
+                    "-u", username,
+                    "-p" + password,
+                    "-P" + port,
+                    databaseName);
+            // 启动进程并获取输入流
+            Process process = processBuilder.start();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            File f  = creatFile(nowDatabasePase,fileName);
+            // 将备份内容写入文件
+            FileWriter writer = new FileWriter(f);
+            String line;
+            while ((line = reader.readLine())!= null) {
+                writer.write(line + "\n");
+            }
+            // 关闭资源
+            reader.close();
+            writer.close();
+            process.waitFor();
+            logger.info("文件备份成功路径："+nowDatabasePase+ File.separator +fileName);
+            return true;
+        } catch (IOException | InterruptedException e) {
+            logger.info("文件备份失败："+e.getMessage());
+            return false;
+        }
+    }
+    /**
+     * @Author lvleigang
+     * @Description  创建目录及文件
+     * @Date 8:59 上午 2024/10/22
+     * @param filePath
+     * @param fileName
+     * @return java.io.File
+     **/
+    public File creatFile(String filePath, String fileName) {
+        File folder = new File(filePath);
+        //文件夹路径不存在
+        if (!folder.exists()) {
+            boolean mkdirs = folder.mkdirs();
+        }
+        // 如果文件不存在就创建
+        File file = new File(filePath + File.separator + fileName);
+        if (!file.exists()) {
+            try {
+                file.createNewFile();
+            } catch (IOException e) {
+                logger.error("创建备份文件失败："+e.getMessage());
+            }
+        }
+        return file;
+    }
+
+    private boolean sendFile(String localFilePath,String remoteFileName) {
+        try {
+            connect();
+            uploadFile(remoteFileName,fileName,localFilePath,fileName);
+            disconnect();
+            return true;
+        } catch (Exception e) {
+            logger.error("sftp文件上传失败:"+e.getMessage());
+            return false;
+        }
+    }
+
+    public void connect() {
+        try {
+            JSch jsch = new JSch();
+            jsch.getSession(sftpUsername, sftpHost, sftpPort);
+            sshSession = jsch.getSession(sftpUsername, sftpHost, sftpPort);
+            if (logger.isInfoEnabled()) {
+                logger.info("Session created.");
+            }
+            sshSession.setPassword(sftpPassword);
+            Properties sshConfig = new Properties();
+            sshConfig.put("StrictHostKeyChecking", "no");
+            sshSession.setConfig(sshConfig);
+            sshSession.connect();
+            if (logger.isInfoEnabled()) {
+                logger.info("Session connected.");
+            }
+            Channel channel = sshSession.openChannel("sftp");
+            channel.connect();
+            if (logger.isInfoEnabled()) {
+                logger.info("Opening Channel.");
+            }
+            sftp = (ChannelSftp) channel;
+            if (logger.isInfoEnabled()) {
+                logger.info("Connected to " + host + ".");
+            }
+        } catch (Exception e) {
+        }
+    }
+
+    /**
+     * 关闭连接
+     */
+    public void disconnect() {
+        if (this.sftp != null) {
+            if (this.sftp.isConnected()) {
+                this.sftp.disconnect();
+                if (logger.isInfoEnabled()) {
+                    logger.info("sftp is closed already");
+                }
+            }
+        }
+        if (this.sshSession != null) {
+            if (this.sshSession.isConnected()) {
+                this.sshSession.disconnect();
+                if (logger.isInfoEnabled()) {
+                    logger.info("sshSession is closed already");
+                }
+            }
+        }
+    }
+
+    /**
+     * 上传单个文件
+     *
+     * @param remotePath：远程保存目录
+     * @param remoteFileName：保存文件名
+     * @param localPath：本地上传目录(以路径符号结束)
+     * @param localFileName：上传的文件名
+     * @return
+     */
+    public boolean uploadFile(String remotePath, String remoteFileName, String localPath, String localFileName) {
+        FileInputStream in = null;
+        try {
+            createDir(remotePath);
+            File file = new File(localPath + File.separator +  localFileName);
+            in = new FileInputStream(file);
+            sftp.put(in, remoteFileName, 65536);
+            return true;
+        } catch (FileNotFoundException e) {
+        } catch (SftpException e) {
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 创建目录
+     *
+     * @param createpath
+     * @return
+     */
+    public boolean createDir(String createpath) {
+        try {
+            if (isDirExist(createpath)) {
+                this.sftp.cd(createpath);
+                return true;
+            }
+            String pathArry[] = createpath.split("/");
+            StringBuffer filePath = new StringBuffer("/");
+            for (String path : pathArry) {
+                if (path.equals("")) {
+                    continue;
+                }
+                filePath.append(path + "/");
+                if (isDirExist(filePath.toString())) {
+                    sftp.cd(filePath.toString());
+                } else {
+                    // 建立目录
+                    sftp.mkdir(filePath.toString());
+                    // 进入并设置为当前目录
+                    sftp.cd(filePath.toString());
+                }
+
+            }
+            this.sftp.cd(createpath);
+            return true;
+        } catch (SftpException e) {
+        }
+        return false;
+    }
+
+    /**
+     * 判断目录是否存在
+     *
+     * @param directory
+     * @return
+     */
+    public boolean isDirExist(String directory) {
+        boolean isDirExistFlag = false;
+        try {
+            SftpATTRS sftpATTRS = sftp.lstat(directory);
+            isDirExistFlag = true;
+            return sftpATTRS.isDir();
+        } catch (Exception e) {
+            if (e.getMessage().toLowerCase().equals("no such file")) {
+                isDirExistFlag = false;
+            }
+        }
+        return isDirExistFlag;
+    }
+
+
+
+    /**
+     * 如果目录不存在就创建目录
+     *
+     * @param path
+     */
+    public void mkdirs(String path) {
+        File f = new File(path);
+
+        String fs = f.getParent();
+
+        f = new File(fs);
+
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+    }
+
+
+
+
+
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java

@@ -452,6 +452,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                                             }
                                         }
                                     } catch (Exception e) {
+                                        logger.info("执行异常错误原因："+e);
                                         logger.error("新增返回脚本解析保存三方id错误"+jsonResultEntity.getAttribute());
                                         taskDetailEntity.setResult("新增返回脚本解析保存三方id错误");
                                         taskLivingDetailsService.updateLogFailToSuccess(taskDetailEntity);
@@ -543,7 +544,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
         map1.put("tableName",mainDb);
         map1.put("dataStatus", "N");
         map1.put("deleteStatus", "0");
-        map1.put("size", 10);
+        map1.put("size", 50);
         objects = mdmModuleDao.queryMdmSTs(map1);
         objects = toLowerCaseKeys(objects);
 
@@ -738,7 +739,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
         map1.put("tableName",mainDb);
         //map1.put("dataStatus", "F");
         map1.put("updateStatus", "0");
-        map1.put("size", 10);
+        map1.put("size", 50);
         objects = mdmModuleDao.queryMdmSTs(map1);
         objects = toLowerCaseKeys(objects);
 
@@ -926,7 +927,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
         map1.put("tableName",mainDb);
         //map1.put("dataStatus", "Y");
         map1.put("addStatus", "0");
-        map1.put("size", 100);
+        map1.put("size", 50);
         objects = mdmModuleDao.queryMdmSTs(map1);
         objects = toLowerCaseKeys(objects);
 
@@ -991,6 +992,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                 mdmModuleSendLogEntity.setTableName(mainDb+"_send_log");
                 mdmModuleSendLogEntity.setFormmainId(doObjects.get(i).getString("id"));
                 mdmModuleSendLogEntity.setSts("Y");
+                mdmModuleSendLogEntity.setDataType("1");
                 mdmModuleSendLogEntity.setAppId(sysApplicationEntity.getId());
                 mdmModuleSendLogEntity.setApiId(apiEntity.getId());
                 //mdmModuleSendLogEntity.setDistributeId(mdmModuleDistributeEntities.get(i1).getId());
@@ -1121,10 +1123,12 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
                     }
                     //保存日志
                     saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"1","发送成功",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
+                    objects.get(i).put("sendsanfzt123",true);
                     continue;
                 }else {
                     //保存日志
                     saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
+                    objects.get(i).put("sendsanfzt123",false);
                     continue;
                 }
             }
@@ -1132,12 +1136,14 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
 
         //所有下发发送完成，修改数据状态
         for (int i = 0; i < objects.size(); i++) {
-            Map<String, Object> updateMap = new HashMap<>();
-            updateMap.put("tableName",mainDb);
-            //updateMap.put("dataStatus", "Y");
-            updateMap.put("addStatus", "1");
-            updateMap.put("id", objects.get(i).getString("id"));
-            mdmModuleDao.updateMdmSTs(updateMap);
+            if(objects.get(i).getBoolean("sendsanfzt123")){
+                Map<String, Object> updateMap = new HashMap<>();
+                updateMap.put("tableName",mainDb);
+                //updateMap.put("dataStatus", "Y");
+                updateMap.put("addStatus", "1");
+                updateMap.put("id", objects.get(i).getString("id"));
+                mdmModuleDao.updateMdmSTs(updateMap);
+            }
         }
     }
 

base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/plugin/PushMessagePluginInitializer.java

@@ -62,6 +62,7 @@ public class PushMessagePluginInitializer extends PluginBaseEntity {
     public JsonResultEntity executeBusiness(JSONObject requestJson) {
         try {
             logger.info("======开始执行定时消息推送========");
+            //目前只查询一周内的异常日志进行消息推送
             List<SysPushMessageEntity> list = sysPushMessageDao.getAll();
 
             for(SysPushMessageEntity entity : list){

base-buildpackage/src/main/resources/application-llg.yml

@@ -45,7 +45,7 @@ savefile:
   tomcatpath: /Users/apple/Desktop/log/local
   pluginpath: /Users/apple/Desktop/log/local
 zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
   appId: 1P4AGrpz
   appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
@@ -59,4 +59,24 @@ cbs8:
   #电子回单下载临时存放位置
   elec_path: /Users/xiangerlin/Downloads/
 OA:
-  data_source_code: yc_oa
+  data_source_code: yc_oa
+server:
+  port: 10086
+
+#  mysqldump -d mylm -hhzya.ufyct.com -p9096  -uroot -phzya1314 >%dirName%\table_view.sql
+
+
+database:
+  databaseName: businesscenter
+  host: 192.168.2.237
+  port: 3306
+  username: root
+  password: hzya@1314
+  filePase: /Users/apple/Desktop/log
+  fileName: data.sql
+#sftp:
+#  host: 192.168.2.237
+#  port: 9091
+#  username: cs237
+#  password: hzya@1314
+#  filePase: /databaseBack

base-buildpackage/src/main/resources/application-xel.yml

@@ -14,22 +14,10 @@ spring:
         master:
           url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
-          password: 62e4295b615a30dbf3b8ee96f41c820b
+          password: bd993088e8a7c3dc5f44441617f9b4bf
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 savefile:
     #    文件保存路径
   path: /Users/xiangerlin/work/app/file/dev
-cbs8:
-  appId: 1P4AGrpz
-  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
-  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
-    # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
-  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
-  # 这个私钥到时候上传到cbs，和下面到是同一对
-  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
-  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
-  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
-  #电子回单下载临时存放位置
-  elec_path: /Users/xiangerlin/Downloads/
-OA:
-  data_source_code: yc-test
+  pluginpath: /Users/xiangerlin/work/app/file/dev
+  tomcatpath: /Users/xiangerlin/work/app/file/dev

base-buildpackage/src/main/resources/application-zqtlocal.yml

@@ -36,4 +36,4 @@ cbs8:
 OA:
   data_source_code: yc_oa
 zt:
-  url: http://127.0.0.1:9082/kangarooDataCenterV3/entranceController/externalCallInterface
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface

base-buildpackage/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9999
+  port: 10086
   servlet:
     context-path: /kangarooDataCenterV3
   localIP: 127.0.0.1
@@ -93,7 +93,7 @@ mybatis-plus:
     db-config:
       id-type: auto  # 主键策略
 zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
 #JimuReport[minidao配置]
 minidao :
   base-package: org.jeecg.modules.jmreport.desreport.dao*
@@ -126,3 +126,17 @@ jeecg :
     bucketName: ??
 data:
   use: true
+database:
+  databaseName:
+  host:
+  port:
+  username:
+  password:
+  filePase:
+  fileName:
+sftp:
+  host:
+  port:
+  username:
+  password:
+  filePase:

base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/pluginCfg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+<id>BackUpDatabasePlugin</id>
+<name>BackUpDatabasePlugin插件</name>
+<category>20241021</category>
+</plugin>

base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/spring/spring-buildpackage-plugin.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+<bean name="backUpDatabaseInitializer" class="com.hzya.frame.plugin.BackUpDatabase.plugin.BackUpDatabaseInitializer" />
+</beans>

base-buildpackage/src/test/java/com/hzya/frame/temButtom.java

@@ -1,19 +1,37 @@
 package com.hzya.frame;
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.util.AESUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @ClassName dsasas
  * @Description
  * @Author llg
  * Date 2023/7/16 8:18 上午
  */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {WebappApplication.class})
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = {WebappApplication.class})
 public class temButtom {
 
     @Test
@@ -25,6 +43,104 @@ public class temButtom {
     }
 
 
+    @Test
+    public void test02() {
+//	1056162015172640840	-7858803986346327947	3178176833471791293	合同评审-待办测试(bdmanager 2024-10-22 16:45)	7743552636545550897	bdmanager	18058147870	pending	start	success	新增成功!
+//	success	更新待办为已办成功！
+//	task7803207f54ff047d6008dcce31c2628f	新增成功!
+//	2024-10-24	2024-10-24
+
+        String phone ="19357235324";
+        String taskid ="task8b0c7ca72439bc9b0c1c89e8866c8275";
+        //token
+        Map<String, String> headers = new HashMap<>();
+        String token ="https://oapi.dingtalk.com/gettoken?appkey=dingxewtjaserj292ggu&appsecret=DuRw6EEEvhGXfr6Q8wN_x4025qKjrffIGCXF9KeCKKIID-LVSsR6_8KWMei6sug1";
+        String body = sendGet(token,headers);
+        JSONObject tokenobject = JSONObject.parseObject(body);
+
+        //钉钉id
+        headers = new HashMap<>();
+        //https://oapi.dingtalk.com/user/get_by_mobile?access_token=9abd3996cb103ba48dd8c69fea5473e7&mobile=15700100840
+        String ddid ="https://oapi.dingtalk.com/user/get_by_mobile?access_token="+tokenobject.get("access_token")+"&mobile="+phone;
+        String ddidbody = sendGet(ddid,headers);
+        JSONObject ddidobject = JSONObject.parseObject(ddidbody);
+
+        //人员id
+        headers = new HashMap<>();
+        //https://oapi.dingtalk.com/user/get?userid=111336474727636213&access_token=3d21a6614fb037a98542a537336e8149
+        String userid ="https://oapi.dingtalk.com/user/get?userid="+ddidobject.get("userid")+"&access_token="+tokenobject.get("access_token");
+        String useridbody = sendGet(userid,headers);
+        JSONObject useridobject = JSONObject.parseObject(useridbody);
+
+
+
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        HttpPut httpPut = new HttpPut("https://api.dingtalk.com/v1.0/todo/users/"+useridobject.get("unionid")+"/tasks/"+taskid);
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
+        httpPut.setConfig(requestConfig);
+        httpPut.setHeader("Content-type", "application/json");
+        httpPut.setHeader("x-acs-dingtalk-access-token", tokenobject.getString("access_token"));
+        Map<String, Object> dataMap = new HashMap();
+        dataMap.put("done", true);
+        CloseableHttpResponse httpResponse = null;
+
+        try {
+            httpPut.setEntity(new StringEntity("{\"done\": true}"));
+            httpResponse = httpClient.execute(httpPut);
+            HttpEntity entity = httpResponse.getEntity();
+            String results = EntityUtils.toString(entity);
+            System.out.println(results);
+        } catch (Exception var15) {
+        } finally {
+            try {
+                httpResponse.close();
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    private String sendGet(String url, Map<String, String> headers) {
+        HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+        // HttpClient
+        CloseableHttpClient closeableHttpClient = httpClientBuilder.disableCookieManagement().build();
+        HttpGet get = new HttpGet(url.toString());
+        CloseableHttpResponse response = null;
+
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(60000).build();
+        get.setConfig(requestConfig);//设置请求参数【超时时间】
+        if (headers != null && headers.size() > 0) {
+            for (String key : headers.keySet()) {
+                get.setHeader(key, headers.get(key));
+            }
+        }
+        StringBuilder body = new StringBuilder();
+
+        try {
+
+            response = closeableHttpClient.execute(get);
+            HttpEntity entity = response.getEntity();
+             body.append(EntityUtils.toString(entity,"UTF-8"));
+        } catch (Exception e) {
+            body.append(e.getMessage());
+        } finally {
+            try {
+                // 关闭响应对象
+                if (response != null) {
+                    response.close();
+                }
+                // 关闭响应对象
+                if (closeableHttpClient != null) {
+                    closeableHttpClient.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return body.toString();
+    }
 
 
 }

base-service/src/main/java/com/hzya/frame/dingtalk/enums/OrgEventEnum.java

@@ -0,0 +1,48 @@
+package com.hzya.frame.dingtalk.enums;
+
+/**
+ * @Description 通讯录事件类型
+ * @Author xiangerlin
+ * @Date 2024/8/27 15:58
+ **/
+public enum OrgEventEnum {
+    USER_ADD_ORG("user_add_org","通讯录用户新增"),
+    USER_MODIFY_ORG("user_modify_org","通讯录用户更改"),
+    USER_LEAVE_ORG("user_leave_org","通讯录用户离职"),
+    USER_ACTIVE_ORG("user_active_org","加入企业后用户激活"),
+    ORG_DEPT_CREATE("org_dept_create","通讯录企业部门创建"),
+    ORG_DEPT_MODIFY("org_dept_modify","通讯录企业部门更改"),
+    ORG_DEPT_REMOVE("org_dept_remove","通讯录企业部门删除"),
+    ;
+
+
+    private String code;
+    private String explain;
+
+    OrgEventEnum(String code, String explain) {
+        this.code = code;
+        this.explain = explain;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getExplain() {
+        return explain;
+    }
+
+    /**
+     * 根据code获取事件类型
+     * @param code
+     * @return
+     */
+    public static OrgEventEnum getByCode(String code){
+        for (OrgEventEnum org : OrgEventEnum.values()) {
+            if (org.getCode().equals(code)){
+                return org;
+            }
+        }
+        return null;
+    }
+}

base-service/src/main/java/com/hzya/frame/dingtalk/service/IDingTalkExtService.java

@@ -0,0 +1,32 @@
+package com.hzya.frame.dingtalk.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+
+/**
+ * @Description 钉钉集成扩展类
+ * @Author xiangerlin
+ * @Date 2024/8/28 14:25
+ **/
+public interface IDingTalkExtService {
+
+    /**
+     * 调用这个方法初始化钉钉参数
+     * @param entity
+     * @return
+     */
+    SysExtensionApiEntity init(SysExtensionApiEntity entity);
+
+    /**
+     * 查询配置在应用上的钉钉参数
+     * @param sysApplication
+     * @return
+     */
+    JSONObject getDingTalkConfig(SysApplicationEntity sysApplication);
+
+    /**
+     * 清空配置缓存
+     */
+    void clearDingTalkConfigCatch();
+}

base-service/src/main/java/com/hzya/frame/dingtalk/service/IDingTalkService.java

@@ -0,0 +1,66 @@
+package com.hzya.frame.dingtalk.service;
+
+import com.dingtalk.api.request.OapiV2UserListRequest;
+import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
+import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
+import com.dingtalk.api.response.OapiV2UserGetResponse;
+import com.dingtalk.api.response.OapiV2UserListResponse;
+
+import java.util.List;
+
+/**
+ * @Description 钉钉service
+ * @Author xiangerlin
+ * @Date 2024/8/27 16:17
+ **/
+public interface IDingTalkService {
+
+    /**
+     * 根据userid获取用户详情
+     * @param userId 钉钉userid
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    OapiV2UserGetResponse.UserGetResponse getUserById(String userId, String appKey, String appSecret);
+
+    /**
+     * 根据userid获取用户详情
+     * @param userId
+     * @return
+     */
+    OapiV2UserGetResponse.UserGetResponse getUserById(String userId);
+
+    /**
+     * 获取部门用户列表
+     * @param req 请求参数
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    OapiV2UserListResponse.PageResult getUserListByDeptId(OapiV2UserListRequest req, String appKey, String appSecret);
+    /**
+     * 根据部门id获取部门详情
+     * @param deptId 钉钉部门id
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    OapiV2DepartmentGetResponse.DeptGetResponse getDeptById(Long deptId, String appKey, String appSecret);
+
+    /**
+     * 根据部门id获取部门详情
+     * @param deptId
+     * @return
+     */
+    OapiV2DepartmentGetResponse.DeptGetResponse getDeptById(Long deptId);
+
+    /**
+     * 获取部门列表，此接口只会返回下一级部门信息
+     * @param deptId 部门id，如果不传则查询一级部门
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    List<OapiV2DepartmentListsubResponse.DeptBaseResponse> getDeptList(Long deptId, String appKey, String appSecret);
+}

base-service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkExtServiceImpl.java

@@ -0,0 +1,100 @@
+package com.hzya.frame.dingtalk.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.dingtalk.service.IDingTalkExtService;
+import com.hzya.frame.dingtalk.util.DingTalkAccessToken;
+import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
+import com.hzya.frame.sysnew.application.apiPara.dao.ISysApplicationApiParaDao;
+import com.hzya.frame.sysnew.application.apiPara.entity.SysApplicationApiParaEntity;
+import com.hzya.frame.sysnew.application.apiPara.service.ISysApplicationApiParaService;
+import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @Description 钉钉集成扩展类
+ * @Author xiangerlin
+ * @Date 2024/8/28 14:25
+ **/
+@Service(value = "dingTalkExtService")
+public class DingTalkExtServiceImpl implements IDingTalkExtService {
+
+
+    @Resource
+    private ISysApplicationApiParaDao sysApplicationApiParaDao;
+    private final ConcurrentHashMap<String, JSONObject> dingTalkMap = new ConcurrentHashMap<>();
+    /**
+     * 调用这个方法初始化钉钉参数
+     *
+     * @param entity
+     * @return
+     */
+    @Override
+    public SysExtensionApiEntity init(SysExtensionApiEntity entity) {
+        Map<String, String> headers = entity.getHeaders();
+        if (null == headers){
+            headers = new HashMap<>();
+        }
+        SysApplicationEntity receiveApp = entity.getReceiveApp();
+        //查询应用上配置的参数
+        JSONObject dingTalkConfig = getDingTalkConfig(receiveApp);
+        //给token赋值
+        entity.setQuerys("access_token="+DingTalkAccessToken.getAccessToken(dingTalkConfig.getString("appKey"),dingTalkConfig.getString("appSecret")));
+        return entity;
+    }
+
+    /**
+     * 查询配置在应用上的钉钉参数
+     *
+     * @param sysApplication
+     * @return
+     */
+    @Override
+    public JSONObject getDingTalkConfig(SysApplicationEntity sysApplication) {
+        if (null != sysApplication && StrUtil.isNotEmpty(sysApplication.getId()) && null != sysApplication.getAppId()){
+            JSONObject jsonObject = new JSONObject();
+            String key = sysApplication.getAppId()+"dingTalk";
+            if (null != dingTalkMap.get(key)){
+                return dingTalkMap.get(key);
+            }else {
+                //查询应用上配置的参数
+                SysApplicationApiParaEntity paraEntity = new SysApplicationApiParaEntity();
+                paraEntity.setAppId(sysApplication.getId());
+                List<SysApplicationApiParaEntity> paraList = sysApplicationApiParaDao.query(paraEntity);
+                if (CollectionUtils.isNotEmpty(paraList)) {
+                    List<SysApplicationApiParaEntity> appKeyList = paraList.stream().filter(p -> p.getInterfaceKey().equals("appKey")).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(appKeyList)) {
+                        jsonObject.put("appKey", appKeyList.get(0).getInterfaceValue());
+                    }
+                    List<SysApplicationApiParaEntity> appSecretList = paraList.stream().filter(p -> p.getInterfaceKey().equals("appSecret")).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(appSecretList)) {
+                        jsonObject.put("appSecret", appSecretList.get(0).getInterfaceValue());
+                    }
+                    dingTalkMap.put(key,jsonObject);
+                    return dingTalkMap.get(key);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 清空配置缓存
+     */
+    @Override
+    public void clearDingTalkConfigCatch() {
+        dingTalkMap.clear();
+    }
+}

base-service/src/main/java/com/hzya/frame/dingtalk/service/impl/DingTalkServiceImpl.java

@@ -0,0 +1,164 @@
+package com.hzya.frame.dingtalk.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dingtalk.api.DefaultDingTalkClient;
+import com.dingtalk.api.DingTalkClient;
+import com.dingtalk.api.request.OapiV2DepartmentGetRequest;
+import com.dingtalk.api.request.OapiV2DepartmentListsubRequest;
+import com.dingtalk.api.request.OapiV2UserGetRequest;
+import com.dingtalk.api.request.OapiV2UserListRequest;
+import com.dingtalk.api.response.OapiV2DepartmentGetResponse;
+import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
+import com.dingtalk.api.response.OapiV2UserGetResponse;
+import com.dingtalk.api.response.OapiV2UserListResponse;
+import com.hzya.frame.dingtalk.service.IDingTalkService;
+import com.hzya.frame.dingtalk.util.DingTalkAccessToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description 钉钉service
+ * @Author xiangerlin
+ * @Date 2024/8/27 16:17
+ **/
+@Service(value = "dingTalkService")
+public class DingTalkServiceImpl implements IDingTalkService {
+    Logger logger = LoggerFactory.getLogger(getClass());
+    @Value("${dingtalk.appKey:}")
+    private String dAppKey;
+    @Value("${dingtalk.appSecret:}")
+    private String dAppSecret;
+
+
+    /**
+     * 根据userid获取用户详情
+     *
+     * @param userId    钉钉userid
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    @Override
+    public OapiV2UserGetResponse.UserGetResponse getUserById(String userId, String appKey, String appSecret) {
+        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/get");
+        OapiV2UserGetRequest req = new OapiV2UserGetRequest();
+        req.setUserid(userId);
+        req.setLanguage("zh_CN");
+        try {
+            OapiV2UserGetResponse rsp = client.execute(req, DingTalkAccessToken.getAccessToken(appKey,appSecret));
+            if (rsp.isSuccess()){
+                OapiV2UserGetResponse.UserGetResponse result = rsp.getResult();
+                String s = JSONObject.toJSONString(result);
+                logger.info("人员详情信息:{}",s);
+                return result;
+            }
+        }catch (Exception e){
+            logger.error("根据部门id获取钉钉用户详情出错：{}",e);
+        }
+        return null;
+    }
+
+    /**
+     * 根据userid获取用户详情
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public OapiV2UserGetResponse.UserGetResponse getUserById(String userId) {
+        return getUserById(userId,dAppKey,dAppSecret);
+    }
+
+    /**
+     * 获取部门用户列表
+     *
+     * @param req 请求参数
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    @Override
+    public OapiV2UserListResponse.PageResult getUserListByDeptId(OapiV2UserListRequest req, String appKey, String appSecret) {
+        try {
+            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/list");
+            req.setSize(100L);//每页最大只能查100条
+            req.setOrderField("modify_desc");
+            req.setContainAccessLimit(false);
+            req.setLanguage("zh_CN");
+            OapiV2UserListResponse rsp = client.execute(req, DingTalkAccessToken.getAccessToken(appKey,appSecret));
+            OapiV2UserListResponse.PageResult result = rsp.getResult();
+            return result;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 根据部门id获取部门详情
+     *
+     * @param deptId    钉钉部门id
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    @Override
+    public OapiV2DepartmentGetResponse.DeptGetResponse getDeptById(Long deptId, String appKey, String appSecret) {
+        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/department/get");
+        OapiV2DepartmentGetRequest req = new OapiV2DepartmentGetRequest();
+        req.setDeptId(deptId);
+        req.setLanguage("zh_CN");
+        try {
+            OapiV2DepartmentGetResponse rsp = client.execute(req, DingTalkAccessToken.getAccessToken(appKey,appSecret));
+            if (rsp.isSuccess()){
+                OapiV2DepartmentGetResponse.DeptGetResponse result = rsp.getResult();
+                String s = JSONObject.toJSONString(result);
+                logger.info("部门详情信息:{}",s);
+                return result;
+            }
+        }catch(Exception e){
+            logger.error("根据部门id获取钉钉部门出错：{}",e);
+        }
+        return null;
+    }
+
+    /**
+     * 根据部门id获取部门详情
+     *
+     * @param deptId
+     * @return
+     */
+    @Override
+    public OapiV2DepartmentGetResponse.DeptGetResponse getDeptById(Long deptId) {
+        return getDeptById(deptId,dAppKey,dAppSecret);
+    }
+
+    /**
+     * 获取部门列表，此接口只会返回下一级部门信息
+     * @param deptId 部门id，如果不传则查询一级部门
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    @Override
+    public List<OapiV2DepartmentListsubResponse.DeptBaseResponse> getDeptList(Long deptId,String appKey,String appSecret) {
+        try {
+            DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/department/listsub");
+            OapiV2DepartmentListsubRequest req = new OapiV2DepartmentListsubRequest();
+            req.setDeptId(deptId);
+            req.setLanguage("zh_CN");
+            OapiV2DepartmentListsubResponse rsp = client.execute(req, DingTalkAccessToken.getAccessToken(appKey,appSecret));
+            if (rsp.isSuccess()){
+                List<OapiV2DepartmentListsubResponse.DeptBaseResponse> result = rsp.getResult();
+                return result;
+            }
+        }catch (Exception e){
+            logger.error("获取部门列表接口出错:{}",e);
+        }
+        return null;
+    }
+}

base-service/src/main/java/com/hzya/frame/dingtalk/util/DingTalkAccessToken.java

@@ -0,0 +1,103 @@
+package com.hzya.frame.dingtalk.util;
+
+import cn.hutool.core.util.StrUtil;
+import com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenResponse;
+import com.aliyun.tea.TeaException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.time.Instant;
+
+/**
+ * @Description 钉钉获取accessToken
+ * @Author xiangerlin
+ * @Date 2024/8/27 14:05
+ **/
+public class DingTalkAccessToken {
+    static Logger logger = LoggerFactory.getLogger(DingTalkAccessToken.class);
+    //token
+    private static String accessToken;
+    //过期时间
+    private static Instant expireTime;
+    private static final Long CACHE_EXPIRY_TIME = 7000L; // 缓存有效时间（秒）
+    //应用key
+    private static String appKey;
+    //应用密钥
+    private static String appSecret;
+    @Value("${dingtalk.appKey:}")
+    public static void setAppKey(String appKey) {
+        DingTalkAccessToken.appKey = appKey;
+    }
+    @Value("${dingtalk.appSecret:}")
+    public static void setAppSecret(String appSecret) {
+        DingTalkAccessToken.appSecret = appSecret;
+    }
+
+    /**
+     * 获取token
+     * @return
+     */
+    public static String getAccessToken(){
+        return getAccessToken(appKey,appSecret);
+    }
+    /**
+     * 获取accessToken
+     *
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    public static String getAccessToken(String appKey,String appSecret) {
+        //判断是否过期 如果没过期直接返回
+        if (null != accessToken && expireTime != null && Instant.now().isBefore(expireTime)) {
+            return accessToken;
+        }
+        //获取新的accessToken
+        accessToken = fetchNewAccessToken(appKey,appSecret);
+        //过期时间设置成当前事件+7000s，预留200s的时间
+        expireTime = Instant.now().plusSeconds(CACHE_EXPIRY_TIME);
+        return accessToken;
+    }
+
+    /**
+     * 获取新的accessToken
+     *
+     * @return
+     */
+    private static String fetchNewAccessToken(String appKey,String appSecret) {
+        try {
+            //查询应用上配置的钉钉信息
+            if (StrUtil.isNotEmpty(appKey) && StrUtil.isNotEmpty(appSecret)) {
+                //查询应用上的信息
+                com.aliyun.dingtalkoauth2_1_0.Client client = DingTalkAccessToken.createClient();
+                com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenRequest getAccessTokenRequest = new com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenRequest()
+                        .setAppKey(appKey)
+                        .setAppSecret(appSecret);
+                GetAccessTokenResponse accessToken = client.getAccessToken(getAccessTokenRequest);
+                String accessToken1 = accessToken.getBody().getAccessToken();
+                return accessToken1;
+            }
+        } catch (Exception _err) {
+            TeaException err = new TeaException(_err.getMessage(), _err);
+            if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) {
+                // err 中含有 code 和 message 属性，可帮助开发定位问题
+            }
+            logger.error("获取钉钉token出错:{}", _err);
+        }
+        return null;
+    }
+
+    /**
+     * 使用 Token 初始化账号Client
+     *
+     * @return Client
+     * @throws Exception
+     */
+    private static com.aliyun.dingtalkoauth2_1_0.Client createClient() throws Exception {
+        com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
+        config.protocol = "https";
+        config.regionId = "central";
+        return new com.aliyun.dingtalkoauth2_1_0.Client(config);
+    }
+}

base-service/src/main/java/com/hzya/frame/home/service/impl/HomeServiceImpl.java

@@ -50,6 +50,7 @@ public class HomeServiceImpl extends BaseService<HomeEntity, String> implements
 					for (int a = 0; a < sysApplicationEntities.size(); a++) {
 						if(homeEntities.get(i).getAppId()!= null && sysApplicationEntities.get(a).getId().equals(homeEntities.get(i).getAppId())){
 							homeEntities.get(i).setPath(sysApplicationEntities.get(a).getAppLogo());
+							homeEntities.get(i).setName(sysApplicationEntities.get(a).getName());
 							continue;
 						}
 					}

base-service/src/main/java/com/hzya/frame/mdm/entity/MdmFiledsRuleDto.java

@@ -0,0 +1,77 @@
+package com.hzya.frame.mdm.entity;
+
+
+public class MdmFiledsRuleDto {
+    /**  主数据模版ID */
+    private String mdmId;
+    /**  模版数据库id */
+    private String dbId;
+    /**  模版数据库字段id */
+    private String filedId;
+    /**  字段类型 1、select 2、treeselect */
+    private String filedType;
+    /**  字段服务 */
+    private String typeFiled;
+    /**  字段服务 */
+    private String id;
+    /**  字段服务 */
+    private String dataId;
+
+    public String getMdmId() {
+        return mdmId;
+    }
+
+    public void setMdmId(String mdmId) {
+        this.mdmId = mdmId;
+    }
+
+    public String getDbId() {
+        return dbId;
+    }
+
+    public void setDbId(String dbId) {
+        this.dbId = dbId;
+    }
+
+    public String getFiledId() {
+        return filedId;
+    }
+
+    public void setFiledId(String filedId) {
+        this.filedId = filedId;
+    }
+
+    public String getFiledType() {
+        return filedType;
+    }
+
+    public void setFiledType(String filedType) {
+        this.filedType = filedType;
+    }
+
+    public String getTypeFiled() {
+        return typeFiled;
+    }
+
+    public void setTypeFiled(String typeFiled) {
+        this.typeFiled = typeFiled;
+    }
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java

@@ -3,6 +3,7 @@ package com.hzya.frame.mdm.mdmModule.dao;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.mdm.entity.MdmDataDto;
 import com.hzya.frame.mdm.entity.MdmDto;
+import com.hzya.frame.mdm.entity.MdmFiledsRuleDto;
 import com.hzya.frame.mdm.entity.MdmQuery;
 import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
 import com.hzya.frame.basedao.dao.IBaseDao;
@@ -68,5 +69,7 @@ public interface IMdmModuleDao extends IBaseDao<MdmModuleEntity, String> {
     void updataTreeUpData(Map<String, String> updateMaps);
 
     void updataTreeUpDataDetail(Map<String, String> updateMaps);
+
+    MdmFiledsRuleDto queryDataId(MdmFiledsRuleDto mdmFiledsRuleDto);
 }
 

base-service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import com.hzya.frame.mdm.entity.MdmDataDto;
 import com.hzya.frame.mdm.entity.MdmDto;
+import com.hzya.frame.mdm.entity.MdmFiledsRuleDto;
 import com.hzya.frame.mdm.entity.MdmQuery;
 import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
 import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
@@ -181,6 +182,12 @@ public class MdmModuleDaoImpl extends MybatisGenericDao<MdmModuleEntity, String>
         super.update(getSqlIdPrifx() + "updataTreeUpDataDetail", maps);
     }
 
+    @Override
+    public MdmFiledsRuleDto queryDataId(MdmFiledsRuleDto mdmFiledsRuleDto) {
+        MdmFiledsRuleDto o = (MdmFiledsRuleDto) super.selectOne(getSqlIdPrifx() + "queryDataId", mdmFiledsRuleDto);
+        return o;
+    }
+
     @Override
     public List<String> queryMdMFields(Map<String, Object> maps) {
         List<String> o = (List<String>) super.selectList(getSqlIdPrifx() + "queryMdMFields", maps);

base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml

@@ -974,10 +974,10 @@ where id = #{id}
                             < #{item.filedVaule}
                         </when>
                         <when test="item.compareType == '5'.toString() ">
-                            like concat('%',#{item.filedVaule},'%')
+                            like #{item.filedVaule}
                         </when>
                         <when test="item.compareType == '6'.toString() ">
-                            not like concat('%',#{item.filedVaule},'%')
+                            not like #{item.filedVaule}
                         </when>
                     </choose>
 
@@ -1086,5 +1086,14 @@ where id = #{id}
           AND b.sts = 'Y'
           AND b.data_status != 'N'
     </update>
+
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="queryDataId" resultType="com.hzya.frame.mdm.entity.MdmFiledsRuleDto"
+            parameterType="com.hzya.frame.mdm.entity.MdmFiledsRuleDto">
+        select
+        data_id as dataId
+        from ${typeFiled} where  sts='Y' and id = #{id}
+    </select>
 </mapper>
 

base-service/src/main/java/com/hzya/frame/mdm/mdmModule/service/impl/MdmModuleServiceImpl.java

@@ -2340,7 +2340,20 @@ public class MdmModuleServiceImpl extends BaseService<MdmModuleEntity, String> i
                         xf.setCreate();
                         sysButtonConfigDao.save(xf);
                     }
-
+                    if ("viewData".equals(mdmModuleViewButtonEntities.get(i).getButtonValue())) {
+                        SysButtonConfigEntity xf = new SysButtonConfigEntity();
+                        xf.setCode("viewData");
+                        xf.setNameCh("查看数据格式");
+                        xf.setNameEn("viewData");
+                        xf.setMenuId(module.getId());
+                        xf.setIconName("");
+                        xf.setStyles("");
+                        xf.setBtnFunction("viewData");
+                        xf.setRemark("查看数据格式");
+                        xf.setSorts(i + 1L);
+                        xf.setCreate();
+                        sysButtonConfigDao.save(xf);
+                    }
 
                 }
             }

base-service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java

@@ -87,6 +87,15 @@ public interface IMdmService {
      * @Date 9:40 上午 2023/10/18
      **/
     JsonResultEntity queryMdmShowDetailsData(JSONObject jsonObject);
+
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据字典
+     * @Date 9:40 上午 2023/10/18
+     **/
+    JsonResultEntity queryMdmShowDetailsDictionary(JSONObject jsonObject);
     //
     /**
      * @param jsonObject

base-service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java

@@ -101,12 +101,6 @@ public class MdmServiceImpl implements IMdmService {
     @Resource
     private IMdmServiceCache mdmServiceCache;
     @Resource
-    private ISysMenuConfigDao sysMenuConfigDao;
-    @Resource
-    private ISysButtonConfigDao sysButtonConfigDao;
-    @Resource
-    private ISysPopedomOperateDao sysPopedomOperateDao;
-    @Resource
     private IMdmModuleDbDao mdmModuleDbDao;
     @Resource
     private ISysUserDao sysUserDao;
@@ -1381,15 +1375,188 @@ public class MdmServiceImpl implements IMdmService {
             }
 
         }
-        //if (tablename != null && !"".equals(tablename)) {
-        //    Map<String, Object> queryData = new HashMap<>();
-        //    queryData.put("tableName", tablename);//表名
-        //    queryData.put("id", entity.getId());//字段
-        //    List<HashMap<String, Object>> datas = mdmModuleDbDao.getServiceByDistributeId(queryData);
-        //    jsonObject.put(tablename, datas);
-        //}
 
 
+
+        return BaseResult.getSuccessMessageEntity("获取数据成功", jsonObject);
+    }
+
+
+    /**
+     * @param object
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 主数据详情数据字典
+     * @Date 9:40 上午 2023/10/18
+     **/
+    @Override
+    public JsonResultEntity queryMdmShowDetailsDictionary(JSONObject object) {
+        MdmDto entity = getData("jsonStr", object, MdmDto.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("参数不允许为空");
+        }
+        if (entity.getMdmCode() == null || "".equals(entity.getMdmCode())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getId() == null || "".equals(entity.getId())) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询模版
+
+        MdmModuleEntity mdmModuleEntity = mdmServiceCache.getMdmModuleEntity(entity.getMdmCode());
+        if (mdmModuleEntity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        //查询数据源主表
+        MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
+        mdmModuleDbEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbEntity.setSts("Y");
+        List<MdmModuleDbEntity> mdmModuleDbEntityList = mdmServiceCache.queryMdmModuleDb(mdmModuleDbEntity);
+        if (mdmModuleDbEntityList == null || mdmModuleDbEntityList.size() == 0) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        MdmModuleDbFiledsEntity queryFild = new MdmModuleDbFiledsEntity();
+        queryFild.setMdmId(mdmModuleEntity.getId());
+        queryFild.setSts("Y");
+        List<MdmModuleDbFiledsEntity> mdmModuleDbFiledsEntities = mdmServiceCache.queryMdmModuleDbFileds(queryFild);
+
+        MdmModuleDbFiledsRuleEntity mdmModuleDbFiledsRuleEntity = new MdmModuleDbFiledsRuleEntity();
+        mdmModuleDbFiledsRuleEntity.setMdmId(mdmModuleEntity.getId());
+        mdmModuleDbFiledsRuleEntity.setSts("Y");
+        List<MdmModuleDbFiledsRuleEntity> mdmModuleDbFiledsRuleEntities = mdmModuleDbFiledsRuleDao.queryBase(mdmModuleDbFiledsRuleEntity);
+
+        List<MdmFiledsRuleDto> mdmFiledsRuleDtos = new ArrayList<>();
+        if(mdmModuleDbFiledsRuleEntities != null && mdmModuleDbFiledsRuleEntities.size() > 0){
+            for (int i = 0; i < mdmModuleDbFiledsRuleEntities.size(); i++) {
+                if("treeselect".equals(mdmModuleDbFiledsRuleEntities.get(i).getRuleValue()) || "select".equals(mdmModuleDbFiledsRuleEntities.get(i).getRuleValue())){
+                    MdmFiledsRuleDto mdmFiledsRuleDto = new MdmFiledsRuleDto();
+                    mdmFiledsRuleDto.setDbId(mdmModuleDbFiledsRuleEntities.get(i).getDbId());
+                    mdmFiledsRuleDto.setFiledId(mdmModuleDbFiledsRuleEntities.get(i).getFiledId());
+                    mdmFiledsRuleDto.setMdmId(mdmModuleDbFiledsRuleEntities.get(i).getMdmId());
+                    mdmFiledsRuleDto.setFiledType(mdmModuleDbFiledsRuleEntities.get(i).getRuleValue());
+                    mdmFiledsRuleDtos.add(mdmFiledsRuleDto);
+                }
+            }
+        }
+
+        if(mdmFiledsRuleDtos != null && mdmFiledsRuleDtos.size() > 0){
+            for (int i = 0; i < mdmFiledsRuleDtos.size(); i++) {
+                for (int i1 = 0; i1 < mdmModuleDbFiledsRuleEntities.size(); i1++) {
+                    if(mdmFiledsRuleDtos.get(i).getFiledId().equals(mdmModuleDbFiledsRuleEntities.get(i1).getFiledId())
+                            && "service".equals(mdmModuleDbFiledsRuleEntities.get(i1).getRuleCode())){
+                        mdmFiledsRuleDtos.get(i).setTypeFiled(mdmModuleDbFiledsRuleEntities.get(i1).getRuleValue());
+                    }
+                }
+            }
+        }
+
+        //String tablename = null;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("appName","数智中台");
+        jsonObject.put("appCode","800004");
+        jsonObject.put("mdmCode",entity.getMdmCode());
+        jsonObject.put("optionName","admin");
+        for (int i = 0; i < mdmModuleDbEntityList.size(); i++) {
+            if ("1".equals(mdmModuleDbEntityList.get(i).getDbType()) || "2".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                //查询数据
+                Map<String, Object> queryData = new HashMap<>();
+                queryData.put("tableName", mdmModuleDbEntityList.get(i).getDbName());//表名
+                if ("1".equals(mdmModuleDbEntityList.get(i).getDbType())) {
+                    queryData.put("detailFlag", false);//是否明细
+                    queryData.put("id", entity.getId());//字段
+                    HashMap<String, Object> datas = mdmModuleDbDao.getServiceDataById(queryData);
+                    convertKeysToLowerCase(datas);
+                    JSONObject zbdata = new JSONObject();
+                    if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+                        for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
+                            if(mdmModuleDbFiledsEntities.get(i2).getDbId().equals(mdmModuleDbEntityList.get(i).getId())){
+                                if("1".equals(mdmModuleDbFiledsEntities.get(i2).getViewType())){
+                                    //判断是否是下拉类型
+                                    Object data = datas.get(mdmModuleDbFiledsEntities.get(i2).getEnName());
+                                    if(mdmFiledsRuleDtos != null && mdmFiledsRuleDtos.size() > 0){
+                                        for (int i1 = 0; i1 < mdmFiledsRuleDtos.size(); i1++) {
+                                            if(mdmModuleDbFiledsEntities.get(i2).getId().equals(mdmFiledsRuleDtos.get(i1).getFiledId())){
+                                                //查询对应的data_id
+                                                String strData = String.valueOf(data);
+                                                int index = strData.lastIndexOf(',');
+                                                if (index!= -1) {
+                                                    strData = strData.substring(index + 1);
+                                                }
+                                                mdmFiledsRuleDtos.get(i1).setId(strData);
+                                                MdmFiledsRuleDto mdmFiledsRuleDto =  mdmModuleDao.queryDataId(mdmFiledsRuleDtos.get(i1));
+                                                if(mdmFiledsRuleDto != null && mdmFiledsRuleDto.getDataId() != null &&  !"".equals(mdmFiledsRuleDto.getDataId())){
+                                                    data = mdmFiledsRuleDto.getDataId();
+                                                }else {
+                                                    data = null;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    zbdata.put(mdmModuleDbFiledsEntities.get(i2).getEnName(),data);
+                                }
+                            }
+                        }
+                    }
+                    jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), zbdata);
+                } else {
+                    queryData.put("detailFlag", true);//是否明细
+                    queryData.put("id", entity.getId());//字段
+                    List<HashMap<String, Object>> datas = mdmModuleDbDao.getServiceByFormmainId(queryData);
+                    convertKeysToLowerCase(datas);
+                    List<JSONObject> mxDataList = new ArrayList<>();
+                    if(datas != null && datas.size() > 0){
+                        for (int i1 = 0; i1 < datas.size(); i1++) {
+                            JSONObject mxData = new JSONObject();
+                            if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+                                for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
+                                    if(mdmModuleDbFiledsEntities.get(i2).getDbId().equals(mdmModuleDbEntityList.get(i).getId())){
+                                        if("1".equals(mdmModuleDbFiledsEntities.get(i2).getViewType())){
+
+                                            //判断是否是下拉类型
+                                            Object data = datas.get(i1).get(mdmModuleDbFiledsEntities.get(i2).getEnName());
+                                            if(mdmFiledsRuleDtos != null && mdmFiledsRuleDtos.size() > 0){
+                                                for (int b = 0; b < mdmFiledsRuleDtos.size(); b++) {
+                                                    if(mdmModuleDbFiledsEntities.get(i2).getId().equals(mdmFiledsRuleDtos.get(b).getFiledId())){
+                                                        //查询对应的data_id
+                                                        String strData = String.valueOf(data);
+                                                        int index = strData.lastIndexOf(',');
+                                                        if (index!= -1) {
+                                                            strData = strData.substring(index + 1);
+                                                        }
+                                                        mdmFiledsRuleDtos.get(b).setId(strData);
+                                                        MdmFiledsRuleDto mdmFiledsRuleDto =  mdmModuleDao.queryDataId(mdmFiledsRuleDtos.get(b));
+                                                        if(mdmFiledsRuleDto != null && mdmFiledsRuleDto.getDataId() != null &&  !"".equals(mdmFiledsRuleDto.getDataId())){
+                                                            data = mdmFiledsRuleDto.getDataId();
+                                                        }else {
+                                                            data = null;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            mxData.put(mdmModuleDbFiledsEntities.get(i2).getEnName(),data);
+                                        }
+                                    }
+                                }
+                            }
+                            mxDataList.add(mxData);
+                        }
+                    }else {
+                        JSONObject mxData = new JSONObject();
+                        if(mdmModuleDbFiledsEntities != null && mdmModuleDbFiledsEntities.size() > 0){
+                            for (int i2 = 0; i2 < mdmModuleDbFiledsEntities.size(); i2++) {
+                                if(mdmModuleDbFiledsEntities.get(i2).getDbId().equals(mdmModuleDbEntityList.get(i).getId())){
+                                    if("1".equals(mdmModuleDbFiledsEntities.get(i2).getViewType())){
+                                        mxData.put(mdmModuleDbFiledsEntities.get(i2).getEnName(),null);
+                                    }
+                                }
+                            }
+                        }
+                        mxDataList.add(mxData);
+                    }
+                    jsonObject.put(mdmModuleDbEntityList.get(i).getDbName(), mxDataList);
+                }
+            }
+        }
         return BaseResult.getSuccessMessageEntity("获取数据成功", jsonObject);
     }
 
@@ -1944,7 +2111,8 @@ public class MdmServiceImpl implements IMdmService {
             return BaseResult.getSuccessMessageEntity("发送成功");
         } else {
             saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败:"+jsonResultEntity.getAttribute(), dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
-            return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getAttribute());
+            JSONObject object1 = JSONObject.parseObject(jsonResultEntity.getAttribute().toString());
+            return BaseResult.getFailureMessageEntity("发送错误:" +object1.getString("msg"));
         }
     }
 

base-service/src/main/java/com/hzya/frame/sys/dictionaryshopNew/service/ISysDictionaryshopNewService.java

@@ -13,4 +13,20 @@ import com.hzya.frame.sys.dictionaryshopNew.entity.SysDictionaryshopNew;
 public interface ISysDictionaryshopNewService {
 
         JsonResultEntity test(SysDictionaryshopNew object);
+
+        /**
+         * 查询数据字典
+         * @param tabName 表名
+         * @param columnName 字段名
+         * @param columnValue 字典值
+         * @return
+         */
+        SysDictionaryshopNew getDictionaryshopByValue(String tabName, String columnName, String columnValue);
+
+        /**
+         * 查询列表
+         * @param object
+         * @return
+         */
+        JsonResultEntity queryDictionaryList(JSONObject object);
 }

base-service/src/main/java/com/hzya/frame/sys/dictionaryshopNew/service/impl/SysDictionaryshopNewServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hzya.frame.sys.dictionaryshopNew.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.web.entity.BaseResult;
 import org.springframework.stereotype.Service;
 import com.hzya.frame.serviceUtil.ServiceUtil;
@@ -11,7 +12,7 @@ import org.slf4j.LoggerFactory;
 import com.hzya.frame.web.entity.JsonResultEntity;
 
 import javax.annotation.Resource;
-
+import java.util.List;
 
 
 /**
@@ -33,4 +34,33 @@ public class  SysDictionaryshopNewServiceImpl extends ServiceUtil implements ISy
 		return BaseResult.getSuccessMessageEntity("获取应用成功");
 	}
 
+	/**
+	 * 查询数据字典
+	 *
+	 * @param tabName     表名
+	 * @param columnName  字段名
+	 * @param columnValue 字典值
+	 * @return
+	 */
+	@Override
+	public SysDictionaryshopNew getDictionaryshopByValue(String tabName, String columnName, String columnValue) {
+		SysDictionaryshopNew sysDictionaryshopNew = new SysDictionaryshopNew();
+		sysDictionaryshopNew.setTabName(tabName);
+		sysDictionaryshopNew.setColumnName(columnName);
+		sysDictionaryshopNew.setColumnValue(columnValue);
+		return sysdictionaryshopnewMapper.entity_get_by_value(sysDictionaryshopNew);
+	}
+
+	/**
+	 * 查询列表
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryDictionaryList(JSONObject object) {
+		SysDictionaryshopNew dictionary = getData("jsonStr", object, SysDictionaryshopNew.class);
+		List<SysDictionaryshopNew> dictionaryList = sysdictionaryshopnewMapper.entity_list_base(dictionary);
+		return BaseResult.getSuccessMessageEntity("查询列表成功", dictionaryList);
+	}
 }

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowClassDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowClassEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 流程分类;对应数环通项目分类(sys_flow_class: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowClassDao extends IBaseDao<SysFlowClassEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowClassRuleDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 流程分类权限表(sys_flow_class_rule: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowClassRuleDao extends IBaseDao<SysFlowClassRuleEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 流程主表;流程就是数环通的Linkup(sys_flow: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:19
+ */
+public interface ISysFlowDao extends IBaseDao<SysFlowEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowNifiConstantDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * nifi常量(sys_flow_nifi_constant: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowNifiConstantDao extends IBaseDao<SysFlowNifiConstantEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowStepAccountDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 流程步骤账户表(sys_flow_step_account: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowStepAccountDao extends IBaseDao<SysFlowStepAccountEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowStepConfigBDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 映射信息表体(sys_flow_step_config_b: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepConfigBDao extends IBaseDao<SysFlowStepConfigBEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowStepConfigDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 映射信息主表(sys_flow_step_config: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepConfigDao extends IBaseDao<SysFlowStepConfigEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowStepDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 流程步骤信息(sys_flow_step: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowStepDao extends IBaseDao<SysFlowStepEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/ISysFlowStepRelationDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sys.flow.dao;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 步骤关联关系表(sys_flow_step_relation: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepRelationDao extends IBaseDao<SysFlowStepRelationEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowClassDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowClassEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowClassDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 流程分类;对应数环通项目分类(SysFlowClass)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Repository(value = "SysFlowClassDaoImpl")
+public class SysFlowClassDaoImpl extends MybatisGenericDao<SysFlowClassEntity, String> implements ISysFlowClassDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowClassRuleDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowClassRuleDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 流程分类权限表(SysFlowClassRule)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Repository(value = "SysFlowClassRuleDaoImpl")
+public class SysFlowClassRuleDaoImpl extends MybatisGenericDao<SysFlowClassRuleEntity, String> implements ISysFlowClassRuleDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 流程主表;流程就是数环通的Linkup(SysFlow)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:21
+ */
+@Repository(value = "SysFlowDaoImpl")
+public class SysFlowDaoImpl extends MybatisGenericDao<SysFlowEntity, String> implements ISysFlowDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowNifiConstantDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowNifiConstantDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * nifi常量(SysFlowNifiConstant)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Repository(value = "SysFlowNifiConstantDaoImpl")
+public class SysFlowNifiConstantDaoImpl extends MybatisGenericDao<SysFlowNifiConstantEntity, String> implements ISysFlowNifiConstantDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowStepAccountDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepAccountDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 流程步骤账户表(SysFlowStepAccount)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Repository(value = "SysFlowStepAccountDaoImpl")
+public class SysFlowStepAccountDaoImpl extends MybatisGenericDao<SysFlowStepAccountEntity, String> implements ISysFlowStepAccountDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowStepConfigBDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepConfigBDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 映射信息表体(SysFlowStepConfigB)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Repository(value = "SysFlowStepConfigBDaoImpl")
+public class SysFlowStepConfigBDaoImpl extends MybatisGenericDao<SysFlowStepConfigBEntity, String> implements ISysFlowStepConfigBDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowStepConfigDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepConfigDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 映射信息主表(SysFlowStepConfig)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Repository(value = "SysFlowStepConfigDaoImpl")
+public class SysFlowStepConfigDaoImpl extends MybatisGenericDao<SysFlowStepConfigEntity, String> implements ISysFlowStepConfigDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowStepDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 流程步骤信息(SysFlowStep)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Repository(value = "SysFlowStepDaoImpl")
+public class SysFlowStepDaoImpl extends MybatisGenericDao<SysFlowStepEntity, String> implements ISysFlowStepDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/dao/impl/SysFlowStepRelationDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sys.flow.dao.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepRelationDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 步骤关联关系表(SysFlowStepRelation)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Repository(value = "SysFlowStepRelationDaoImpl")
+public class SysFlowStepRelationDaoImpl extends MybatisGenericDao<SysFlowStepRelationEntity, String> implements ISysFlowStepRelationDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassEntity.java

@@ -0,0 +1,36 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 流程分类;对应数环通项目分类(SysFlowClass)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public class SysFlowClassEntity extends BaseEntity {
+ 
+  /**  分类名称 */
+   private String name;
+  /**  上级id */
+   private String parentId;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassEntity.xml

@@ -0,0 +1,195 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowClassDaoImpl">
+
+    <resultMap id="get-SysFlowClassEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowClassEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="name" column="name" jdbcType="VARCHAR"/>
+           <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowClassEntity_Base_Column_List">
+        id
+       ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,name 
+        ,parent_id 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowClassEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity">
+    select
+    <include refid="SysFlowClassEntity_Base_Column_List" />
+    from sys_flow_class
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity">
+        select  count(1)   from sys_flow_class
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowClassEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity">
+    select
+    <include refid="SysFlowClassEntity_Base_Column_List" />
+    from sys_flow_class
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="name != null and name != ''"> and name like concat('%',#{name},'%') </if>
+            <if test="parentId != null and parentId != ''"> and parent_id like concat('%',#{parentId},'%') </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowClassentity_list_or" resultMap="get-SysFlowClassEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity">
+    select
+    <include refid="SysFlowClassEntity_Base_Column_List" />
+    from sys_flow_class
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="name != null and name != ''"> or name = #{name} </if>
+             <if test="parentId != null and parentId != ''"> or parent_id = #{parentId} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_class(
+    <trim suffix="" suffixOverrides=",">
+        <if test="id != null and id != ''">id ,</if>
+        <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+        <if test="create_time != null">create_time ,</if>
+        <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+        <if test="modify_time != null">modify_time ,</if>
+        <if test="sts != null and sts != ''">sts ,</if>
+        <if test="name != null and name != ''">name ,</if>
+        <if test="parentId != null and parentId != ''">parent_id ,</if>
+        <if test="sorts == null ">sorts,</if>
+        <if test="sts == null ">sts,</if>
+    </trim>
+    )values(
+    <trim suffix="" suffixOverrides=",">
+        <if test="id != null and id != ''">#{id} ,</if>
+        <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+        <if test="create_time != null">#{create_time} ,</if>
+        <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+        <if test="modify_time != null">#{modify_time} ,</if>
+        <if test="sts != null and sts != ''">#{sts} ,</if>
+        <if test="name != null and name != ''">#{name} ,</if>
+        <if test="parentId != null and parentId != ''">#{parentId} ,</if>
+        <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_class a WHERE
+            a.sts = 'Y' ),1),
+        </if>
+        <if test="sts == null ">'Y',</if>
+    </trim>
+    )
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow_class(create_user_id, create_time, modify_user_id, modify_time, sts, name, parent_id,  sts) 
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.name},#{entity.parentId}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_class(create_user_id, create_time, modify_user_id, modify_time, sts, name, parent_id)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.name},#{entity.parentId})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    name = values(name),
+    parent_id = values(parent_id)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity" >
+update sys_flow_class  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="name != null and name != ''"> name = #{name},</if>
+  <if test="parentId != null and parentId != ''"> parent_id = #{parentId},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity" >
+update sys_flow_class  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowClassEntity" >
+update sys_flow_class  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow_class where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassRuleEntity.java

@@ -0,0 +1,75 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import java.util.List;
+
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 流程分类权限表(SysFlowClassRule)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public class SysFlowClassRuleEntity extends BaseEntity {
+ 
+  /**  流程分类id */
+   private String flowClassId;
+  /**  用户id */
+   private String userId;
+  /**  用户名 */
+   private String userName;
+  /**  用户编码 */
+   private String userCode;
+  /**  头像 */
+   private String profileIcon;
+   //权限列表
+   List<SysFlowClassRuleEntity> ruleList;
+    public String getFlowClassId() {
+        return flowClassId;
+    }
+
+    public void setFlowClassId(String flowClassId) {
+        this.flowClassId = flowClassId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getProfileIcon() {
+        return profileIcon;
+    }
+
+    public void setProfileIcon(String profileIcon) {
+        this.profileIcon = profileIcon;
+    }
+
+    public List<SysFlowClassRuleEntity> getRuleList() {
+        return ruleList;
+    }
+
+    public void setRuleList(List<SysFlowClassRuleEntity> ruleList) {
+        this.ruleList = ruleList;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassRuleEntity.xml

@@ -0,0 +1,247 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowClassRuleDaoImpl">
+
+    <resultMap id="get-SysFlowClassRuleEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="flowClassId" column="flow_class_id" jdbcType="VARCHAR"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="userCode" column="user_code" jdbcType="VARCHAR"/>
+        <result property="profileIcon" column="profile_icon" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="SysFlowClassRuleEntity_Base_Column_List">
+        id
+        ,create_user_id
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,flow_class_id 
+        ,user_id 
+        ,user_name 
+        ,user_code 
+        ,profile_icon
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-SysFlowClassRuleEntity-result"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        select
+        <include refid="SysFlowClassRuleEntity_Base_Column_List"/>
+        from sys_flow_class_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="flowClassId != null and flowClassId != ''">and flow_class_id = #{flowClassId}</if>
+            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="userName != null and userName != ''">and user_name = #{userName}</if>
+            <if test="userCode != null and userCode != ''">and user_code = #{userCode}</if>
+            <if test="profileIcon != null and profileIcon != ''">and profile_icon = #{profileIcon}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        select count(1) from sys_flow_class_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="flowClassId != null and flowClassId != ''">and flow_class_id = #{flowClassId}</if>
+            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="userName != null and userName != ''">and user_name = #{userName}</if>
+            <if test="userCode != null and userCode != ''">and user_code = #{userCode}</if>
+            <if test="profileIcon != null and profileIcon != ''">and profile_icon = #{profileIcon}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-SysFlowClassRuleEntity-result"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        select
+        <include refid="SysFlowClassRuleEntity_Base_Column_List"/>
+        from sys_flow_class_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="flowClassId != null and flowClassId != ''">and flow_class_id like concat('%',#{flowClassId},'%')
+            </if>
+            <if test="userId != null and userId != ''">and user_id like concat('%',#{userId},'%')</if>
+            <if test="userName != null and userName != ''">and user_name like concat('%',#{userName},'%')</if>
+            <if test="userCode != null and userCode != ''">and user_code like concat('%',#{userCode},'%')</if>
+            <if test="profileIcon != null and profileIcon != ''">and profile_icon like concat('%',#{profileIcon},'%')
+            </if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="SysFlowClassRuleentity_list_or" resultMap="get-SysFlowClassRuleEntity-result"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        select
+        <include refid="SysFlowClassRuleEntity_Base_Column_List"/>
+        from sys_flow_class_rule
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="flowClassId != null and flowClassId != ''">or flow_class_id = #{flowClassId}</if>
+            <if test="userId != null and userId != ''">or user_id = #{userId}</if>
+            <if test="userName != null and userName != ''">or user_name = #{userName}</if>
+            <if test="userCode != null and userCode != ''">or user_code = #{userCode}</if>
+            <if test="profileIcon != null and profileIcon != ''">or profile_icon = #{profileIcon}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into sys_flow_class_rule(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="flowClassId != null and flowClassId != ''">flow_class_id ,</if>
+            <if test="userId != null and userId != ''">user_id ,</if>
+            <if test="userName != null and userName != ''">user_name ,</if>
+            <if test="userCode != null and userCode != ''">user_code ,</if>
+            <if test="profileIcon != null and profileIcon != ''">profile_icon ,</if>
+            <if test="sorts == null ">sorts,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="flowClassId != null and flowClassId != ''">#{flowClassId} ,</if>
+            <if test="userId != null and userId != ''">#{userId} ,</if>
+            <if test="userName != null and userName != ''">#{userName} ,</if>
+            <if test="userCode != null and userCode != ''">#{userCode} ,</if>
+            <if test="profileIcon != null and profileIcon != ''">#{profileIcon} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_class_rule a WHERE a.sts = 'Y' ),1),</if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sys_flow_class_rule(create_user_id, create_time, modify_user_id, modify_time, sts, flow_class_id,
+        user_id, user_name, user_code, profile_icon, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.flowClassId},#{entity.userId},#{entity.userName},#{entity.userCode},#{entity.profileIcon},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sys_flow_class_rule(create_user_id, create_time, modify_user_id, modify_time, sts, flow_class_id,
+        user_id, user_name, user_code, profile_icon)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.flowClassId},#{entity.userId},#{entity.userName},#{entity.userCode},#{entity.profileIcon})
+        </foreach>
+        on duplicate key update
+        create_user_id = values(create_user_id),
+        create_time = values(create_time),
+        modify_user_id = values(modify_user_id),
+        modify_time = values(modify_time),
+        sts = values(sts),
+        flow_class_id = values(flow_class_id),
+        user_id = values(user_id),
+        user_name = values(user_name),
+        user_code = values(user_code),
+        profile_icon = values(profile_icon)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        update sys_flow_class_rule set
+        <trim suffix="" suffixOverrides=",">
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="flowClassId != null and flowClassId != ''">flow_class_id = #{flowClassId},</if>
+            <if test="userId != null and userId != ''">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
+            <if test="profileIcon != null and profileIcon != ''">profile_icon = #{profileIcon},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        update sys_flow_class_rule
+        set sts= 'N',
+            modify_time = #{modify_time},
+            modify_user_id = #{modify_user_id}
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity">
+        update sys_flow_class_rule set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="flowClassId != null and flowClassId != ''">and flow_class_id = #{flowClassId}</if>
+            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="userName != null and userName != ''">and user_name = #{userName}</if>
+            <if test="userCode != null and userCode != ''">and user_code = #{userCode}</if>
+            <if test="profileIcon != null and profileIcon != ''">and profile_icon = #{profileIcon}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from sys_flow_class_rule
+        where id = #{id}
+    </delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowEntity.java

@@ -0,0 +1,92 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 流程主表;流程就是数环通的Linkup(SysFlow)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:23
+ */
+public class SysFlowEntity extends BaseEntity {
+ 
+  /**  流程名称 */
+   private String name;
+  /**  流程分类id */
+   private String classId;
+   private String className;
+  /**  触发方式id */
+   private String triggerModeId;
+   private String triggerModeName;
+  /**  应用组id */
+   private String nifiGroupId;
+  /**  流程描述 */
+   private String description;
+
+   //状态， 启动/停止
+   private String status;
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getClassId() {
+        return classId;
+    }
+
+    public void setClassId(String classId) {
+        this.classId = classId;
+    }
+
+    public String getTriggerModeId() {
+        return triggerModeId;
+    }
+
+    public void setTriggerModeId(String triggerModeId) {
+        this.triggerModeId = triggerModeId;
+    }
+
+    public String getNifiGroupId() {
+        return nifiGroupId;
+    }
+
+    public void setNifiGroupId(String nifiGroupId) {
+        this.nifiGroupId = nifiGroupId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getTriggerModeName() {
+        return triggerModeName;
+    }
+
+    public void setTriggerModeName(String triggerModeName) {
+        this.triggerModeName = triggerModeName;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowEntity.xml

@@ -0,0 +1,241 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowDaoImpl">
+
+    <resultMap id="get-SysFlowEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="name" column="name" jdbcType="VARCHAR"/>
+           <result property="status" column="status" jdbcType="VARCHAR"/>
+           <result property="classId" column="class_id" jdbcType="VARCHAR"/>
+           <result property="className" column="className" jdbcType="VARCHAR"/>
+           <result property="triggerModeId" column="trigger_mode_id" jdbcType="VARCHAR"/>
+           <result property="nifiGroupId" column="nifi_group_id" jdbcType="VARCHAR"/>
+           <result property="description" column="description" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowEntity_Base_Column_List">
+        sf.id
+       ,sf.create_user_id
+        ,sf.create_time
+        ,sf.modify_user_id
+        ,sf.modify_time
+        ,sf.sts
+        ,sf.name
+        ,sf.status
+        ,sf.class_id
+        ,sfc.name as className
+        ,sf.trigger_mode_id
+        ,sf.nifi_group_id
+        ,sf.description
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity">
+    select
+    <include refid="SysFlowEntity_Base_Column_List" />
+    from sys_flow sf
+    left join sys_flow_class sfc on sfc.id = sf.class_id
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and sf.id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and sf.create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and sf.create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and sf.modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and sf.modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sf.sts = #{sts} </if>
+            <if test="name != null and name != ''"> and sf.name = #{name} </if>
+            <if test="status != null and status != ''"> and sf.status = #{status} </if>
+            <if test="classId != null and classId != ''"> and sf.class_id = #{classId} </if>
+            <if test="triggerModeId != null and triggerModeId != ''"> and sf.trigger_mode_id = #{triggerModeId} </if>
+            <if test="nifiGroupId != null and nifiGroupId != ''"> and sf.nifi_group_id = #{nifiGroupId} </if>
+            <if test="description != null and description != ''"> and sf.description = #{description} </if>
+            and sf.sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sf.sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity">
+        select  count(1)   from sys_flow
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="status != null and status != ''"> and status = #{status} </if>
+            <if test="classId != null and classId != ''"> and class_id = #{classId} </if>
+            <if test="triggerModeId != null and triggerModeId != ''"> and trigger_mode_id = #{triggerModeId} </if>
+            <if test="nifiGroupId != null and nifiGroupId != ''"> and nifi_group_id = #{nifiGroupId} </if>
+            <if test="description != null and description != ''"> and description = #{description} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity">
+    select
+    <include refid="SysFlowEntity_Base_Column_List" />
+    from sys_flow sf
+    left join sys_flow_class sfc on sfc.id = sf.class_id
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and sf.id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and sf.create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and sf.create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and sf.modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and sf.modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sf.sts like concat('%',#{sts},'%') </if>
+            <if test="name != null and name != ''"> and sf.name like concat('%',#{name},'%') </if>
+            <if test="status != null and status != ''"> and sf.status like concat('%',#{status},'%') </if>
+            <if test="classId != null and classId != ''"> and sf.class_id like concat('%',#{classId},'%') </if>
+            <if test="triggerModeId != null and triggerModeId != ''"> and sf.trigger_mode_id like concat('%',#{triggerModeId},'%') </if>
+            <if test="nifiGroupId != null and nifiGroupId != ''"> and sf.nifi_group_id like concat('%',#{nifiGroupId},'%') </if>
+            <if test="description != null and description != ''"> and sf.description like concat('%',#{description},'%') </if>
+            and sf.sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sf.sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowentity_list_or" resultMap="get-SysFlowEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity">
+    select
+    <include refid="SysFlowEntity_Base_Column_List" />
+    from sys_flow sf
+    left join sys_flow_class sfc on sfc.id = sf.class_id
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or sf.id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or sf.create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or sf.create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or sf.modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or sf.modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sf.sts = #{sts} </if>
+             <if test="name != null and name != ''"> or sf.name = #{name} </if>
+             <if test="status != null and status != ''"> or sf.status = #{status} </if>
+             <if test="classId != null and classId != ''"> or sf.class_id = #{classId} </if>
+             <if test="triggerModeId != null and triggerModeId != ''"> or sf.trigger_mode_id = #{triggerModeId} </if>
+             <if test="nifiGroupId != null and nifiGroupId != ''"> or sf.nifi_group_id = #{nifiGroupId} </if>
+             <if test="description != null and description != ''"> or sf.description = #{description} </if>
+            and sf.sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow(
+    <trim suffix="" suffixOverrides=",">
+        <if test="id != null and id != ''">id ,</if>
+        <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+        <if test="create_time != null">create_time ,</if>
+        <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+        <if test="modify_time != null">modify_time ,</if>
+        <if test="sts != null and sts != ''">sts ,</if>
+        <if test="name != null and name != ''">name ,</if>
+        <if test="status != null and status != ''">status ,</if>
+        <if test="classId != null and classId != ''">class_id ,</if>
+        <if test="triggerModeId != null and triggerModeId != ''">trigger_mode_id ,</if>
+        <if test="nifiGroupId != null and nifiGroupId != ''">nifi_group_id ,</if>
+        <if test="description != null and description != ''">description ,</if>
+        <if test="sorts == null ">sorts,</if>
+        <if test="sts == null ">sts,</if>
+    </trim>
+    )values(
+    <trim suffix="" suffixOverrides=",">
+        <if test="id != null and id != ''">#{id} ,</if>
+        <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+        <if test="create_time != null">#{create_time} ,</if>
+        <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+        <if test="modify_time != null">#{modify_time} ,</if>
+        <if test="sts != null and sts != ''">#{sts} ,</if>
+        <if test="name != null and name != ''">#{name} ,</if>
+        <if test="status != null and status != ''">#{status} ,</if>
+        <if test="classId != null and classId != ''">#{classId} ,</if>
+        <if test="triggerModeId != null and triggerModeId != ''">#{triggerModeId} ,</if>
+        <if test="nifiGroupId != null and nifiGroupId != ''">#{nifiGroupId} ,</if>
+        <if test="description != null and description != ''">#{description} ,</if>
+        <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow a WHERE a.sts = 'Y' ),1),
+        </if>
+        <if test="sts == null ">'Y',</if>
+    </trim>
+    )
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow(create_user_id, create_time, modify_user_id, modify_time, sts, name,status, class_id, trigger_mode_id, nifi_group_id, description,  sts)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.name},${entity.status},#{entity.classId},#{entity.triggerModeId},#{entity.nifiGroupId},#{entity.description}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow(create_user_id, create_time, modify_user_id, modify_time, sts, name, status,class_id, trigger_mode_id, nifi_group_id, description)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.name},#{entity.status},#{entity.classId},#{entity.triggerModeId},#{entity.nifiGroupId},#{entity.description})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    name = values(name),
+    class_id = values(class_id),
+    trigger_mode_id = values(trigger_mode_id),
+    nifi_group_id = values(nifi_group_id),
+    description = values(description)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity" >
+update sys_flow  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="name != null and name != ''"> name = #{name},</if>
+  <if test="status != null and status != ''"> status = #{status},</if>
+  <if test="classId != null and classId != ''"> class_id = #{classId},</if>
+  <if test="triggerModeId != null and triggerModeId != ''"> trigger_mode_id = #{triggerModeId},</if>
+  <if test="nifiGroupId != null and nifiGroupId != ''"> nifi_group_id = #{nifiGroupId},</if>
+  <if test="description != null and description != ''"> description = #{description},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity" >
+update sys_flow  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowEntity" >
+update sys_flow  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="classId != null and classId != ''"> and class_id = #{classId} </if>
+            <if test="triggerModeId != null and triggerModeId != ''"> and trigger_mode_id = #{triggerModeId} </if>
+            <if test="nifiGroupId != null and nifiGroupId != ''"> and nifi_group_id = #{nifiGroupId} </if>
+            <if test="description != null and description != ''"> and description = #{description} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowNifiConstantEntity.java

@@ -0,0 +1,66 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * nifi常量(SysFlowNifiConstant)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public class SysFlowNifiConstantEntity extends BaseEntity {
+ 
+  /**  键 */
+   private String nifiKey;
+  /**  值 */
+   private String nifiValue;
+  /**  显示值 */
+   private String showValue;
+  /**  描述 */
+   private String description;
+  /**  分类 */
+   private String type;
+
+
+    public String getNifiKey() {
+        return nifiKey;
+    }
+
+    public void setNifiKey(String nifiKey) {
+        this.nifiKey = nifiKey;
+    }
+
+    public String getNifiValue() {
+        return nifiValue;
+    }
+
+    public void setNifiValue(String nifiValue) {
+        this.nifiValue = nifiValue;
+    }
+
+    public String getShowValue() {
+        return showValue;
+    }
+
+    public void setShowValue(String showValue) {
+        this.showValue = showValue;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowNifiConstantEntity.xml

@@ -0,0 +1,226 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowNifiConstantDaoImpl">
+
+    <resultMap id="get-SysFlowNifiConstantEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="nifiKey" column="nifi_key" jdbcType="VARCHAR"/>
+           <result property="nifiValue" column="nifi_value" jdbcType="VARCHAR"/>
+           <result property="showValue" column="show_value" jdbcType="VARCHAR"/>
+           <result property="description" column="description" jdbcType="VARCHAR"/>
+           <result property="type" column="type" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowNifiConstantEntity_Base_Column_List">
+        id
+       ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,nifi_key
+        ,nifi_value
+        ,show_value 
+        ,description 
+        ,type 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowNifiConstantEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity">
+    select
+    <include refid="SysFlowNifiConstantEntity_Base_Column_List" />
+    from sys_flow_nifi_constant
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="nifiKey != null and nifiKey != ''"> and nifi_key = #{nifiKey} </if>
+            <if test="nifiValue != null and value != ''"> and nifi_value = #{nifiValue} </if>
+            <if test="showValue != null and showValue != ''"> and show_value = #{showValue} </if>
+            <if test="description != null and description != ''"> and description = #{description} </if>
+            <if test="type != null and type != ''"> and type = #{type} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity">
+        select  count(1)   from sys_flow_nifi_constant
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="nifiKey != null and nifiKey != ''"> and nifi_key = #{nifiKey} </if>
+            <if test="nifiValue != null and nifiValue != ''"> and nifi_value = #{nifiValue} </if>
+            <if test="showValue != null and showValue != ''"> and show_value = #{showValue} </if>
+            <if test="description != null and description != ''"> and description = #{description} </if>
+            <if test="type != null and type != ''"> and type = #{type} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowNifiConstantEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity">
+    select
+    <include refid="SysFlowNifiConstantEntity_Base_Column_List" />
+    from sys_flow_nifi_constant
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="nifiKey != null and nifiKey != ''"> and nifi_key like concat('%',#{nifiKey},'%') </if>
+            <if test="nifiValue != null and nifiValue != ''"> and nifi_value like concat('%',#{nifiValue},'%') </if>
+            <if test="showValue != null and showValue != ''"> and show_value like concat('%',#{showValue},'%') </if>
+            <if test="description != null and description != ''"> and description like concat('%',#{description},'%') </if>
+            <if test="type != null and type != ''"> and type like concat('%',#{type},'%') </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowNifiConstantentity_list_or" resultMap="get-SysFlowNifiConstantEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity">
+    select
+    <include refid="SysFlowNifiConstantEntity_Base_Column_List" />
+    from sys_flow_nifi_constant
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="nifiKey != null and nifiKey != ''"> or nifi_key = #{nifiKey} </if>
+             <if test="nifiValue != null and nifiValue != ''"> or nifi_value = #{nifiValue} </if>
+             <if test="showValue != null and showValue != ''"> or show_value = #{showValue} </if>
+             <if test="description != null and description != ''"> or description = #{description} </if>
+             <if test="type != null and type != ''"> or type = #{type} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_nifi_constant(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
+            <if test="create_time != null"> create_time , </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+            <if test="modify_time != null"> modify_time , </if>
+            <if test="sts != null and sts != ''"> sts , </if>
+            <if test="nifiKey != null and nifiKey != ''"> nifi_key , </if>
+            <if test="nifiValue != null and nifiValue != ''"> nifi_value , </if>
+            <if test="showValue != null and showValue != ''"> show_value , </if>
+            <if test="description != null and description != ''"> description , </if>
+            <if test="type != null and type != ''"> type , </if>
+            <if test="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
+            <if test="create_time != null"> #{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+            <if test="modify_time != null"> #{modify_time} ,</if>
+            <if test="sts != null and sts != ''"> #{sts} ,</if>
+            <if test="nifiKey != null and nifiKey != ''"> #{nifiKey} ,</if>
+            <if test="nifiValue != null and nifiValue != ''"> #{nifiValue} ,</if>
+            <if test="showValue != null and showValue != ''"> #{showValue} ,</if>
+            <if test="description != null and description != ''"> #{description} ,</if>
+            <if test="type != null and type != ''"> #{type} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_nifi_constant a WHERE a.sts = 'Y' ),1),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow_nifi_constant(create_user_id, create_time, modify_user_id, modify_time, sts, nifi_key, nifi_value, show_value, description, type,  sts)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.nifiKey},#{entity.nifiValue},#{entity.showValue},#{entity.description},#{entity.type}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_nifi_constant(create_user_id, create_time, modify_user_id, modify_time, sts, nifi_key, nifi_value, show_value, description, type)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.nifiKey},#{entity.nifiValue},#{entity.showValue},#{entity.description},#{entity.type})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    nifi_key = values(nifiKey),
+    nifi_value = values(nifiValue),
+    show_value = values(show_value),
+    description = values(description),
+    type = values(type)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity" >
+update sys_flow_nifi_constant  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="nifiKey != null and nifiKey != ''"> nifi_key = #{nifiKey},</if>
+  <if test="nifiValue != null and nifiValue != ''"> nifi_value = #{nifiValue},</if>
+  <if test="showValue != null and showValue != ''"> show_value = #{showValue},</if>
+  <if test="description != null and description != ''"> description = #{description},</if>
+  <if test="type != null and type != ''"> type = #{type},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity" >
+update sys_flow_nifi_constant  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity" >
+update sys_flow_nifi_constant  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="nifiKey != null and nifiKey != ''"> andnifi_ key = #{nifiKey} </if>
+            <if test="nifiValue != null and nifiValue != ''"> and nifi_value = #{nifiValue} </if>
+            <if test="showValue != null and showValue != ''"> and show_value = #{showValue} </if>
+            <if test="description != null and description != ''"> and description = #{description} </if>
+            <if test="type != null and type != ''"> and type = #{type} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow_nifi_constant where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepAccountEntity.java

@@ -0,0 +1,155 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 流程步骤账户表(SysFlowStepAccount)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public class SysFlowStepAccountEntity extends BaseEntity {
+
+    //流程id
+    private String flowId;
+    //流程步骤id
+    private String stepId;
+    //应用id
+    private String appId;
+  /**  账户名称 */
+   private String name;
+  /**  ip地址 */
+   private String ipAddress;
+  /**  端口 */
+   private String port;
+  /**  数据库名称 */
+   private String dbName;
+  /**  用户名 */
+   private String userName;
+  /**  密码 */
+   private String password;
+  /**  数据库类型 */
+   private String dbType;
+  /**  应用key */
+   private String appKey;
+  /**  应用密钥 */
+   private String appSecret;
+  /**  企业id */
+   private String corpid;
+  /**  应用id */
+   private String agentid;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public String getDbName() {
+        return dbName;
+    }
+
+    public void setDbName(String dbName) {
+        this.dbName = dbName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public String getAppKey() {
+        return appKey;
+    }
+
+    public void setAppKey(String appKey) {
+        this.appKey = appKey;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid;
+    }
+
+    public String getAgentid() {
+        return agentid;
+    }
+
+    public void setAgentid(String agentid) {
+        this.agentid = agentid;
+    }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public String getStepId() {
+        return stepId;
+    }
+
+    public void setStepId(String stepId) {
+        this.stepId = stepId;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepAccountEntity.xml

@@ -0,0 +1,325 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowStepAccountDaoImpl">
+
+    <resultMap id="get-SysFlowStepAccountEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="name" column="name" jdbcType="VARCHAR"/>
+           <result property="ipAddress" column="ip_address" jdbcType="VARCHAR"/>
+           <result property="port" column="port" jdbcType="VARCHAR"/>
+           <result property="dbName" column="db_name" jdbcType="VARCHAR"/>
+           <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+           <result property="password" column="password" jdbcType="VARCHAR"/>
+           <result property="flowId" column="flow_id" jdbcType="VARCHAR"/>
+           <result property="stepId" column="step_id" jdbcType="VARCHAR"/>
+           <result property="appId" column="app_id" jdbcType="VARCHAR"/>
+           <result property="dbType" column="db_type" jdbcType="VARCHAR"/>
+           <result property="appKey" column="app_key" jdbcType="VARCHAR"/>
+           <result property="appSecret" column="app_secret" jdbcType="VARCHAR"/>
+           <result property="corpid" column="corpId" jdbcType="VARCHAR"/>
+           <result property="agentid" column="agentId" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowStepAccountEntity_Base_Column_List">
+        id
+       ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,name 
+        ,ip_address 
+        ,port 
+        ,db_name 
+        ,user_name 
+        ,password 
+        ,flow_id
+        ,step_id
+        ,app_id
+        ,db_type
+        ,app_key 
+        ,app_secret 
+        ,corpId 
+        ,agentId 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowStepAccountEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity">
+    select
+    <include refid="SysFlowStepAccountEntity_Base_Column_List" />
+    from sys_flow_step_account
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="ipAddress != null and ipAddress != ''"> and ip_address = #{ipAddress} </if>
+            <if test="port != null and port != ''"> and port = #{port} </if>
+            <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="userName != null and userName != ''"> and user_name = #{userName} </if>
+            <if test="password != null and password != ''"> and password = #{password} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="dbType != null and dbType != ''"> and db_type = #{dbType} </if>
+            <if test="appKey != null and appKey != ''"> and app_key = #{appKey} </if>
+            <if test="appSecret != null and appSecret != ''"> and app_secret = #{appSecret} </if>
+            <if test="corpid != null and corpid != ''"> and corpId = #{corpid} </if>
+            <if test="agentid != null and agentid != ''"> and agentId = #{agentid} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity">
+        select  count(1)   from sys_flow_step_account
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="ipAddress != null and ipAddress != ''"> and ip_address = #{ipAddress} </if>
+            <if test="port != null and port != ''"> and port = #{port} </if>
+            <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="userName != null and userName != ''"> and user_name = #{userName} </if>
+            <if test="password != null and password != ''"> and password = #{password} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="dbType != null and dbType != ''"> and db_type = #{dbType} </if>
+            <if test="appKey != null and appKey != ''"> and app_key = #{appKey} </if>
+            <if test="appSecret != null and appSecret != ''"> and app_secret = #{appSecret} </if>
+            <if test="corpid != null and corpid != ''"> and corpId = #{corpid} </if>
+            <if test="agentid != null and agentid != ''"> and agentId = #{agentid} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowStepAccountEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity">
+    select
+    <include refid="SysFlowStepAccountEntity_Base_Column_List" />
+    from sys_flow_step_account
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="name != null and name != ''"> and name like concat('%',#{name},'%') </if>
+            <if test="ipAddress != null and ipAddress != ''"> and ip_address like concat('%',#{ipAddress},'%') </if>
+            <if test="port != null and port != ''"> and port like concat('%',#{port},'%') </if>
+            <if test="dbName != null and dbName != ''"> and db_name like concat('%',#{dbName},'%') </if>
+            <if test="userName != null and userName != ''"> and user_name like concat('%',#{userName},'%') </if>
+            <if test="password != null and password != ''"> and password like concat('%',#{password},'%') </if>
+            <if test="flowId != null and flowId != ''"> and flow_id like concat('%',#{flowId},'%') </if>
+            <if test="stepId != null and stepId != ''"> and step_id like concat('%',#{stepId},'%') </if>
+            <if test="appId != null and appId != ''"> and app_id like concat('%',#{appId},'%') </if>
+            <if test="dbType != null and dbType != ''"> and db_type like concat('%',#{dbType},'%') </if>
+            <if test="appKey != null and appKey != ''"> and app_key like concat('%',#{appKey},'%') </if>
+            <if test="appSecret != null and appSecret != ''"> and app_secret like concat('%',#{appSecret},'%') </if>
+            <if test="corpid != null and corpid != ''"> and corpId like concat('%',#{corpid},'%') </if>
+            <if test="agentid != null and agentid != ''"> and agentId like concat('%',#{agentid},'%') </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowStepAccountentity_list_or" resultMap="get-SysFlowStepAccountEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity">
+    select
+    <include refid="SysFlowStepAccountEntity_Base_Column_List" />
+    from sys_flow_step_account
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="name != null and name != ''"> or name = #{name} </if>
+             <if test="ipAddress != null and ipAddress != ''"> or ip_address = #{ipAddress} </if>
+             <if test="port != null and port != ''"> or port = #{port} </if>
+             <if test="dbName != null and dbName != ''"> or db_name = #{dbName} </if>
+             <if test="userName != null and userName != ''"> or user_name = #{userName} </if>
+             <if test="password != null and password != ''"> or password = #{password} </if>
+             <if test="flowId != null and flowId != ''"> or flow_id = #{flowId} </if>
+             <if test="stepId != null and stepId != ''"> or step_id = #{stepId} </if>
+             <if test="appId != null and appId != ''"> or app_id = #{appId} </if>
+             <if test="dbType != null and dbType != ''"> or db_type = #{dbType} </if>
+             <if test="appKey != null and appKey != ''"> or app_key = #{appKey} </if>
+             <if test="appSecret != null and appSecret != ''"> or app_secret = #{appSecret} </if>
+             <if test="corpid != null and corpid != ''"> or corpId = #{corpid} </if>
+             <if test="agentid != null and agentid != ''"> or agentId = #{agentid} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_account(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
+            <if test="create_time != null"> create_time , </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+            <if test="modify_time != null"> modify_time , </if>
+            <if test="sts != null and sts != ''"> sts , </if>
+            <if test="name != null and name != ''"> name , </if>
+            <if test="ipAddress != null and ipAddress != ''"> ip_address , </if>
+            <if test="port != null and port != ''"> port , </if>
+            <if test="dbName != null and dbName != ''"> db_name , </if>
+            <if test="userName != null and userName != ''"> user_name , </if>
+            <if test="password != null and password != ''"> password , </if>
+            <if test="flowId != null and flowId != ''"> flow_id , </if>
+            <if test="stepId != null and stepId != ''"> step_id , </if>
+            <if test="appId != null and appId != ''"> app_id , </if>
+            <if test="dbType != null and dbType != ''"> db_type , </if>
+            <if test="appKey != null and appKey != ''"> app_key , </if>
+            <if test="appSecret != null and appSecret != ''"> app_secret , </if>
+            <if test="corpid != null and corpid != ''"> corpId , </if>
+            <if test="agentid != null and agentid != ''"> agentId , </if>
+            <if test="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
+            <if test="create_time != null"> #{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+            <if test="modify_time != null"> #{modify_time} ,</if>
+            <if test="sts != null and sts != ''"> #{sts} ,</if>
+            <if test="name != null and name != ''"> #{name} ,</if>
+            <if test="ipAddress != null and ipAddress != ''"> #{ipAddress} ,</if>
+            <if test="port != null and port != ''"> #{port} ,</if>
+            <if test="dbName != null and dbName != ''"> #{dbName} ,</if>
+            <if test="userName != null and userName != ''"> #{userName} ,</if>
+            <if test="password != null and password != ''"> #{password} ,</if>
+            <if test="flowId != null and flowId != ''"> #{flowId} ,</if>
+            <if test="stepId != null and stepId != ''"> #{stepId} ,</if>
+            <if test="appId != null and appId != ''"> #{appId} ,</if>
+            <if test="dbType != null and dbType != ''"> #{dbType} ,</if>
+            <if test="appKey != null and appKey != ''"> #{appKey} ,</if>
+            <if test="appSecret != null and appSecret != ''"> #{appSecret} ,</if>
+            <if test="corpid != null and corpid != ''"> #{corpid} ,</if>
+            <if test="agentid != null and agentid != ''"> #{agentid} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_account a WHERE a.sts = 'Y' ),1),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow_step_account(create_user_id, create_time, modify_user_id, modify_time, sts, name, ip_address, port, db_name, user_name, password,flow_id,step_id,app_id, db_type, app_key, app_secret, corpId, agentId,  sts)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.name},#{entity.ipAddress},#{entity.port},#{entity.dbName},#{entity.userName},#{entity.password},#{entity.flowId},#{entity.stepId},#{entity.appId},#{entity.dbType},#{entity.appKey},#{entity.appSecret},#{entity.corpid},#{entity.agentid}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_account(create_user_id, create_time, modify_user_id, modify_time, sts, name, ip_address, port, db_name, user_name, password,flow_id,step_id,app_id, db_type, app_key, app_secret, corpId, agentId)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.name},#{entity.ipAddress},#{entity.port},#{entity.dbName},#{entity.userName},#{entity.password},#{entity.flowId},#{entity.stepId},#{entity.appId},#{entity.dbType},#{entity.appKey},#{entity.appSecret},#{entity.corpid},#{entity.agentid})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    name = values(name),
+    ip_address = values(ip_address),
+    port = values(port),
+    db_name = values(db_name),
+    user_name = values(user_name),
+    password = values(password),
+    flow_id = values(flow_id),
+    step_id = values(step_id),
+    app_id = values(app_id),
+    db_type = values(db_type),
+    app_key = values(app_key),
+    app_secret = values(app_secret),
+    corpId = values(corpId),
+    agentId = values(agentId)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity" >
+update sys_flow_step_account  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="name != null and name != ''"> name = #{name},</if>
+  <if test="ipAddress != null and ipAddress != ''"> ip_address = #{ipAddress},</if>
+  <if test="port != null and port != ''"> port = #{port},</if>
+  <if test="dbName != null and dbName != ''"> db_name = #{dbName},</if>
+  <if test="userName != null and userName != ''"> user_name = #{userName},</if>
+  <if test="password != null and password != ''"> password = #{password},</if>
+  <if test="flowId != null and flowId != ''"> flow_id = #{flowId},</if>
+  <if test="stepId != null and stepId != ''"> step_id = #{stepId},</if>
+  <if test="appId != null and appId != ''"> app_id = #{appId},</if>
+  <if test="dbType != null and dbType != ''"> db_type = #{dbType},</if>
+  <if test="appKey != null and appKey != ''"> app_key = #{appKey},</if>
+  <if test="appSecret != null and appSecret != ''"> app_secret = #{appSecret},</if>
+  <if test="corpid != null and corpid != ''"> corpId = #{corpid},</if>
+  <if test="agentid != null and agentid != ''"> agentId = #{agentid},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity" >
+update sys_flow_step_account  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity" >
+update sys_flow_step_account  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="name != null and name != ''"> and name = #{name} </if>
+            <if test="ipAddress != null and ipAddress != ''"> and ip_address = #{ipAddress} </if>
+            <if test="port != null and port != ''"> and port = #{port} </if>
+            <if test="dbName != null and dbName != ''"> and db_name = #{dbName} </if>
+            <if test="userName != null and userName != ''"> and user_name = #{userName} </if>
+            <if test="password != null and password != ''"> and password = #{password} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
+            <if test="dbType != null and dbType != ''"> and db_type = #{dbType} </if>
+            <if test="appKey != null and appKey != ''"> and app_key = #{appKey} </if>
+            <if test="appSecret != null and appSecret != ''"> and app_secret = #{appSecret} </if>
+            <if test="corpid != null and corpid != ''"> and corpId = #{corpid} </if>
+            <if test="agentid != null and agentid != ''"> and agentId = #{agentid} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow_step_account where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigBEntity.java

@@ -0,0 +1,126 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 映射信息表体(SysFlowStepConfigB)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public class SysFlowStepConfigBEntity extends BaseEntity {
+ 
+  /**  主表id */
+   private String mainId;
+  /**  流程id */
+   private String flowId;
+  /**  步骤id */
+   private String stepId;
+  /**  是否主键 */
+   private String primaryKeyFlag;
+  /**  字段名 */
+   private String fieldName;
+  /**  字段备注 */
+   private String fieldDescription;
+  /**  字段类型 */
+   private String fieldType;
+  /**  查询条件 */
+   private String whereCondition;
+  /**  源字段名称;适用于插入场景 */
+   private String sourceFieldName;
+  /**  源字段类型;适用于插入场景 */
+   private String sourceFieldType;
+  /**  源字段描述;适用于插入场景 */
+   private String sourceFieldDescription;
+
+
+    public String getMainId() {
+        return mainId;
+    }
+
+    public void setMainId(String mainId) {
+        this.mainId = mainId;
+    }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public String getStepId() {
+        return stepId;
+    }
+
+    public void setStepId(String stepId) {
+        this.stepId = stepId;
+    }
+
+    public String getPrimaryKeyFlag() {
+        return primaryKeyFlag;
+    }
+
+    public void setPrimaryKeyFlag(String primaryKeyFlag) {
+        this.primaryKeyFlag = primaryKeyFlag;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getFieldDescription() {
+        return fieldDescription;
+    }
+
+    public void setFieldDescription(String fieldDescription) {
+        this.fieldDescription = fieldDescription;
+    }
+
+    public String getFieldType() {
+        return fieldType;
+    }
+
+    public void setFieldType(String fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getWhereCondition() {
+        return whereCondition;
+    }
+
+    public void setWhereCondition(String whereCondition) {
+        this.whereCondition = whereCondition;
+    }
+
+    public String getSourceFieldName() {
+        return sourceFieldName;
+    }
+
+    public void setSourceFieldName(String sourceFieldName) {
+        this.sourceFieldName = sourceFieldName;
+    }
+
+    public String getSourceFieldType() {
+        return sourceFieldType;
+    }
+
+    public void setSourceFieldType(String sourceFieldType) {
+        this.sourceFieldType = sourceFieldType;
+    }
+
+    public String getSourceFieldDescription() {
+        return sourceFieldDescription;
+    }
+
+    public void setSourceFieldDescription(String sourceFieldDescription) {
+        this.sourceFieldDescription = sourceFieldDescription;
+    }
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigBEntity.xml

@@ -0,0 +1,292 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowStepConfigBDaoImpl">
+
+    <resultMap id="get-SysFlowStepConfigBEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="mainId" column="main_id" jdbcType="VARCHAR"/>
+           <result property="flowId" column="flow_id" jdbcType="VARCHAR"/>
+           <result property="stepId" column="step_id" jdbcType="VARCHAR"/>
+           <result property="primaryKeyFlag" column="primary_key_flag" jdbcType="VARCHAR"/>
+           <result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
+           <result property="fieldDescription" column="field_description" jdbcType="VARCHAR"/>
+           <result property="fieldType" column="field_type" jdbcType="VARCHAR"/>
+           <result property="whereCondition" column="where_condition" jdbcType="VARCHAR"/>
+           <result property="sourceFieldName" column="source_field_name" jdbcType="VARCHAR"/>
+           <result property="sourceFieldType" column="source_field_type" jdbcType="VARCHAR"/>
+           <result property="sourceFieldDescription" column="source_field_description" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowStepConfigBEntity_Base_Column_List">
+        id
+       ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,main_id 
+        ,flow_id 
+        ,step_id 
+        ,primary_key_flag 
+        ,field_name 
+        ,field_description 
+        ,field_type 
+        ,where_condition 
+        ,source_field_name 
+        ,source_field_type 
+        ,source_field_description 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowStepConfigBEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity">
+    select
+    <include refid="SysFlowStepConfigBEntity_Base_Column_List" />
+    from sys_flow_step_config_b
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="mainId != null and mainId != ''"> and main_id = #{mainId} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> and primary_key_flag = #{primaryKeyFlag} </if>
+            <if test="fieldName != null and fieldName != ''"> and field_name = #{fieldName} </if>
+            <if test="fieldDescription != null and fieldDescription != ''"> and field_description = #{fieldDescription} </if>
+            <if test="fieldType != null and fieldType != ''"> and field_type = #{fieldType} </if>
+            <if test="whereCondition != null and whereCondition != ''"> and where_condition = #{whereCondition} </if>
+            <if test="sourceFieldName != null and sourceFieldName != ''"> and source_field_name = #{sourceFieldName} </if>
+            <if test="sourceFieldType != null and sourceFieldType != ''"> and source_field_type = #{sourceFieldType} </if>
+            <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> and source_field_description = #{sourceFieldDescription} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity">
+        select  count(1)   from sys_flow_step_config_b
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="mainId != null and mainId != ''"> and main_id = #{mainId} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> and primary_key_flag = #{primaryKeyFlag} </if>
+            <if test="fieldName != null and fieldName != ''"> and field_name = #{fieldName} </if>
+            <if test="fieldDescription != null and fieldDescription != ''"> and field_description = #{fieldDescription} </if>
+            <if test="fieldType != null and fieldType != ''"> and field_type = #{fieldType} </if>
+            <if test="whereCondition != null and whereCondition != ''"> and where_condition = #{whereCondition} </if>
+            <if test="sourceFieldName != null and sourceFieldName != ''"> and source_field_name = #{sourceFieldName} </if>
+            <if test="sourceFieldType != null and sourceFieldType != ''"> and source_field_type = #{sourceFieldType} </if>
+            <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> and source_field_description = #{sourceFieldDescription} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowStepConfigBEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity">
+    select
+    <include refid="SysFlowStepConfigBEntity_Base_Column_List" />
+    from sys_flow_step_config_b
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="mainId != null and mainId != ''"> and main_id like concat('%',#{mainId},'%') </if>
+            <if test="flowId != null and flowId != ''"> and flow_id like concat('%',#{flowId},'%') </if>
+            <if test="stepId != null and stepId != ''"> and step_id like concat('%',#{stepId},'%') </if>
+            <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> and primary_key_flag like concat('%',#{primaryKeyFlag},'%') </if>
+            <if test="fieldName != null and fieldName != ''"> and field_name like concat('%',#{fieldName},'%') </if>
+            <if test="fieldDescription != null and fieldDescription != ''"> and field_description like concat('%',#{fieldDescription},'%') </if>
+            <if test="fieldType != null and fieldType != ''"> and field_type like concat('%',#{fieldType},'%') </if>
+            <if test="whereCondition != null and whereCondition != ''"> and where_condition like concat('%',#{whereCondition},'%') </if>
+            <if test="sourceFieldName != null and sourceFieldName != ''"> and source_field_name like concat('%',#{sourceFieldName},'%') </if>
+            <if test="sourceFieldType != null and sourceFieldType != ''"> and source_field_type like concat('%',#{sourceFieldType},'%') </if>
+            <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> and source_field_description like concat('%',#{sourceFieldDescription},'%') </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowStepConfigBentity_list_or" resultMap="get-SysFlowStepConfigBEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity">
+    select
+    <include refid="SysFlowStepConfigBEntity_Base_Column_List" />
+    from sys_flow_step_config_b
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="mainId != null and mainId != ''"> or main_id = #{mainId} </if>
+             <if test="flowId != null and flowId != ''"> or flow_id = #{flowId} </if>
+             <if test="stepId != null and stepId != ''"> or step_id = #{stepId} </if>
+             <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> or primary_key_flag = #{primaryKeyFlag} </if>
+             <if test="fieldName != null and fieldName != ''"> or field_name = #{fieldName} </if>
+             <if test="fieldDescription != null and fieldDescription != ''"> or field_description = #{fieldDescription} </if>
+             <if test="fieldType != null and fieldType != ''"> or field_type = #{fieldType} </if>
+             <if test="whereCondition != null and whereCondition != ''"> or where_condition = #{whereCondition} </if>
+             <if test="sourceFieldName != null and sourceFieldName != ''"> or source_field_name = #{sourceFieldName} </if>
+             <if test="sourceFieldType != null and sourceFieldType != ''"> or source_field_type = #{sourceFieldType} </if>
+             <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> or source_field_description = #{sourceFieldDescription} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_config_b(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
+            <if test="create_time != null"> create_time , </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+            <if test="modify_time != null"> modify_time , </if>
+            <if test="sts != null and sts != ''"> sts , </if>
+            <if test="mainId != null and mainId != ''"> main_id , </if>
+            <if test="flowId != null and flowId != ''"> flow_id , </if>
+            <if test="stepId != null and stepId != ''"> step_id , </if>
+            <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> primary_key_flag , </if>
+            <if test="fieldName != null and fieldName != ''"> field_name , </if>
+            <if test="fieldDescription != null and fieldDescription != ''"> field_description , </if>
+            <if test="fieldType != null and fieldType != ''"> field_type , </if>
+            <if test="whereCondition != null and whereCondition != ''"> where_condition , </if>
+            <if test="sourceFieldName != null and sourceFieldName != ''"> source_field_name , </if>
+            <if test="sourceFieldType != null and sourceFieldType != ''"> source_field_type , </if>
+            <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> source_field_description , </if>
+            <if test="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
+            <if test="create_time != null"> #{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+            <if test="modify_time != null"> #{modify_time} ,</if>
+            <if test="sts != null and sts != ''"> #{sts} ,</if>
+            <if test="mainId != null and mainId != ''"> #{mainId} ,</if>
+            <if test="flowId != null and flowId != ''"> #{flowId} ,</if>
+            <if test="stepId != null and stepId != ''"> #{stepId} ,</if>
+            <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> #{primaryKeyFlag} ,</if>
+            <if test="fieldName != null and fieldName != ''"> #{fieldName} ,</if>
+            <if test="fieldDescription != null and fieldDescription != ''"> #{fieldDescription} ,</if>
+            <if test="fieldType != null and fieldType != ''"> #{fieldType} ,</if>
+            <if test="whereCondition != null and whereCondition != ''"> #{whereCondition} ,</if>
+            <if test="sourceFieldName != null and sourceFieldName != ''"> #{sourceFieldName} ,</if>
+            <if test="sourceFieldType != null and sourceFieldType != ''"> #{sourceFieldType} ,</if>
+            <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> #{sourceFieldDescription} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_config_b a WHERE a.sts = 'Y' ),1),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow_step_config_b(create_user_id, create_time, modify_user_id, modify_time, sts, main_id, flow_id, step_id, primary_key_flag, field_name, field_description, field_type, where_condition, source_field_name, source_field_type, source_field_description,  sts) 
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.mainId},#{entity.flowId},#{entity.stepId},#{entity.primaryKeyFlag},#{entity.fieldName},#{entity.fieldDescription},#{entity.fieldType},#{entity.whereCondition},#{entity.sourceFieldName},#{entity.sourceFieldType},#{entity.sourceFieldDescription}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_config_b(create_user_id, create_time, modify_user_id, modify_time, sts, main_id, flow_id, step_id, primary_key_flag, field_name, field_description, field_type, where_condition, source_field_name, source_field_type, source_field_description)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.mainId},#{entity.flowId},#{entity.stepId},#{entity.primaryKeyFlag},#{entity.fieldName},#{entity.fieldDescription},#{entity.fieldType},#{entity.whereCondition},#{entity.sourceFieldName},#{entity.sourceFieldType},#{entity.sourceFieldDescription})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    main_id = values(main_id),
+    flow_id = values(flow_id),
+    step_id = values(step_id),
+    primary_key_flag = values(primary_key_flag),
+    field_name = values(field_name),
+    field_description = values(field_description),
+    field_type = values(field_type),
+    where_condition = values(where_condition),
+    source_field_name = values(source_field_name),
+    source_field_type = values(source_field_type),
+    source_field_description = values(source_field_description)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity" >
+update sys_flow_step_config_b  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="mainId != null and mainId != ''"> main_id = #{mainId},</if>
+  <if test="flowId != null and flowId != ''"> flow_id = #{flowId},</if>
+  <if test="stepId != null and stepId != ''"> step_id = #{stepId},</if>
+  <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> primary_key_flag = #{primaryKeyFlag},</if>
+  <if test="fieldName != null and fieldName != ''"> field_name = #{fieldName},</if>
+  <if test="fieldDescription != null and fieldDescription != ''"> field_description = #{fieldDescription},</if>
+  <if test="fieldType != null and fieldType != ''"> field_type = #{fieldType},</if>
+  <if test="whereCondition != null and whereCondition != ''"> where_condition = #{whereCondition},</if>
+  <if test="sourceFieldName != null and sourceFieldName != ''"> source_field_name = #{sourceFieldName},</if>
+  <if test="sourceFieldType != null and sourceFieldType != ''"> source_field_type = #{sourceFieldType},</if>
+  <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> source_field_description = #{sourceFieldDescription},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity" >
+update sys_flow_step_config_b  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity" >
+update sys_flow_step_config_b  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="mainId != null and mainId != ''"> and main_id = #{mainId} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="primaryKeyFlag != null and primaryKeyFlag != ''"> and primary_key_flag = #{primaryKeyFlag} </if>
+            <if test="fieldName != null and fieldName != ''"> and field_name = #{fieldName} </if>
+            <if test="fieldDescription != null and fieldDescription != ''"> and field_description = #{fieldDescription} </if>
+            <if test="fieldType != null and fieldType != ''"> and field_type = #{fieldType} </if>
+            <if test="whereCondition != null and whereCondition != ''"> and where_condition = #{whereCondition} </if>
+            <if test="sourceFieldName != null and sourceFieldName != ''"> and source_field_name = #{sourceFieldName} </if>
+            <if test="sourceFieldType != null and sourceFieldType != ''"> and source_field_type = #{sourceFieldType} </if>
+            <if test="sourceFieldDescription != null and sourceFieldDescription != ''"> and source_field_description = #{sourceFieldDescription} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow_step_config_b where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.java

@@ -0,0 +1,145 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 映射信息主表(SysFlowStepConfig)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public class SysFlowStepConfigEntity extends BaseEntity {
+ 
+  /**  流程id */
+   private String flowId;
+  /**  步骤id */
+   private String stepId;
+  /**  流程操作步骤配置表id */
+   private String setpConfigId;
+  /**  操作类型 */
+   private String actionName;
+  /**  数据库类型;数据库类型+版本 */
+   private String dbType;
+  /**  表名称 */
+   private String tableName;
+  /**  页码 */
+   private String rowNum;
+  /**  每页条数 */
+   private String pageLimit;
+  /**  增量数据字段;例如ts */
+   private String maxValueField;
+  /**  是否建表 */
+   private String createTableFlag;
+  /**  写入模式;覆盖写入/增量写入 */
+   private String writeType;
+  /**  动态sql语句 */
+   private String sqlStatement;
+
+   //步骤账户表id
+   private String stepAccountId;
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public String getStepId() {
+        return stepId;
+    }
+
+    public void setStepId(String stepId) {
+        this.stepId = stepId;
+    }
+
+    public String getSetpConfigId() {
+        return setpConfigId;
+    }
+
+    public void setSetpConfigId(String setpConfigId) {
+        this.setpConfigId = setpConfigId;
+    }
+
+    public String getActionName() {
+        return actionName;
+    }
+
+    public void setActionName(String actionName) {
+        this.actionName = actionName;
+    }
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getRowNum() {
+        return rowNum;
+    }
+
+    public void setRowNum(String rowNum) {
+        this.rowNum = rowNum;
+    }
+
+    public String getpageLimit() {
+        return pageLimit;
+    }
+
+    public void setpageLimit(String pageLimit) {
+        this.pageLimit = pageLimit;
+    }
+
+    public String getMaxValueField() {
+        return maxValueField;
+    }
+
+    public void setMaxValueField(String maxValueField) {
+        this.maxValueField = maxValueField;
+    }
+
+    public String getCreateTableFlag() {
+        return createTableFlag;
+    }
+
+    public void setCreateTableFlag(String createTableFlag) {
+        this.createTableFlag = createTableFlag;
+    }
+
+    public String getWriteType() {
+        return writeType;
+    }
+
+    public void setWriteType(String writeType) {
+        this.writeType = writeType;
+    }
+
+    public String getSqlStatement() {
+        return sqlStatement;
+    }
+
+    public void setSqlStatement(String sqlStatement) {
+        this.sqlStatement = sqlStatement;
+    }
+
+    public String getStepAccountId() {
+        return stepAccountId;
+    }
+
+    public void setStepAccountId(String stepAccountId) {
+        this.stepAccountId = stepAccountId;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.xml

@@ -0,0 +1,303 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowStepConfigDaoImpl">
+
+    <resultMap id="get-SysFlowStepConfigEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="flowId" column="flow_id" jdbcType="VARCHAR"/>
+           <result property="stepId" column="step_id" jdbcType="VARCHAR"/>
+           <result property="setpConfigId" column="setp_config_id" jdbcType="VARCHAR"/>
+           <result property="actionName" column="action_name" jdbcType="VARCHAR"/>
+           <result property="dbType" column="db_type" jdbcType="VARCHAR"/>
+           <result property="tableName" column="table_name" jdbcType="VARCHAR"/>
+           <result property="rowNum" column="row_num" jdbcType="VARCHAR"/>
+           <result property="pageLimit" column="page_limit" jdbcType="VARCHAR"/>
+           <result property="maxValueField" column="max_value_field" jdbcType="VARCHAR"/>
+           <result property="createTableFlag" column="create_table_flag" jdbcType="VARCHAR"/>
+           <result property="writeType" column="write_type" jdbcType="VARCHAR"/>
+           <result property="sqlStatement" column="sql_statement" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowStepConfigEntity_Base_Column_List">
+        id
+       ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,flow_id 
+        ,step_id 
+        ,setp_config_id 
+        ,action_name 
+        ,db_type 
+        ,table_name 
+        ,row_num 
+        ,page_limit 
+        ,max_value_field 
+        ,create_table_flag 
+        ,write_type 
+        ,sql_statement 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowStepConfigEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity">
+    select
+    <include refid="SysFlowStepConfigEntity_Base_Column_List" />
+    from sys_flow_step_config
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="setpConfigId != null and setpConfigId != ''"> and setp_config_id = #{setpConfigId} </if>
+            <if test="actionName != null and actionName != ''"> and action_name = #{actionName} </if>
+            <if test="dbType != null and dbType != ''"> and db_type = #{dbType} </if>
+            <if test="tableName != null and tableName != ''"> and table_name = #{tableName} </if>
+            <if test="rowNum != null and rowNum != ''"> and row_num = #{rowNum} </if>
+            <if test="pageLimit != null and pageLimit != ''"> and page_limit = #{pageLimit} </if>
+            <if test="maxValueField != null and maxValueField != ''"> and max_value_field = #{maxValueField} </if>
+            <if test="createTableFlag != null and createTableFlag != ''"> and create_table_flag = #{createTableFlag} </if>
+            <if test="writeType != null and writeType != ''"> and write_type = #{writeType} </if>
+            <if test="sqlStatement != null and sqlStatement != ''"> and sql_statement = #{sqlStatement} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity">
+        select  count(1)   from sys_flow_step_config
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="setpConfigId != null and setpConfigId != ''"> and setp_config_id = #{setpConfigId} </if>
+            <if test="actionName != null and actionName != ''"> and action_name = #{actionName} </if>
+            <if test="dbType != null and dbType != ''"> and db_type = #{dbType} </if>
+            <if test="tableName != null and tableName != ''"> and table_name = #{tableName} </if>
+            <if test="rowNum != null and rowNum != ''"> and row_num = #{rowNum} </if>
+            <if test="pageLimit != null and pageLimit != ''"> and page_limit = #{pageLimit} </if>
+            <if test="maxValueField != null and maxValueField != ''"> and max_value_field = #{maxValueField} </if>
+            <if test="createTableFlag != null and createTableFlag != ''"> and create_table_flag = #{createTableFlag} </if>
+            <if test="writeType != null and writeType != ''"> and write_type = #{writeType} </if>
+            <if test="sqlStatement != null and sqlStatement != ''"> and sql_statement = #{sqlStatement} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowStepConfigEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity">
+    select
+    <include refid="SysFlowStepConfigEntity_Base_Column_List" />
+    from sys_flow_step_config
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="flowId != null and flowId != ''"> and flow_id like concat('%',#{flowId},'%') </if>
+            <if test="stepId != null and stepId != ''"> and step_id like concat('%',#{stepId},'%') </if>
+            <if test="setpConfigId != null and setpConfigId != ''"> and setp_config_id like concat('%',#{setpConfigId},'%') </if>
+            <if test="actionName != null and actionName != ''"> and action_name like concat('%',#{actionName},'%') </if>
+            <if test="dbType != null and dbType != ''"> and db_type like concat('%',#{dbType},'%') </if>
+            <if test="tableName != null and tableName != ''"> and table_name like concat('%',#{tableName},'%') </if>
+            <if test="rowNum != null and rowNum != ''"> and row_num like concat('%',#{rowNum},'%') </if>
+            <if test="pageLimit != null and pageLimit != ''"> and page_limit like concat('%',#{pageLimit},'%') </if>
+            <if test="maxValueField != null and maxValueField != ''"> and max_value_field like concat('%',#{maxValueField},'%') </if>
+            <if test="createTableFlag != null and createTableFlag != ''"> and create_table_flag like concat('%',#{createTableFlag},'%') </if>
+            <if test="writeType != null and writeType != ''"> and write_type like concat('%',#{writeType},'%') </if>
+            <if test="sqlStatement != null and sqlStatement != ''"> and sql_statement like concat('%',#{sqlStatement},'%') </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowStepConfigentity_list_or" resultMap="get-SysFlowStepConfigEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity">
+    select
+    <include refid="SysFlowStepConfigEntity_Base_Column_List" />
+    from sys_flow_step_config
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="flowId != null and flowId != ''"> or flow_id = #{flowId} </if>
+             <if test="stepId != null and stepId != ''"> or step_id = #{stepId} </if>
+             <if test="setpConfigId != null and setpConfigId != ''"> or setp_config_id = #{setpConfigId} </if>
+             <if test="actionName != null and actionName != ''"> or action_name = #{actionName} </if>
+             <if test="dbType != null and dbType != ''"> or db_type = #{dbType} </if>
+             <if test="tableName != null and tableName != ''"> or table_name = #{tableName} </if>
+             <if test="rowNum != null and rowNum != ''"> or row_num = #{rowNum} </if>
+             <if test="pageLimit != null and pageLimit != ''"> or page_limit = #{pageLimit} </if>
+             <if test="maxValueField != null and maxValueField != ''"> or max_value_field = #{maxValueField} </if>
+             <if test="createTableFlag != null and createTableFlag != ''"> or create_table_flag = #{createTableFlag} </if>
+             <if test="writeType != null and writeType != ''"> or write_type = #{writeType} </if>
+             <if test="sqlStatement != null and sqlStatement != ''"> or sql_statement = #{sqlStatement} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_config(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
+            <if test="create_time != null"> create_time , </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+            <if test="modify_time != null"> modify_time , </if>
+            <if test="sts != null and sts != ''"> sts , </if>
+            <if test="flowId != null and flowId != ''"> flow_id , </if>
+            <if test="stepId != null and stepId != ''"> step_id , </if>
+            <if test="setpConfigId != null and setpConfigId != ''"> setp_config_id , </if>
+            <if test="actionName != null and actionName != ''"> action_name , </if>
+            <if test="dbType != null and dbType != ''"> db_type , </if>
+            <if test="tableName != null and tableName != ''"> table_name , </if>
+            <if test="rowNum != null and rowNum != ''"> row_num , </if>
+            <if test="pageLimit != null and pageLimit != ''"> page_limit , </if>
+            <if test="maxValueField != null and maxValueField != ''"> max_value_field , </if>
+            <if test="createTableFlag != null and createTableFlag != ''"> create_table_flag , </if>
+            <if test="writeType != null and writeType != ''"> write_type , </if>
+            <if test="sqlStatement != null and sqlStatement != ''"> sql_statement , </if>
+            <if test="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
+            <if test="create_time != null"> #{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+            <if test="modify_time != null"> #{modify_time} ,</if>
+            <if test="sts != null and sts != ''"> #{sts} ,</if>
+            <if test="flowId != null and flowId != ''"> #{flowId} ,</if>
+            <if test="stepId != null and stepId != ''"> #{stepId} ,</if>
+            <if test="setpConfigId != null and setpConfigId != ''"> #{setpConfigId} ,</if>
+            <if test="actionName != null and actionName != ''"> #{actionName} ,</if>
+            <if test="dbType != null and dbType != ''"> #{dbType} ,</if>
+            <if test="tableName != null and tableName != ''"> #{tableName} ,</if>
+            <if test="rowNum != null and rowNum != ''"> #{rowNum} ,</if>
+            <if test="pageLimit != null and pageLimit != ''"> #{pageLimit} ,</if>
+            <if test="maxValueField != null and maxValueField != ''"> #{maxValueField} ,</if>
+            <if test="createTableFlag != null and createTableFlag != ''"> #{createTableFlag} ,</if>
+            <if test="writeType != null and writeType != ''"> #{writeType} ,</if>
+            <if test="sqlStatement != null and sqlStatement != ''"> #{sqlStatement} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_config a WHERE a.sts = 'Y' ),1),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow_step_config(create_user_id, create_time, modify_user_id, modify_time, sts, flow_id, step_id, setp_config_id, action_name, db_type, table_name, row_num, page_limit, max_value_field, create_table_flag, write_type, sql_statement,  sts) 
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.flowId},#{entity.stepId},#{entity.setpConfigId},#{entity.actionName},#{entity.dbType},#{entity.tableName},#{entity.rowNum},#{entity.pageLimit},#{entity.maxValueField},#{entity.createTableFlag},#{entity.writeType},#{entity.sqlStatement}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_config(create_user_id, create_time, modify_user_id, modify_time, sts, flow_id, step_id, setp_config_id, action_name, db_type, table_name, row_num, page_limit, max_value_field, create_table_flag, write_type, sql_statement)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.flowId},#{entity.stepId},#{entity.setpConfigId},#{entity.actionName},#{entity.dbType},#{entity.tableName},#{entity.rowNum},#{entity.pageLimit},#{entity.maxValueField},#{entity.createTableFlag},#{entity.writeType},#{entity.sqlStatement})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    flow_id = values(flow_id),
+    step_id = values(step_id),
+    setp_config_id = values(setp_config_id),
+    action_name = values(action_name),
+    db_type = values(db_type),
+    table_name = values(table_name),
+    row_num = values(row_num),
+    page_limit = values(page_limit),
+    max_value_field = values(max_value_field),
+    create_table_flag = values(create_table_flag),
+    write_type = values(write_type),
+    sql_statement = values(sql_statement)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity" >
+update sys_flow_step_config  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="flowId != null and flowId != ''"> flow_id = #{flowId},</if>
+  <if test="stepId != null and stepId != ''"> step_id = #{stepId},</if>
+  <if test="setpConfigId != null and setpConfigId != ''"> setp_config_id = #{setpConfigId},</if>
+  <if test="actionName != null and actionName != ''"> action_name = #{actionName},</if>
+  <if test="dbType != null and dbType != ''"> db_type = #{dbType},</if>
+  <if test="tableName != null and tableName != ''"> table_name = #{tableName},</if>
+  <if test="rowNum != null and rowNum != ''"> row_num = #{rowNum},</if>
+  <if test="pageLimit != null and pageLimit != ''"> page_limit = #{pageLimit},</if>
+  <if test="maxValueField != null and maxValueField != ''"> max_value_field = #{maxValueField},</if>
+  <if test="createTableFlag != null and createTableFlag != ''"> create_table_flag = #{createTableFlag},</if>
+  <if test="writeType != null and writeType != ''"> write_type = #{writeType},</if>
+  <if test="sqlStatement != null and sqlStatement != ''"> sql_statement = #{sqlStatement},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity" >
+update sys_flow_step_config  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity" >
+update sys_flow_step_config  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="flowId != null and flowId != ''"> and flow_id = #{flowId} </if>
+            <if test="stepId != null and stepId != ''"> and step_id = #{stepId} </if>
+            <if test="setpConfigId != null and setpConfigId != ''"> and setp_config_id = #{setpConfigId} </if>
+            <if test="actionName != null and actionName != ''"> and action_name = #{actionName} </if>
+            <if test="dbType != null and dbType != ''"> and db_type = #{dbType} </if>
+            <if test="tableName != null and tableName != ''"> and table_name = #{tableName} </if>
+            <if test="rowNum != null and rowNum != ''"> and row_num = #{rowNum} </if>
+            <if test="pageLimit != null and pageLimit != ''"> and page_limit = #{pageLimit} </if>
+            <if test="maxValueField != null and maxValueField != ''"> and max_value_field = #{maxValueField} </if>
+            <if test="createTableFlag != null and createTableFlag != ''"> and create_table_flag = #{createTableFlag} </if>
+            <if test="writeType != null and writeType != ''"> and write_type = #{writeType} </if>
+            <if test="sqlStatement != null and sqlStatement != ''"> and sql_statement = #{sqlStatement} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow_step_config where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepEntity.java

@@ -0,0 +1,143 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 流程步骤信息(SysFlowStep)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public class SysFlowStepEntity extends BaseEntity {
+ 
+  /**  步骤序号 */
+   private Integer step;
+   //流程id
+   private String flowId;
+  /**  步骤类型;1定时任务2数据库3应用 */
+   private String stepType;
+  /**  描述 */
+   private String description;
+  /**  操作动作（名称）;api名称/插件名称 */
+   private String apiName;
+  /**  操作动作类型;api/插件 */
+   private String actionType;
+  /**  应用id */
+   private String appId;
+  /**  操作动作id;api_id,根据操作动作类型来决定是查api还是插件 */
+   private String apiId;
+  /**  nifi返回的应用id;刘工接口返回的nifi应用id，不确定要不要 */
+   private String nifiAppId;
+  /**  nifi的apiId */
+   private String nifiApiId;
+  /**  nifi应用排序模式;先进先出/先进后出 */
+   private String sortMode;
+   //定时任务 corn表达式
+   private String taskCorn;
+   //账户对象
+   private SysFlowStepAccountEntity account;
+    public Integer getStep() {
+        return step;
+    }
+
+    public void setStep(Integer step) {
+        this.step = step;
+    }
+
+    public String getStepType() {
+        return stepType;
+    }
+
+    public void setStepType(String stepType) {
+        this.stepType = stepType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getActionType() {
+        return actionType;
+    }
+
+    public void setActionType(String actionType) {
+        this.actionType = actionType;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getApiId() {
+        return apiId;
+    }
+
+    public void setApiId(String apiId) {
+        this.apiId = apiId;
+    }
+
+    public String getNifiAppId() {
+        return nifiAppId;
+    }
+
+    public void setNifiAppId(String nifiAppId) {
+        this.nifiAppId = nifiAppId;
+    }
+
+    public String getNifiApiId() {
+        return nifiApiId;
+    }
+
+    public void setNifiApiId(String nifiApiId) {
+        this.nifiApiId = nifiApiId;
+    }
+
+    public String getSortMode() {
+        return sortMode;
+    }
+
+    public void setSortMode(String sortMode) {
+        this.sortMode = sortMode;
+    }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public SysFlowStepAccountEntity getAccount() {
+        return account;
+    }
+
+    public void setAccount(SysFlowStepAccountEntity account) {
+        this.account = account;
+    }
+
+    public String getTaskCorn() {
+        return taskCorn;
+    }
+
+    public void setTaskCorn(String taskCorn) {
+        this.taskCorn = taskCorn;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepEntity.xml

@@ -0,0 +1,318 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowStepDaoImpl">
+
+    <resultMap id="get-SysFlowStepEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="step" column="step" jdbcType="INTEGER"/>
+        <result property="stepType" column="step_type" jdbcType="VARCHAR"/>
+        <result property="flowId" column="flow_id" jdbcType="VARCHAR"/>
+        <result property="description" column="description" jdbcType="VARCHAR"/>
+        <result property="apiName" column="api_name" jdbcType="VARCHAR"/>
+        <result property="actionType" column="action_type" jdbcType="VARCHAR"/>
+        <result property="appId" column="app_id" jdbcType="VARCHAR"/>
+        <result property="apiId" column="api_id" jdbcType="VARCHAR"/>
+        <result property="taskCorn" column="task_corn" jdbcType="VARCHAR"/>
+        <result property="nifiAppId" column="nifi_app_id" jdbcType="VARCHAR"/>
+        <result property="nifiApiId" column="nifi_api_id" jdbcType="VARCHAR"/>
+        <result property="sortMode" column="sort_mode" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="SysFlowStepEntity_Base_Column_List">
+        id,
+        create_user_id,
+        create_time,
+        modify_user_id,
+        modify_time,
+        sts,
+        step,
+        step_type,
+        flowId,
+        description,
+        api_name,
+        action_type,
+        app_id,
+        api_id,
+        taskCorn,
+        nifi_app_id,
+        nifi_api_id,
+        sort_mode
+    </sql>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-SysFlowStepEntity-result"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        select
+        <include refid="SysFlowStepEntity_Base_Column_List"/>
+        from sys_flow_step
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="step != null">and step = #{step}</if>
+            <if test="stepType != null and stepType != ''">and step_type = #{stepType}</if>
+            <if test="flowId != null and flowId != ''">and flow_id = #{flowId}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
+            <if test="actionType != null and actionType != ''">and action_type = #{actionType}</if>
+            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="apiId != null and apiId != ''">and api_id = #{apiId}</if>
+            <if test="nifiAppId != null and nifiAppId != ''">and nifi_app_id = #{nifiAppId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id = #{nifiApiId}</if>
+            <if test="sortMode != null and sortMode != ''">and sort_mode = #{sortMode}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer" parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        select count(1) from sys_flow_step
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="step != null">and step = #{step}</if>
+            <if test="stepType != null and stepType != ''">and step_type = #{stepType}</if>
+            <if test="flowId != null and flowId != ''">and flow_id = #{flowId}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
+            <if test="actionType != null and actionType != ''">and action_type = #{actionType}</if>
+            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="apiId != null and apiId != ''">and api_id = #{apiId}</if>
+            <if test="nifiAppId != null and nifiAppId != ''">and nifi_app_id = #{nifiAppId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id = #{nifiApiId}</if>
+            <if test="sortMode != null and sortMode != ''">and sort_mode = #{sortMode}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-SysFlowStepEntity-result"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        select
+        <include refid="SysFlowStepEntity_Base_Column_List"/>
+        from sys_flow_step
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="step != null">and step like concat('%',#{step},'%')</if>
+            <if test="stepType != null and stepType != ''">and step_type like concat('%',#{stepType},'%')</if>
+            <if test="flowId != null and flowId != ''">and flow_id like concat('%',#{flowId},'%')</if>
+            <if test="description != null and description != ''">and description like concat('%',#{description},'%')
+            </if>
+            <if test="apiName != null and apiName != ''">and api_name like concat('%',#{apiName},'%')</if>
+            <if test="actionType != null and actionType != ''">and action_type like concat('%',#{actionType},'%')</if>
+            <if test="appId != null and appId != ''">and app_id like concat('%',#{appId},'%')</if>
+            <if test="apiId != null and apiId != ''">and api_id like concat('%',#{apiId},'%')</if>
+            <if test="nifiAppId != null and nifiAppId != ''">and nifi_app_id like concat('%',#{nifiAppId},'%')</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id like concat('%',#{nifiApiId},'%')</if>
+            <if test="sortMode != null and sortMode != ''">and sort_mode like concat('%',#{sortMode},'%')</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="SysFlowStepentity_list_or" resultMap="get-SysFlowStepEntity-result"
+            parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        select
+        <include refid="SysFlowStepEntity_Base_Column_List"/>
+        from sys_flow_step
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="step != null">or step = #{step}</if>
+            <if test="stepType != null and stepType != ''">or step_type = #{stepType}</if>
+            <if test="flowId != null and flowId != ''">or flow_id = #{flowId}</if>
+            <if test="description != null and description != ''">or description = #{description}</if>
+            <if test="apiName != null and apiName != ''">or api_name = #{apiName}</if>
+            <if test="actionType != null and actionType != ''">or action_type = #{actionType}</if>
+            <if test="appId != null and appId != ''">or app_id = #{appId}</if>
+            <if test="apiId != null and apiId != ''">or api_id = #{apiId}</if>
+            <if test="nifiAppId != null and nifiAppId != ''">or nifi_app_id = #{nifiAppId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">or nifi_api_id = #{nifiApiId}</if>
+            <if test="sortMode != null and sortMode != ''">or sort_mode = #{sortMode}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert" parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into sys_flow_step(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="step != null">step ,</if>
+            <if test="stepType != null and stepType != ''">step_type ,</if>
+            <if test="flowId != null and flowId != ''">flow_id ,</if>
+            <if test="description != null and description != ''">description ,</if>
+            <if test="apiName != null and apiName != ''">api_name ,</if>
+            <if test="actionType != null and actionType != ''">action_type ,</if>
+            <if test="appId != null and appId != ''">app_id ,</if>
+            <if test="apiId != null and apiId != ''">api_id ,</if>
+            <if test="taskCorn != null and taskCorn != ''">task_corn ,</if>
+            <if test="nifiAppId != null and nifiAppId != ''">nifi_app_id ,</if>
+            <if test="nifiApiId != null and nifiApiId != ''">nifi_api_id ,</if>
+            <if test="sortMode != null and sortMode != ''">sort_mode ,</if>
+            <if test="sorts == null ">sorts,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="step != null">#{step} ,</if>
+            <if test="stepType != null and stepType != ''">#{stepType} ,</if>
+            <if test="flowId != null and flowId != ''">#{flowId} ,</if>
+            <if test="description != null and description != ''">#{description} ,</if>
+            <if test="apiName != null and apiName != ''">#{apiName} ,</if>
+            <if test="actionType != null and actionType != ''">#{actionType} ,</if>
+            <if test="appId != null and appId != ''">#{appId} ,</if>
+            <if test="apiId != null and apiId != ''">#{apiId} ,</if>
+            <if test="taskCorn != null and taskCorn != ''">#{taskCorn} ,</if>
+            <if test="nifiAppId != null and nifiAppId != ''">#{nifiAppId} ,</if>
+            <if test="nifiApiId != null and nifiApiId != ''">#{nifiApiId} ,</if>
+            <if test="sortMode != null and sortMode != ''">#{sortMode} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step a
+                WHERE a.sts = 'Y' ),1),
+            </if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sys_flow_step(create_user_id, create_time, modify_user_id, modify_time, sts, step,
+        step_type,flow_id, description, api_name, action_type, app_id, api_id, nifi_app_id, nifi_api_id, sort_mode, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.step},#{entity.stepType},#{entity.flowId},#{entity.description},#{entity.apiName},#{entity.actionType},#{entity.appId},#{entity.apiId},#{entity.nifiAppId},#{entity.nifiApiId},#{entity.sortMode},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sys_flow_step(create_user_id, create_time, modify_user_id, modify_time, sts, step, step_type,
+        flow_id,description, api_name, action_type, app_id, api_id, nifi_app_id, nifi_api_id, sort_mode)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.step},#{entity.stepType},#{entity.flowId},#{entity.description},#{entity.apiName},#{entity.actionType},#{entity.appId},#{entity.apiId},#{entity.nifiAppId},#{entity.nifiApiId},#{entity.sortMode})
+        </foreach>
+        on duplicate key update
+        create_user_id = values(create_user_id),
+        create_time = values(create_time),
+        modify_user_id = values(modify_user_id),
+        modify_time = values(modify_time),
+        sts = values(sts),
+        step = values(step),
+        step_type = values(step_type),
+        flow_id = values(flow_id),
+        description = values(description),
+        api_name = values(api_name),
+        action_type = values(action_type),
+        app_id = values(app_id),
+        api_id = values(api_id),
+        nifi_app_id = values(nifi_app_id),
+        nifi_api_id = values(nifi_api_id),
+        sort_mode = values(sort_mode)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update" parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        update sys_flow_step set
+        <trim suffix="" suffixOverrides=",">
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="step != null">step = #{step},</if>
+            <if test="stepType != null and stepType != ''">step_type = #{stepType},</if>
+            <if test="flowId != null and flowId != ''">flow_id = #{flowId},</if>
+            <if test="description != null and description != ''">description = #{description},</if>
+            <if test="apiName != null and apiName != ''">api_name = #{apiName},</if>
+            <if test="actionType != null and actionType != ''">action_type = #{actionType},</if>
+            <if test="appId != null and appId != ''">app_id = #{appId},</if>
+            <if test="apiId != null and apiId != ''">api_id = #{apiId},</if>
+            <if test="taskCorn != null and taskCorn != ''">task_corn = #{taskCorn},</if>
+            <if test="nifiAppId != null and nifiAppId != ''">nifi_app_id = #{nifiAppId},</if>
+            <if test="nifiApiId != null and nifiApiId != ''">nifi_api_id = #{nifiApiId},</if>
+            <if test="sortMode != null and sortMode != ''">sort_mode = #{sortMode},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete" parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        update sys_flow_step
+        set sts= 'N',
+            modify_time = #{modify_time},
+            modify_user_id = #{modify_user_id}
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition" parameterType="com.hzya.frame.sys.flow.entity.SysFlowStepEntity">
+        update sys_flow_step set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="step != null">and step = #{step}</if>
+            <if test="stepType != null and stepType != ''">and step_type = #{stepType}</if>
+            <if test="flowId != null and flowId != ''">and flow_id = #{flowId}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
+            <if test="actionType != null and actionType != ''">and action_type = #{actionType}</if>
+            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="apiId != null and apiId != ''">and api_id = #{apiId}</if>
+            <if test="taskCorn != null and taskCorn != ''">and task_corn = #{taskCorn}</if>
+            <if test="nifiAppId != null and nifiAppId != ''">and nifi_app_id = #{nifiAppId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id = #{nifiApiId}</if>
+            <if test="sortMode != null and sortMode != ''">and sort_mode = #{sortMode}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from sys_flow_step
+        where id = #{id}
+    </delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepRelationEntity.java

@@ -0,0 +1,76 @@
+package com.hzya.frame.sys.flow.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 步骤关联关系表(SysFlowStepRelation)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public class SysFlowStepRelationEntity extends BaseEntity {
+ 
+  /**  输入步骤 */
+   private String inputStepId;
+  /**  输出步骤 */
+   private String outputStepId;
+  /**  输入nifi app id */
+   private String inputNifiAppId;
+  /**  输出nifiidapp id */
+   private String outputNifiAppId;
+  /**  输入nifi api id */
+   private String inputNifiApiId;
+  /**  输出nifiidapi id */
+   private String outputNifiApiId;
+
+
+    public String getInputStepId() {
+        return inputStepId;
+    }
+
+    public void setInputStepId(String inputStepId) {
+        this.inputStepId = inputStepId;
+    }
+
+    public String getOutputStepId() {
+        return outputStepId;
+    }
+
+    public void setOutputStepId(String outputStepId) {
+        this.outputStepId = outputStepId;
+    }
+
+    public String getInputNifiAppId() {
+        return inputNifiAppId;
+    }
+
+    public void setInputNifiAppId(String inputNifiAppId) {
+        this.inputNifiAppId = inputNifiAppId;
+    }
+
+    public String getOutputNifiAppId() {
+        return outputNifiAppId;
+    }
+
+    public void setOutputNifiAppId(String outputNifiAppId) {
+        this.outputNifiAppId = outputNifiAppId;
+    }
+
+    public String getInputNifiApiId() {
+        return inputNifiApiId;
+    }
+
+    public void setInputNifiApiId(String inputNifiApiId) {
+        this.inputNifiApiId = inputNifiApiId;
+    }
+
+    public String getOutputNifiApiId() {
+        return outputNifiApiId;
+    }
+
+    public void setOutputNifiApiId(String outputNifiApiId) {
+        this.outputNifiApiId = outputNifiApiId;
+    }
+
+}
+

base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepRelationEntity.xml

@@ -0,0 +1,237 @@
+<?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.hzya.frame.sys.flow.dao.impl.SysFlowStepRelationDaoImpl">
+
+    <resultMap id="get-SysFlowStepRelationEntity-result" type="com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+           <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+           <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+           <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+           <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+           <result property="sts" column="sts" jdbcType="VARCHAR"/>
+           <result property="inputStepId" column="input_step_id" jdbcType="VARCHAR"/>
+           <result property="outputStepId" column="output_step_id" jdbcType="VARCHAR"/>
+           <result property="inputNifiAppId" column="input_nifi_app_id" jdbcType="VARCHAR"/>
+           <result property="outputNifiAppId" column="output_nifi_app_id" jdbcType="VARCHAR"/>
+           <result property="inputNifiApiId" column="input_nifi_api_id" jdbcType="VARCHAR"/>
+           <result property="outputNifiApiId" column="output_nifi_api_id" jdbcType="VARCHAR"/>
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "SysFlowStepRelationEntity_Base_Column_List">
+        id
+       ,create_user_id 
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,input_step_id 
+        ,output_step_id 
+        ,input_nifi_app_id 
+        ,output_nifi_app_id 
+        ,input_nifi_api_id 
+        ,output_nifi_api_id 
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-SysFlowStepRelationEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity">
+    select
+    <include refid="SysFlowStepRelationEntity_Base_Column_List" />
+    from sys_flow_step_relation
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="inputStepId != null and inputStepId != ''"> and input_step_id = #{inputStepId} </if>
+            <if test="outputStepId != null and outputStepId != ''"> and output_step_id = #{outputStepId} </if>
+            <if test="inputNifiAppId != null and inputNifiAppId != ''"> and input_nifi_app_id = #{inputNifiAppId} </if>
+            <if test="outputNifiAppId != null and outputNifiAppId != ''"> and output_nifi_app_id = #{outputNifiAppId} </if>
+            <if test="inputNifiApiId != null and inputNifiApiId != ''"> and input_nifi_api_id = #{inputNifiApiId} </if>
+            <if test="outputNifiApiId != null and outputNifiApiId != ''"> and output_nifi_api_id = #{outputNifiApiId} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+    
+<!-- 查询符合条件的数量 -->
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity">
+        select  count(1)   from sys_flow_step_relation
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
+            <if test="create_time != null"> and create_time = #{create_time} </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
+            <if test="modify_time != null"> and modify_time = #{modify_time} </if>
+            <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="inputStepId != null and inputStepId != ''"> and input_step_id = #{inputStepId} </if>
+            <if test="outputStepId != null and outputStepId != ''"> and output_step_id = #{outputStepId} </if>
+            <if test="inputNifiAppId != null and inputNifiAppId != ''"> and input_nifi_app_id = #{inputNifiAppId} </if>
+            <if test="outputNifiAppId != null and outputNifiAppId != ''"> and output_nifi_app_id = #{outputNifiAppId} </if>
+            <if test="inputNifiApiId != null and inputNifiApiId != ''"> and input_nifi_api_id = #{inputNifiApiId} </if>
+            <if test="outputNifiApiId != null and outputNifiApiId != ''"> and output_nifi_api_id = #{outputNifiApiId} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+<select id="entity_list_like" resultMap="get-SysFlowStepRelationEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity">
+    select
+    <include refid="SysFlowStepRelationEntity_Base_Column_List" />
+    from sys_flow_step_relation
+    <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
+            <if test="inputStepId != null and inputStepId != ''"> and input_step_id like concat('%',#{inputStepId},'%') </if>
+            <if test="outputStepId != null and outputStepId != ''"> and output_step_id like concat('%',#{outputStepId},'%') </if>
+            <if test="inputNifiAppId != null and inputNifiAppId != ''"> and input_nifi_app_id like concat('%',#{inputNifiAppId},'%') </if>
+            <if test="outputNifiAppId != null and outputNifiAppId != ''"> and output_nifi_app_id like concat('%',#{outputNifiAppId},'%') </if>
+            <if test="inputNifiApiId != null and inputNifiApiId != ''"> and input_nifi_api_id like concat('%',#{inputNifiApiId},'%') </if>
+            <if test="outputNifiApiId != null and outputNifiApiId != ''"> and output_nifi_api_id like concat('%',#{outputNifiApiId},'%') </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!-- 查询列表 字段采用or格式 -->
+<select id="SysFlowStepRelationentity_list_or" resultMap="get-SysFlowStepRelationEntity-result" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity">
+    select
+    <include refid="SysFlowStepRelationEntity_Base_Column_List" />
+    from sys_flow_step_relation
+    <trim prefix="where" prefixOverrides="and"> 
+         <if test="id != null and id != ''"> or id = #{id} </if>
+             <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
+              <if test="create_time != null"> or create_time = #{create_time} </if>
+              <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
+              <if test="modify_time != null"> or modify_time = #{modify_time} </if>
+              <if test="sts != null and sts != ''"> or sts = #{sts} </if>
+             <if test="inputStepId != null and inputStepId != ''"> or input_step_id = #{inputStepId} </if>
+             <if test="outputStepId != null and outputStepId != ''"> or output_step_id = #{outputStepId} </if>
+             <if test="inputNifiAppId != null and inputNifiAppId != ''"> or input_nifi_app_id = #{inputNifiAppId} </if>
+             <if test="outputNifiAppId != null and outputNifiAppId != ''"> or output_nifi_app_id = #{outputNifiAppId} </if>
+             <if test="inputNifiApiId != null and inputNifiApiId != ''"> or input_nifi_api_id = #{inputNifiApiId} </if>
+             <if test="outputNifiApiId != null and outputNifiApiId != ''"> or output_nifi_api_id = #{outputNifiApiId} </if>
+            and sts='Y'
+    </trim>
+    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
+    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+</select>
+
+<!--新增所有列-->
+<insert id="entity_insert" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_relation(
+  <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> id , </if>
+            <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
+            <if test="create_time != null"> create_time , </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
+            <if test="modify_time != null"> modify_time , </if>
+            <if test="sts != null and sts != ''"> sts , </if>
+            <if test="inputStepId != null and inputStepId != ''"> input_step_id , </if>
+            <if test="outputStepId != null and outputStepId != ''"> output_step_id , </if>
+            <if test="inputNifiAppId != null and inputNifiAppId != ''"> input_nifi_app_id , </if>
+            <if test="outputNifiAppId != null and outputNifiAppId != ''"> output_nifi_app_id , </if>
+            <if test="inputNifiApiId != null and inputNifiApiId != ''"> input_nifi_api_id , </if>
+            <if test="outputNifiApiId != null and outputNifiApiId != ''"> output_nifi_api_id , </if>
+            <if test="sorts == null ">sorts,</if>
+    <if test="sts == null ">sts,</if>
+  </trim>
+  )values(
+ <trim suffix="" suffixOverrides=",">
+       <if test="id != null and id != ''"> #{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
+            <if test="create_time != null"> #{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
+            <if test="modify_time != null"> #{modify_time} ,</if>
+            <if test="sts != null and sts != ''"> #{sts} ,</if>
+            <if test="inputStepId != null and inputStepId != ''"> #{inputStepId} ,</if>
+            <if test="outputStepId != null and outputStepId != ''"> #{outputStepId} ,</if>
+            <if test="inputNifiAppId != null and inputNifiAppId != ''"> #{inputNifiAppId} ,</if>
+            <if test="outputNifiAppId != null and outputNifiAppId != ''"> #{outputNifiAppId} ,</if>
+            <if test="inputNifiApiId != null and inputNifiApiId != ''"> #{inputNifiApiId} ,</if>
+            <if test="outputNifiApiId != null and outputNifiApiId != ''"> #{outputNifiApiId} ,</if>
+            <if test="sorts == null ">COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_relation a WHERE a.sts = 'Y' ),1),</if>
+    <if test="sts == null ">'Y',</if>
+  </trim>
+  )  
+</insert>
+<!-- 批量新增 -->
+<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+  insert into sys_flow_step_relation(create_user_id, create_time, modify_user_id, modify_time, sts, input_step_id, output_step_id, input_nifi_app_id, output_nifi_app_id, input_nifi_api_id, output_nifi_api_id,  sts) 
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.inputStepId},#{entity.outputStepId},#{entity.inputNifiAppId},#{entity.outputNifiAppId},#{entity.inputNifiApiId},#{entity.outputNifiApiId}, 'Y')
+    </foreach>
+</insert>
+<!-- 批量新增或者修改-->
+<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into sys_flow_step_relation(create_user_id, create_time, modify_user_id, modify_time, sts, input_step_id, output_step_id, input_nifi_app_id, output_nifi_app_id, input_nifi_api_id, output_nifi_api_id)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+    (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.inputStepId},#{entity.outputStepId},#{entity.inputNifiAppId},#{entity.outputNifiAppId},#{entity.inputNifiApiId},#{entity.outputNifiApiId})
+    </foreach>
+    on duplicate key update
+    create_user_id = values(create_user_id),
+    create_time = values(create_time),
+    modify_user_id = values(modify_user_id),
+    modify_time = values(modify_time),
+    sts = values(sts),
+    input_step_id = values(input_step_id),
+    output_step_id = values(output_step_id),
+    input_nifi_app_id = values(input_nifi_app_id),
+    output_nifi_app_id = values(output_nifi_app_id),
+    input_nifi_api_id = values(input_nifi_api_id),
+    output_nifi_api_id = values(output_nifi_api_id)</insert>
+<!--通过主键修改方法-->
+<update id="entity_update" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity" >
+update sys_flow_step_relation  set
+<trim suffix="" suffixOverrides=",">
+  <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
+    <if test="create_time != null"> create_time = #{create_time},</if>
+    <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
+    <if test="modify_time != null"> modify_time = #{modify_time},</if>
+    <if test="sts != null and sts != ''"> sts = #{sts},</if>
+  <if test="inputStepId != null and inputStepId != ''"> input_step_id = #{inputStepId},</if>
+  <if test="outputStepId != null and outputStepId != ''"> output_step_id = #{outputStepId},</if>
+  <if test="inputNifiAppId != null and inputNifiAppId != ''"> input_nifi_app_id = #{inputNifiAppId},</if>
+  <if test="outputNifiAppId != null and outputNifiAppId != ''"> output_nifi_app_id = #{outputNifiAppId},</if>
+  <if test="inputNifiApiId != null and inputNifiApiId != ''"> input_nifi_api_id = #{inputNifiApiId},</if>
+  <if test="outputNifiApiId != null and outputNifiApiId != ''"> output_nifi_api_id = #{outputNifiApiId},</if>
+</trim>
+where id = #{id}
+</update>
+<!-- 逻辑删除 -->
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity" >
+update sys_flow_step_relation  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+where id = #{id}
+</update>
+<!-- 多条件逻辑删除 -->
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity" >
+update sys_flow_step_relation  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and"> 
+        <if test="id != null and id != ''"> and id = #{id} </if>
+                                                                <if test="sts != null and sts != ''"> and sts = #{sts} </if>
+            <if test="inputStepId != null and inputStepId != ''"> and input_step_id = #{inputStepId} </if>
+            <if test="outputStepId != null and outputStepId != ''"> and output_step_id = #{outputStepId} </if>
+            <if test="inputNifiAppId != null and inputNifiAppId != ''"> and input_nifi_app_id = #{inputNifiAppId} </if>
+            <if test="outputNifiAppId != null and outputNifiAppId != ''"> and output_nifi_app_id = #{outputNifiAppId} </if>
+            <if test="inputNifiApiId != null and inputNifiApiId != ''"> and input_nifi_api_id = #{inputNifiApiId} </if>
+            <if test="outputNifiApiId != null and outputNifiApiId != ''"> and output_nifi_api_id = #{outputNifiApiId} </if>
+            and sts='Y'
+    </trim>
+</update>
+<!--通过主键删除-->
+<delete id="entity_delete">
+    delete from sys_flow_step_relation where id = #{id}
+</delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowClassRuleService.java

@@ -0,0 +1,57 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 流程分类权限表(SysFlowClassRule)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowClassRuleService extends IBaseService<SysFlowClassRuleEntity, String>{
+
+    /**
+     * 新增流程分类权限
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveFlowClassRule(JSONObject object);
+
+    /**
+     * 修改流程分类权限
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateFlowClassRule(JSONObject object);
+
+    /**
+     * 删除流程分类权限
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteFlowClassRule(JSONObject object);
+
+    /**
+     * 列表查询
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryRuleList(JSONObject object);
+
+    /**
+     * 分页查询
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryRulePagedInfo(JSONObject object);
+
+    /**
+     * 查询待分配权限的用户列表
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryUserList(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowClassService.java

@@ -0,0 +1,42 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowClassEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 流程分类;对应数环通项目分类(SysFlowClass)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowClassService extends IBaseService<SysFlowClassEntity, String>{
+
+    /**
+     * 根据Id查询
+     * @param object
+     * @return
+     */
+    JsonResultEntity getFlowClass(JSONObject object);
+    /**
+     * 新增流程分类
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveFlowClass(JSONObject object);
+
+    /**
+     * 修改流程分类
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateFlowClass(JSONObject object);
+
+    /**
+     * 删除流程分类
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteFlowClass(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowNifiConstantService.java

@@ -0,0 +1,43 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * nifi常量(SysFlowNifiConstant)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowNifiConstantService extends IBaseService<SysFlowNifiConstantEntity, String>{
+
+    /**
+     * 详情
+     * @param object
+     * @return
+     */
+    JsonResultEntity getNifiConstant(JSONObject object);
+
+    /**
+     * 保存nifi常量
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveNifiConstant(JSONObject object);
+
+    /**
+     * 更新nifi常量
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateNifiConstant(JSONObject object);
+
+    /**
+     * 更新nifi常量
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteNifiConstant(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowService.java

@@ -0,0 +1,49 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 流程主表;流程就是数环通的Linkup(SysFlow)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:24
+ */
+public interface ISysFlowService extends IBaseService<SysFlowEntity, String>{
+    /**
+     * 保存流程主表
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveFlow(JSONObject object);
+
+    /**
+     * 更新流程主表
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateFlow(JSONObject object);
+
+    /**
+     * 删除流程主表
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteFlow(JSONObject object);
+
+    /**
+     * 列表查询
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryFlowList(JSONObject object);
+
+    /**
+     * 分页查询
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryFlowPagedInfo(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowStepAccountService.java

@@ -0,0 +1,64 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 流程步骤账户表(SysFlowStepAccount)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepAccountService extends IBaseService<SysFlowStepAccountEntity, String>{
+
+    /**
+     * 保存账户信息
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveAccount(JSONObject object);
+
+    /**
+     * 更新账户信息
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateAccount(JSONObject object);
+
+    /**
+     * 删除账户信息
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteAccount(JSONObject object);
+
+    /**
+     * 查询账户详情
+     * @param object
+     * @return
+     */
+    JsonResultEntity getAccount(JSONObject object);
+
+    /**
+     * 查询账户列表数据
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryAccountList(JSONObject object);
+
+    /**
+     * 查询账户分页数据
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryAccountPaged(JSONObject object);
+
+    /**
+     * 验证数据库账户
+     * @param object
+     * @return
+     */
+    JsonResultEntity verifyDataBase(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowStepConfigBService.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 映射信息表体(SysFlowStepConfigB)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepConfigBService extends IBaseService<SysFlowStepConfigBEntity, String>{
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowStepConfigService.java

@@ -0,0 +1,22 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 映射信息主表(SysFlowStepConfig)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepConfigService extends IBaseService<SysFlowStepConfigEntity, String>{
+
+    /**
+     * 测试sql
+     * @param object
+     * @return
+     */
+    JsonResultEntity testSql(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowStepRelationService.java

@@ -0,0 +1,12 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 步骤关联关系表(SysFlowStepRelation)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+public interface ISysFlowStepRelationService extends IBaseService<SysFlowStepRelationEntity, String>{
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowStepService.java

@@ -0,0 +1,50 @@
+package com.hzya.frame.sys.flow.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowStepEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 流程步骤信息(SysFlowStep)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+public interface ISysFlowStepService extends IBaseService<SysFlowStepEntity, String>{
+
+    /**
+     * 保存流程步骤
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveFlowStep(JSONObject object);
+
+    /**
+     * 更新流程步骤
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateFlowStep(JSONObject object);
+
+    /**
+     * 删除流程步骤
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteFlowStep(JSONObject object);
+
+
+    /**
+     * 查询列表
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryList(JSONObject object);
+    /**
+     * 步骤详情
+     * @param object
+     * @return
+     */
+    JsonResultEntity getFlowStep(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassRuleServiceImpl.java

@@ -0,0 +1,193 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowClassRuleDao;
+import com.hzya.frame.sys.flow.service.ISysFlowClassRuleService;
+import com.hzya.frame.sysnew.user.dao.ISysUserDao;
+import com.hzya.frame.sysnew.user.entity.SysUserEntity;
+import com.hzya.frame.uuid.UUIDUtils;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 流程分类权限表(SysFlowClassRule)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Service(value = "sysFlowClassRuleService")
+public class SysFlowClassRuleServiceImpl extends BaseService<SysFlowClassRuleEntity, String> implements ISysFlowClassRuleService {
+     
+    private ISysFlowClassRuleDao sysFlowClassRuleDao;
+	@Autowired
+	private ISysUserDao sysUserDao;
+    @Autowired
+	public void setSysFlowClassRuleDao(ISysFlowClassRuleDao dao) {
+		this.sysFlowClassRuleDao = dao;
+		this.dao = dao;
+	}
+
+
+	/**
+	 * 新增流程分类权限
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity saveFlowClassRule(JSONObject object) {
+		SysFlowClassRuleEntity ruleEntity = getData("jsonStr",object,SysFlowClassRuleEntity.class);
+		try {
+			this.checkParams(ruleEntity,"save");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		addRule(ruleEntity);
+		return BaseResult.getSuccessMessageEntity("保存成功");
+	}
+
+	//保存
+	private void addRule(SysFlowClassRuleEntity ruleEntity) {
+		List<SysFlowClassRuleEntity> ruleList = ruleEntity.getRuleList();
+		for (SysFlowClassRuleEntity r : ruleList) {
+			r.setId(UUIDUtils.getUUID());
+			r.setCreate_time(Convert.toDate(ruleEntity.getCreate_time(),ruleEntity.getModify_time()));
+			r.setCreate_user_id(Convert.toStr(ruleEntity.getCreate_user_id(),ruleEntity.getModify_user_id()));
+			r.setModify_time(r.getCreate_time());
+			r.setModify_user_id(r.getCreate_user_id());
+			r.setFlowClassId(ruleEntity.getFlowClassId());
+			sysFlowClassRuleDao.save(r);
+		}
+	}
+
+	/**
+	 * 修改流程分类权限
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity updateFlowClassRule(JSONObject object) {
+		SysFlowClassRuleEntity ruleEntity = getData("jsonStr",object,SysFlowClassRuleEntity.class);
+		try {
+			this.checkParams(ruleEntity,"update");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		//先删除 再重新保存
+		SysFlowClassRuleEntity rule = new SysFlowClassRuleEntity();
+		rule.setFlowClassId(ruleEntity.getFlowClassId());
+		sysFlowClassRuleDao.logicRemoveMultiCondition(rule);
+		addRule(ruleEntity);
+		return BaseResult.getSuccessMessageEntity("更新成功");
+	}
+
+	/**
+	 * 删除流程分类权限
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity deleteFlowClassRule(JSONObject object) {
+		SysFlowClassRuleEntity ruleEntity = getData("jsonStr",object,SysFlowClassRuleEntity.class);
+		try {
+			this.checkParams(ruleEntity,"delete");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		SysFlowClassRuleEntity deleteRuleEntity = new SysFlowClassRuleEntity();
+		deleteRuleEntity.setFlowClassId(ruleEntity.getFlowClassId());
+		deleteRuleEntity.setUserId(ruleEntity.getUserId());
+		sysFlowClassRuleDao.logicRemoveMultiCondition(deleteRuleEntity);
+		return BaseResult.getSuccessMessageEntity("删除成功");
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryRuleList(JSONObject object) {
+		SysFlowClassRuleEntity ruleEntity = getData("jsonStr",object,SysFlowClassRuleEntity.class);
+		try {
+			checkParams(ruleEntity,"queryList");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		List<SysFlowClassRuleEntity> sysFlowClassRuleEntities = sysFlowClassRuleDao.queryByLike(ruleEntity);
+		SysFlowClassRuleEntity reuslt = new SysFlowClassRuleEntity();
+		reuslt.setFlowClassId(ruleEntity.getFlowClassId());
+		reuslt.setRuleList(sysFlowClassRuleEntities);
+		return BaseResult.getSuccessMessageEntity("查询数据成功",reuslt);
+	}
+
+	/**
+	 * 分页查询
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryRulePagedInfo(JSONObject object) {
+		SysFlowClassRuleEntity ruleEntity = getData("jsonStr",object,SysFlowClassRuleEntity.class);
+		try {
+			checkParams(ruleEntity,"queryPaged");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		PageHelper.startPage(ruleEntity.getPageNum(), ruleEntity.getPageSize());
+		List<SysFlowClassRuleEntity> queryByLike = this.dao.queryByLike(ruleEntity);
+		PageInfo pageInfo = new PageInfo(queryByLike);
+		return BaseResult.getSuccessMessageEntity("查询数据成功",pageInfo);
+	}
+	/**
+	 * 查询待分配权限的用户列表
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryUserList(JSONObject object) {
+		SysUserEntity userEntity = getData("jsonStr",object,SysUserEntity.class);
+		if (StrUtil.isEmpty(userEntity.getFlowClassId())){
+			return BaseResult.getFailureMessageEntity("flowClassId不能为空");
+		}
+		List<SysUserEntity> sysUserEntities = sysUserDao.queryList(userEntity, "com.hzya.frame.sysnew.user.dao.impl.SysUserDaoImpl.entity_list_notin_sys_flowClass");
+		return BaseResult.getSuccessMessageEntity("查询成功",sysUserEntities);
+	}
+	/**
+	 * 检查参数
+	 * @param entity 参数对象
+	 * @param type 操作；类型
+	 */
+	private void checkParams(SysFlowClassRuleEntity entity,String type){
+		Assert.notNull(entity,"请求参数不能为空");
+		Assert.notEmpty(entity.getFlowClassId(),"flowClassId不能为空");
+		if ("save".equals(type)){
+			Assert.notEmpty(entity.getRuleList(),"ruleList不能为空");
+		}else if ("update".equals(type)){
+			Assert.notEmpty(entity.getRuleList(),"ruleList不能为空");
+		}else if ("delete".equals(type)){
+
+		}else if ("queryPaged".equals(type)){
+			Assert.notNull(entity.getPageNum(),"pageNum不能为空");
+			Assert.notNull(entity.getPageSize(),"pageSize不能为空");
+		}
+
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassServiceImpl.java

@@ -0,0 +1,179 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.dictionaryshopNew.service.ISysDictionaryshopNewService;
+import com.hzya.frame.sys.flow.dao.ISysFlowClassRuleDao;
+import com.hzya.frame.sys.flow.dao.ISysFlowDao;
+import com.hzya.frame.sys.flow.entity.SysFlowClassEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowClassDao;
+import com.hzya.frame.sys.flow.entity.SysFlowClassRuleEntity;
+import com.hzya.frame.sys.flow.entity.SysFlowEntity;
+import com.hzya.frame.sys.flow.service.ISysFlowClassService;
+import com.hzya.frame.sysnew.user.dao.ISysUserDao;
+import com.hzya.frame.sysnew.user.entity.SysUserEntity;
+import com.hzya.frame.uuid.UUIDLong;
+import com.hzya.frame.uuid.UUIDUtils;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.web.exception.BaseSystemException;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 流程分类;对应数环通项目分类(SysFlowClass)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Service(value = "sysFlowClassService")
+public class SysFlowClassServiceImpl extends BaseService<SysFlowClassEntity, String> implements ISysFlowClassService {
+     
+    private ISysFlowClassDao sysFlowClassDao;
+	@Autowired
+	private ISysFlowDao sysFlowDao;
+	@Autowired
+	private ISysFlowClassRuleDao flowClassRuleDao;
+	@Autowired
+	private ISysUserDao sysUserDao;
+    @Autowired
+	public void setSysFlowClassDao(ISysFlowClassDao dao) {
+		this.sysFlowClassDao = dao;
+		this.dao = dao;
+	}
+
+	/**
+	 * 根据Id查询
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity getFlowClass(JSONObject object) {
+		SysFlowClassEntity flowClass = getData("jsonStr",object,SysFlowClassEntity.class);
+		try {
+			this.checkParams(flowClass,"get");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		SysFlowClassEntity sysFlowClassEntity = sysFlowClassDao.queryOne(flowClass);
+		return BaseResult.getSuccessMessageEntity("查询详情成功",sysFlowClassEntity);
+	}
+
+	/**
+	 * 新增流程分类
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity saveFlowClass(JSONObject object) {
+		SysFlowClassEntity flowClass = getData("jsonStr",object,SysFlowClassEntity.class);
+		try {
+			this.checkParams(flowClass,"add");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		flowClass.setId(UUIDUtils.getUUID());
+		sysFlowClassDao.save(flowClass);
+		//给创建分类的用户保存一下权限
+		SysUserEntity sysUserEntity = sysUserDao.get(flowClass.getCreate_user_id());
+		SysFlowClassRuleEntity ruleEntity = new SysFlowClassRuleEntity();
+		ruleEntity.setFlowClassId(flowClass.getId());
+		ruleEntity.setUserId(flowClass.getCreate_user_id());
+		if (null != sysUserEntity){
+			ruleEntity.setUserName(sysUserEntity.getPersonName());
+			ruleEntity.setUserCode(sysUserEntity.getPersonCode());
+		}
+		ruleEntity.setCreate_time(new Date());
+		ruleEntity.setModify_time(new Date());
+		ruleEntity.setCreate_user_id(flowClass.getCreate_user_id());
+		ruleEntity.setModify_user_id(flowClass.getModify_user_id());
+		ruleEntity.setId(UUIDUtils.getUUID());
+		flowClassRuleDao.save(ruleEntity);
+		return BaseResult.getSuccessMessageEntity("新增成功");
+	}
+
+	/**
+	 * 修改流程分类
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity updateFlowClass(JSONObject object) {
+		SysFlowClassEntity flowClass = getData("jsonStr",object,SysFlowClassEntity.class);
+		try {
+			this.checkParams(flowClass,"update");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowClassDao.update(flowClass);
+		return BaseResult.getSuccessMessageEntity("更新成功");
+	}
+
+	/**
+	 * 删除流程分类
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity deleteFlowClass(JSONObject object) {
+		SysFlowClassEntity flowClass = getData("jsonStr",object,SysFlowClassEntity.class);
+		try {
+			this.checkParams(flowClass,"delete");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowClassDao.logicRemove(flowClass);
+		return BaseResult.getSuccessMessageEntity("删除成功");
+	}
+	/**
+	 * 参数检查
+	 * @param flowClass
+	 * @param type
+	 */
+	private  void checkParams(SysFlowClassEntity flowClass,String type){
+		Assert.notNull(flowClass,"请求参数不能为空");
+		if ("add".equals(type)){//新增
+			Assert.notEmpty(flowClass.getName(),"名称不能为空");
+			//查询是否有同名的
+			SysFlowClassEntity flowQuery = new SysFlowClassEntity();
+			flowQuery.setName(flowClass.getName());
+			List<SysFlowClassEntity> query = sysFlowClassDao.query(flowQuery);
+			if (CollectionUtils.isNotEmpty(query)){
+				throw new BaseSystemException(flowClass.getName()+"已存在");
+			}
+		}else if ("update".equals(type)){//更新
+			Assert.notEmpty(flowClass.getId(),"id不能为空");
+			//查一下有没有同名的
+			SysFlowClassEntity flowQuery = new SysFlowClassEntity();
+			flowQuery.setName(flowClass.getName());
+			List<SysFlowClassEntity> query = sysFlowClassDao.query(flowQuery);
+			if (CollectionUtils.isNotEmpty(query)){
+				for (SysFlowClassEntity f : query) {
+					if (!f.getId().equals(flowClass.getId())){
+						throw new BaseSystemException(flowClass.getName()+"已存在");
+					}
+				}
+			}
+		}else if ("delete".equals(type)){//删除
+			Assert.notEmpty(flowClass.getId(),"id不能为空");
+			//查一下这个分类有没有被引用
+			SysFlowEntity sysFlowEntity = new SysFlowEntity();
+			sysFlowEntity.setClassId(flowClass.getId());
+			List<SysFlowEntity> query = sysFlowDao.query(sysFlowEntity);
+			if (CollectionUtils.isNotEmpty(query)){
+				throw new BaseSystemException("该分类已被引用，删除失败");
+			}
+		}else if ("get".equals(type)){//查询详情
+			Assert.notEmpty(flowClass.getId(),"id不能为空");
+		}
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowNifiConstantServiceImpl.java

@@ -0,0 +1,155 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowNifiConstantEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowNifiConstantDao;
+import com.hzya.frame.sys.flow.service.ISysFlowNifiConstantService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.web.exception.BaseSystemException;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * nifi常量(SysFlowNifiConstant)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Service(value = "sysFlowNifiConstantService")
+public class SysFlowNifiConstantServiceImpl extends BaseService<SysFlowNifiConstantEntity, String> implements ISysFlowNifiConstantService {
+     
+    private ISysFlowNifiConstantDao sysFlowNifiConstantDao;
+    
+    @Autowired
+	public void setSysFlowNifiConstantDao(ISysFlowNifiConstantDao dao) {
+		this.sysFlowNifiConstantDao = dao;
+		this.dao = dao;
+	}
+
+	/**
+	 * 详情
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity getNifiConstant(JSONObject object) {
+		SysFlowNifiConstantEntity sysFlowNifiConstantEntity = null;
+		try {
+			sysFlowNifiConstantEntity = preCheck(object,"get");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		SysFlowNifiConstantEntity nifiConstant = sysFlowNifiConstantDao.queryOne(sysFlowNifiConstantEntity);
+		return BaseResult.getSuccessMessageEntity("查询详情成功",nifiConstant);
+	}
+
+	/**
+	 * 保存nifi常量
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity saveNifiConstant(JSONObject object) {
+		SysFlowNifiConstantEntity sysFlowNifiConstantEntity = null;
+		try {
+			sysFlowNifiConstantEntity = preCheck(object,"save");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowNifiConstantDao.save(sysFlowNifiConstantEntity);
+		return BaseResult.getSuccessMessageEntity("保存成功");
+	}
+
+	/**
+	 * 更新nifi常量
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity updateNifiConstant(JSONObject object) {
+		SysFlowNifiConstantEntity sysFlowNifiConstantEntity = null;
+		try {
+			sysFlowNifiConstantEntity = preCheck(object,"update");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowNifiConstantDao.update(sysFlowNifiConstantEntity);
+		return BaseResult.getSuccessMessageEntity("更新成功");
+	}
+
+	/**
+	 * 更新nifi常量
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity deleteNifiConstant(JSONObject object) {
+		SysFlowNifiConstantEntity sysFlowNifiConstantEntity = null;
+		try {
+			sysFlowNifiConstantEntity = preCheck(object,"delete");
+		}catch(Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowNifiConstantDao.logicRemove(sysFlowNifiConstantEntity);
+		return BaseResult.getSuccessMessageEntity("删除成功");
+	}
+
+
+	/**
+	 * 参数校验
+	 * @param entity
+	 * @param type
+	 */
+	private void checkParams(SysFlowNifiConstantEntity entity,String type){
+		Assert.notNull(entity,"请求参数不能为空");
+		if ("save".equals(type)){
+			Assert.notEmpty(entity.getNifiKey(),"nifiKey不能为空");
+			Assert.notEmpty(entity.getNifiValue(),"nifiValue不能为空");
+			//检查是否有重名的key
+			SysFlowNifiConstantEntity nifi = new SysFlowNifiConstantEntity();
+			nifi.setNifiKey(entity.getNifiKey());
+			List<SysFlowNifiConstantEntity> query = sysFlowNifiConstantDao.query(nifi);
+			if (CollectionUtils.isNotEmpty(query)){
+				throw new BaseSystemException(nifi.getNifiKey()+"重复");
+			}
+		}else if ("update".equals(type)){
+			Assert.notEmpty(entity.getId(),"id不能为空");
+			Assert.notEmpty(entity.getNifiKey(),"key不能为空");
+			Assert.notEmpty(entity.getNifiValue(),"value不能为空");
+			SysFlowNifiConstantEntity nifi = new SysFlowNifiConstantEntity();
+			nifi.setNifiKey(entity.getNifiKey());
+			List<SysFlowNifiConstantEntity> query = sysFlowNifiConstantDao.query(nifi);
+			if (CollectionUtils.isNotEmpty(query)){
+				for (SysFlowNifiConstantEntity n : query) {
+					if (!n.getId().equals(entity.getId())){
+						throw new BaseSystemException(entity.getNifiKey()+"重复");
+					}
+				}
+			}
+		}else if ("delete".equals(type)){
+			Assert.notEmpty(entity.getId(),"id不能为空");
+		}else if ("get".equals(type)){
+			Assert.notEmpty(entity.getId(),"id不能为空");
+		}
+	}
+
+	//前置操作
+	private SysFlowNifiConstantEntity preCheck(JSONObject object,String type){
+		SysFlowNifiConstantEntity entity = getData("jsonStr", object,SysFlowNifiConstantEntity.class);
+		checkParams(entity,type);
+		return entity;
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowServiceImpl.java

@@ -0,0 +1,190 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hzya.frame.sys.dictionaryshopNew.entity.SysDictionaryshopNew;
+import com.hzya.frame.sys.dictionaryshopNew.service.ISysDictionaryshopNewService;
+import com.hzya.frame.sys.flow.entity.SysFlowEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowDao;
+import com.hzya.frame.sys.flow.service.ISysFlowService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.web.exception.BaseSystemException;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 流程主表;流程就是数环通的Linkup(SysFlow)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:26
+ */
+@Service(value = "sysFlowService")
+public class SysFlowServiceImpl extends BaseService<SysFlowEntity, String> implements ISysFlowService {
+     
+    private ISysFlowDao sysFlowDao;
+	@Autowired
+	private ISysDictionaryshopNewService sysDictionaryshopNewService;
+    @Autowired
+	public void setSysFlowDao(ISysFlowDao dao) {
+		this.sysFlowDao = dao;
+		this.dao = dao;
+	}
+
+	/**
+	 * 保存流程主表
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity saveFlow(JSONObject object) {
+		SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class);
+		try {
+			checkParams(flowEntity,"save");
+		} catch (Exception e) {
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowDao.save(flowEntity);
+		return BaseResult.getSuccessMessageEntity("保存成功",flowEntity);
+	}
+
+	/**
+	 * 更新流程主表
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity updateFlow(JSONObject object) {
+		SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class);
+		try {
+			checkParams(flowEntity,"update");
+		} catch (Exception e) {
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysFlowDao.update(flowEntity);
+		return BaseResult.getSuccessMessageEntity("更新成功");
+	}
+
+	/**
+	 * 删除流程主表
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity deleteFlow(JSONObject object) {
+		SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class);
+		try {
+			checkParams(flowEntity,"delete");
+		} catch (Exception e) {
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		//删除主表
+		sysFlowDao.logicRemove(flowEntity);
+		//删除子表
+		return BaseResult.getSuccessMessageEntity("删除成功");
+	}
+
+	/**
+	 * 列表查询
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryFlowList(JSONObject object) {
+		SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class);
+		try {
+			checkParams(flowEntity,"queryList");
+		} catch (Exception e) {
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		List<SysFlowEntity> list = sysFlowDao.query(flowEntity);
+		if (CollectionUtils.isNotEmpty(list)){
+			for (SysFlowEntity sysFlowEntity : list) {
+				transferDictionary(sysFlowEntity);
+			}
+		}
+		return BaseResult.getSuccessMessageEntity("查询数据成功",list);
+	}
+
+	/**
+	 * 分页查询
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryFlowPagedInfo(JSONObject object) {
+		SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class);
+		try {
+			checkParams(flowEntity,"queryPaged");
+		} catch (Exception e) {
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		PageHelper.startPage(flowEntity.getPageNum(),flowEntity.getPageSize());
+		List<SysFlowEntity> queryByLike = sysFlowDao.queryByLike(flowEntity);
+		if (CollectionUtils.isNotEmpty(queryByLike)){
+			for (SysFlowEntity sysFlowEntity : queryByLike) {
+				transferDictionary(sysFlowEntity);
+			}
+		}
+		PageInfo pageInfo = new PageInfo(queryByLike);
+		return BaseResult.getSuccessMessageEntity("pageInfo",pageInfo);
+	}
+
+	/**
+	 * 参数检查
+	 * @param entity
+	 * @param type
+	 */
+	private void checkParams(SysFlowEntity entity,String type){
+		Assert.notNull(entity,"请求参数不能为空");
+		if ("save".equals(type)){
+			Assert.notEmpty(entity.getClassId(),"classId不能为空");
+			Assert.notEmpty(entity.getName(),"name不能为空");
+			SysFlowEntity flow = new SysFlowEntity();
+			flow.setName(entity.getName());
+			List<SysFlowEntity> flowList = sysFlowDao.query(flow);
+			if (CollectionUtils.isNotEmpty(flowList)){
+				throw new BaseSystemException(entity.getName()+"重复");
+			}
+		}else if("update".equals(type)){
+			Assert.notEmpty(entity.getId(),"Id不能为空");
+			SysFlowEntity flow = new SysFlowEntity();
+			flow.setName(entity.getName());
+			List<SysFlowEntity> flowList = sysFlowDao.query(flow);
+			if (CollectionUtils.isNotEmpty(flowList)){
+				for (SysFlowEntity sysFlowEntity : flowList) {
+					if (!sysFlowEntity.getId().equals(entity.getId())){
+						throw new BaseSystemException(entity.getName()+"重复");
+					}
+				}
+			}
+		}else if ("delete".equals(type)){
+			Assert.notEmpty(entity.getId(),"Id不能为空");
+
+		}else if ("queryPaged".equals(type)){
+			Assert.notNull(entity.getPageNum(),"pageNum不能为空");
+			Assert.notNull(entity.getPageSize(),"pageSize不能为空");
+		}
+	}
+
+	private void transferDictionary(SysFlowEntity sysFlowEntity){
+		if (null != sysFlowEntity){
+			SysDictionaryshopNew dictionaryshopByValue = sysDictionaryshopNewService.getDictionaryshopByValue("sys_flow", "trigger_mode_id", sysFlowEntity.getTriggerModeId());
+			if (null != dictionaryshopByValue){
+				sysFlowEntity.setTriggerModeName(dictionaryshopByValue.getColumnContent());
+			}
+		}
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepAccountServiceImpl.java

@@ -0,0 +1,284 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.datasource.DataSourceUtilProperties;
+import com.hzya.frame.serviceUtil.DsDataSourceUtil;
+import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepAccountDao;
+import com.hzya.frame.sys.flow.service.ISysFlowStepAccountService;
+import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
+import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.web.exception.BaseSystemException;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.Resource;
+
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.List;
+
+/**
+ * 流程步骤账户表(SysFlowStepAccount)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Service(value = "sysFlowStepAccountService")
+public class SysFlowStepAccountServiceImpl extends BaseService<SysFlowStepAccountEntity, String> implements ISysFlowStepAccountService {
+
+    private ISysFlowStepAccountDao sysFlowStepAccountDao;
+    @Resource
+    private DsDataSourceUtil dsDataSourceUtil;
+    @Autowired
+    private ISysApplicationDatabaseService sysApplicationDatabaseService;
+
+    @Autowired
+    public void setSysFlowStepAccountDao(ISysFlowStepAccountDao dao) {
+        this.sysFlowStepAccountDao = dao;
+        this.dao = dao;
+    }
+
+
+    /**
+     * 保存账户信息
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity saveAccount(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "save");
+            //控制一下名字不能重复
+            List<SysFlowStepAccountEntity> queryList = queryByName(entity);
+            if (CollectionUtils.isNotEmpty(queryList) && queryList.size() > 0) {
+                return BaseResult.getFailureMessageEntity(entity.getName() + "重复");
+            }
+            sysFlowStepAccountDao.save(entity);
+            //保存数据源表，测试sql的时候要用动态数据源，动态数据源是从sys_application_database表查数据的
+            saveOrDataBase(entity);
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        return BaseResult.getSuccessMessageEntity("新增成功");
+    }
+
+    /**
+     * 保存数据源表，测试sql的时候要用动态数据源，动态数据源是从sys_application_database表查数据的
+     *
+     * @param entity
+     */
+    private void saveOrDataBase(SysFlowStepAccountEntity entity) throws Exception {
+        Assert.notNull(entity, "参数不能为空");
+        Assert.notEmpty(entity.getName(), "账户名称不能为空");
+        SysApplicationDatabaseEntity db = new SysApplicationDatabaseEntity();
+        db.setSourceCode(entity.getName() + "_flow");
+        List<SysApplicationDatabaseEntity> queryList = sysApplicationDatabaseService.query(db);
+        if (CollectionUtils.isNotEmpty(queryList)) {
+            for (SysApplicationDatabaseEntity sys : queryList) {
+                sysApplicationDatabaseService.logicRemove(sys);
+            }
+        }
+        SysApplicationDatabaseEntity databaseEntity = new SysApplicationDatabaseEntity();
+        databaseEntity.setAppId(entity.getAppId());
+        databaseEntity.setSourceCode(entity.getName() + "_flow");
+        databaseEntity.setSourceName(entity.getName());
+        databaseEntity.setSourceType(entity.getDbType());
+        databaseEntity.setSourceIp(entity.getIpAddress());
+        databaseEntity.setSourcePort(entity.getPort());
+        databaseEntity.setLoginName(entity.getUserName());
+        databaseEntity.setPassword(entity.getPassword());
+        databaseEntity.setDbName(entity.getDbName());
+        databaseEntity.setDbStatus("1");
+        sysApplicationDatabaseService.save(databaseEntity);
+    }
+
+    /**
+     * 更新账户信息
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity updateAccount(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "update");
+            //检查一下名字不能重复
+            List<SysFlowStepAccountEntity> queryList = queryByName(entity);
+            if (CollectionUtils.isNotEmpty(queryList) && queryList.size() > 0) {
+                for (SysFlowStepAccountEntity acc : queryList) {
+                    if (!acc.getId().equals(entity.getId())) {
+                        return BaseResult.getFailureMessageEntity(entity.getName() + "重复");
+                    }
+                }
+            }
+            sysFlowStepAccountDao.update(entity);
+            //保存数据源表，测试sql的时候要用动态数据源，动态数据源是从sys_application_database表查数据的
+            saveOrDataBase(entity);
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        return BaseResult.getSuccessMessageEntity("更新成功");
+    }
+
+    /**
+     * 删除账户信息
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity deleteAccount(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "delete");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        sysFlowStepAccountDao.logicRemove(entity);
+        return BaseResult.getSuccessMessageEntity("删除成功");
+    }
+
+    /**
+     * 查询账户详情
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity getAccount(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "get");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        SysFlowStepAccountEntity SysFlowStepAccountEntity = sysFlowStepAccountDao.get(entity.getId());
+        return BaseResult.getSuccessMessageEntity("查询账户详情成功", SysFlowStepAccountEntity);
+    }
+
+    /**
+     * 查询账户列表数据
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity queryAccountList(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "queryList");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        List<SysFlowStepAccountEntity> queryList = sysFlowStepAccountDao.query(entity);
+        return BaseResult.getSuccessMessageEntity("查询列表成功", queryList);
+    }
+
+    /**
+     * 查询账户分页数据
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity queryAccountPaged(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "queryPaged");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        return null;
+    }
+
+
+    //根据账户名称查询
+    private List<SysFlowStepAccountEntity> queryByName(SysFlowStepAccountEntity entity) {
+        if (StrUtil.isNotEmpty(entity.getName())) {
+            SysFlowStepAccountEntity account = new SysFlowStepAccountEntity();
+            account.setName(entity.getName());
+            List<SysFlowStepAccountEntity> queryList = sysFlowStepAccountDao.query(account);
+            return queryList;
+        }
+        return null;
+    }
+
+    /**
+     * 验证账户
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity verifyDataBase(JSONObject object) {
+        SysFlowStepAccountEntity entity = getData("jsonStr", object, SysFlowStepAccountEntity.class);
+        try {
+            checkParam(entity, "verify");
+            String dbType = entity.getDbType();
+            String driveClass = "";
+            StringBuffer sourceUrl = new StringBuffer();
+            if (StrUtil.isNotEmpty(dbType)) {
+                if ("mysql".equals(dbType)) {
+                    driveClass = DataSourceUtilProperties.MYSQLDRIVER_6;
+                    sourceUrl.append("jdbc:mysql://").append(entity.getIpAddress()).append(":").append(entity.getPort()).append("/").append(entity.getDbName()).append("?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true");
+                } else if ("oracle".equals(dbType)) {
+                    driveClass = DataSourceUtilProperties.ORACLEDRIVER;
+                    sourceUrl.append("jdbc:oracle:thin:@").append(entity.getIpAddress()).append(":").append(entity.getPort()).append(":").append(entity.getDbName());
+                } else if ("sqlserver2000".equals(dbType)) {
+                    driveClass = DataSourceUtilProperties.SQL2000DRIVER;
+                    sourceUrl.append("jdbc:sqlserver://").append(entity.getIpAddress()).append(":").append(entity.getPort()).append(";DatabaseName=").append(entity.getDbName()).append(";encrypt=false;trustServerCertificate=true");
+                } else if ("sqlserver2005".equals(dbType)) {
+                    driveClass = DataSourceUtilProperties.SQL2005DRIVER;
+                    sourceUrl.append("jdbc:sqlserver://").append(entity.getIpAddress()).append(":").append(entity.getPort()).append(";DatabaseName=").append(entity.getDbName()).append(";encrypt=false;trustServerCertificate=true");
+                }
+                //测试连接
+                Class.forName(driveClass);
+                Connection connection = DriverManager.getConnection(sourceUrl.toString(), entity.getUserName(), entity.getPassword());// 相当于连接数据库
+                if (null != connection) {
+                    return BaseResult.getSuccessMessageEntity("验证成功");
+                } else {
+                    return BaseResult.getFailureMessageEntity("验证失败");
+                }
+            }
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        return null;
+    }
+
+    //数据检查
+    private void checkParam(SysFlowStepAccountEntity entity, String type) {
+        Assert.notNull(entity, "参数不能为空");
+        if ("save".equals(type)) {
+            Assert.notEmpty(entity.getFlowId(), "flowId不能为空");
+            Assert.notEmpty(entity.getAppId(), "appId不能为空");
+            Assert.notEmpty(entity.getName(), "账户名称不能为空");
+        } else if ("update".equals(type)) {
+            Assert.notEmpty(entity.getId(), "id不能为空");
+        } else if ("delete".equals(type)) {
+            Assert.notEmpty(entity.getId(), "id不能为空");
+        } else if ("get".equals(type)) {
+            Assert.notEmpty(entity.getId(), "id不能为空");
+        } else if ("queryList".equals(type)) {
+            Assert.notEmpty(entity.getFlowId(), "flowId不能为空");
+            Assert.notEmpty(entity.getStepId(), "stepId不能为空");
+            Assert.notEmpty(entity.getAppId(), "appId不能为空");
+        } else if ("queryPaged".equals(type)) {
+            Assert.notNull(entity.getPageNum(), "pageNum不能为空");
+            Assert.notNull(entity.getPageSize(), "pageSize不能为空");
+        } else if ("verify".equals(type)) {
+
+        }
+    }
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepConfigBServiceImpl.java

@@ -0,0 +1,26 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigBEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepConfigBDao;
+import com.hzya.frame.sys.flow.service.ISysFlowStepConfigBService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 映射信息表体(SysFlowStepConfigB)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Service(value = "sysFlowStepConfigBService")
+public class SysFlowStepConfigBServiceImpl extends BaseService<SysFlowStepConfigBEntity, String> implements ISysFlowStepConfigBService {
+     
+    private ISysFlowStepConfigBDao sysFlowStepConfigBDao;
+    
+    @Autowired
+	public void setSysFlowStepConfigBDao(ISysFlowStepConfigBDao dao) {
+		this.sysFlowStepConfigBDao = dao;
+		this.dao = dao;
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepConfigServiceImpl.java

@@ -0,0 +1,82 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
+import com.hzya.frame.sys.flow.entity.SysFlowStepConfigEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepConfigDao;
+import com.hzya.frame.sys.flow.service.ISysFlowStepAccountService;
+import com.hzya.frame.sys.flow.service.ISysFlowStepConfigService;
+import com.hzya.frame.sysnew.application.database.entity.SysApplicationDatabaseEntity;
+import com.hzya.frame.sysnew.application.database.service.ISysApplicationDatabaseService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.hzya.frame.web.exception.BaseSystemException;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 映射信息主表(SysFlowStepConfig)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Service(value = "sysFlowStepConfigService")
+public class SysFlowStepConfigServiceImpl extends BaseService<SysFlowStepConfigEntity, String> implements ISysFlowStepConfigService {
+
+	Logger logger = LoggerFactory.getLogger(ISysFlowStepConfigService.class);
+    private ISysFlowStepConfigDao sysFlowStepConfigDao;
+    @Autowired
+	private ISysFlowStepAccountService sysFlowStepAccountService;
+	@Autowired
+	private ISysApplicationDatabaseService sysApplicationDatabaseService;
+    @Autowired
+	public void setSysFlowStepConfigDao(ISysFlowStepConfigDao dao) {
+		this.sysFlowStepConfigDao = dao;
+		this.dao = dao;
+	}
+
+	/**
+	 * 测试sql
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity testSql(JSONObject object) {
+		SysFlowStepConfigEntity config = getData("jsonStr",object,SysFlowStepConfigEntity.class);
+		try {
+			checkParams(config,"type");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		SysFlowStepAccountEntity accountEntity = sysFlowStepAccountService.get(config.getId());
+		Assert.notNull(accountEntity,"没有找到对应账户");
+		//查询数据源
+		SysApplicationDatabaseEntity database = new SysApplicationDatabaseEntity();
+		database.setSourceCode(accountEntity.getName()+"_flow");
+		List<SysApplicationDatabaseEntity> databaseList = sysApplicationDatabaseService.query(database);
+		if (CollectionUtils.isEmpty(databaseList)){
+			throw new BaseSystemException("没有找到数据源");
+		}
+		return null;
+	}
+
+	/**
+	 * 验证数据
+	 * @param entity
+	 * @param type
+	 */
+	private void checkParams(SysFlowStepConfigEntity entity, String type) {
+		Assert.notNull(entity,"参数不能为空");
+		Assert.notEmpty(entity.getTableName(),"tabName不能为空");
+		Assert.notEmpty(entity.getStepAccountId(),"tabName不能为空");
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepRelationServiceImpl.java

@@ -0,0 +1,26 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import com.hzya.frame.sys.flow.entity.SysFlowStepRelationEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepRelationDao;
+import com.hzya.frame.sys.flow.service.ISysFlowStepRelationService;
+import org.springframework.stereotype.Service; 
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 步骤关联关系表(SysFlowStepRelation)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:28
+ */
+@Service(value = "sysFlowStepRelationService")
+public class SysFlowStepRelationServiceImpl extends BaseService<SysFlowStepRelationEntity, String> implements ISysFlowStepRelationService {
+     
+    private ISysFlowStepRelationDao sysFlowStepRelationDao;
+    
+    @Autowired
+	public void setSysFlowStepRelationDao(ISysFlowStepRelationDao dao) {
+		this.sysFlowStepRelationDao = dao;
+		this.dao = dao;
+	}
+}

base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowStepServiceImpl.java

@@ -0,0 +1,160 @@
+package com.hzya.frame.sys.flow.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepAccountDao;
+import com.hzya.frame.sys.flow.entity.SysFlowStepAccountEntity;
+import com.hzya.frame.sys.flow.entity.SysFlowStepEntity;
+import com.hzya.frame.sys.flow.dao.ISysFlowStepDao;
+import com.hzya.frame.sys.flow.service.ISysFlowStepAccountService;
+import com.hzya.frame.sys.flow.service.ISysFlowStepService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 流程步骤信息(SysFlowStep)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-04-29 10:16:27
+ */
+@Service(value = "sysFlowStepService")
+public class SysFlowStepServiceImpl extends BaseService<SysFlowStepEntity, String> implements ISysFlowStepService {
+
+    private ISysFlowStepDao sysFlowStepDao;
+    @Autowired
+    private ISysFlowStepAccountService sysFlowStepAccountService;
+
+    @Autowired
+    public void setSysFlowStepDao(ISysFlowStepDao dao) {
+        this.sysFlowStepDao = dao;
+        this.dao = dao;
+    }
+
+    /**
+     * 保存流程步骤
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity saveFlowStep(JSONObject object) {
+        SysFlowStepEntity sysFlowStep = getData("jsonStr", object, SysFlowStepEntity.class);
+        try {
+            checkParams(sysFlowStep, "save");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        sysFlowStepDao.save(sysFlowStep);
+        return BaseResult.getSuccessMessageEntity("保存成功", sysFlowStep);
+    }
+
+
+    /**
+     * 更新流程步骤
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity updateFlowStep(JSONObject object) {
+        SysFlowStepEntity sysFlowStep = getData("jsonStr", object, SysFlowStepEntity.class);
+        try {
+            checkParams(sysFlowStep, "update");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        sysFlowStepDao.update(sysFlowStep);
+        //保存账户信息
+        if (null != sysFlowStep.getAccount()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("jsonStr", JSONObject.toJSONString(sysFlowStep.getAccount()));
+            sysFlowStepAccountService.saveAccount(jsonObject);
+        }
+        return BaseResult.getSuccessMessageEntity("保存成功", sysFlowStep);
+    }
+
+    /**
+     * 删除流程步骤
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity deleteFlowStep(JSONObject object) {
+        SysFlowStepEntity sysFlowStep = getData("jsonStr", object, SysFlowStepEntity.class);
+        try {
+            checkParams(sysFlowStep, "delete");
+            String id = sysFlowStep.getId();
+            SysFlowStepEntity step = sysFlowStepDao.get(id);
+            //删除流程步骤账户表
+            SysFlowStepAccountEntity stepAccount = new SysFlowStepAccountEntity();
+            stepAccount.setFlowId(step.getFlowId());
+            stepAccount.setStepId(id);
+            sysFlowStepAccountService.logicRemoveMultiCondition(stepAccount);
+            //删除流程步骤
+            sysFlowStepDao.logicRemove(step);
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        return BaseResult.getSuccessMessageEntity("删除成功");
+    }
+
+    /**
+     * 查询列表
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity queryList(JSONObject object) {
+        SysFlowStepEntity sysFlowStep = getData("jsonStr", object, SysFlowStepEntity.class);
+        try {
+            checkParams(sysFlowStep, "queryList");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        List<SysFlowStepEntity> list = sysFlowStepDao.query(sysFlowStep);
+        return BaseResult.getSuccessMessageEntity("查询数据成功", list);
+    }
+
+    /**
+     * 步骤详情
+     *
+     * @param object
+     * @return
+     */
+    @Override
+    public JsonResultEntity getFlowStep(JSONObject object) {
+        SysFlowStepEntity sysFlowStep = getData("jsonStr", object, SysFlowStepEntity.class);
+        try {
+            checkParams(sysFlowStep, "get");
+        } catch (Exception e) {
+            return BaseResult.getFailureMessageEntity(e.getMessage());
+        }
+        SysFlowStepEntity entity = sysFlowStepDao.get(sysFlowStep.getId());
+        return BaseResult.getSuccessMessageEntity("查询详情成功", entity);
+    }
+
+    private void checkParams(SysFlowStepEntity entity, String type) {
+        Assert.notNull(entity, "参数不能为空");
+        if ("save".equals(type)) {
+            Assert.notEmpty(entity.getFlowId(), "flowId不能为空");
+            Assert.notNull(entity.getStep(), "步骤号不能为空");
+            Assert.notEmpty(entity.getStepType(), "stepType不能为空");
+        } else if ("update".equals(type)) {
+            Assert.notEmpty(entity.getAppId(), "appId不能为空");
+            Assert.notEmpty(entity.getNifiApiId(), "nifiApiId不能为空");
+        } else if ("delete".equals(type)) {
+            Assert.notEmpty(entity.getId(), "id不能为空");
+        }else if ("queryList".equals(type)){
+            Assert.notEmpty(entity.getFlowId(),"flowId不能为空");
+        }else if ("get".equals(type)){
+            Assert.notEmpty(entity.getId(),"id不能为空");
+        }
+    }
+}

base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java

@@ -82,6 +82,9 @@ public class SysApplicationApiEntity extends BaseEntity {
     /**  返回描述字段*/
     private String returnMsg;
 
+    //对应nifi的apiid
+    private String nifiApiId;
+
     public String getReturnMsg() {
         return returnMsg;
     }
@@ -321,5 +324,13 @@ public class SysApplicationApiEntity extends BaseEntity {
     public void setAppCode(Long appCode) {
         this.appCode = appCode;
     }
+
+    public String getNifiApiId() {
+        return nifiApiId;
+    }
+
+    public void setNifiApiId(String nifiApiId) {
+        this.nifiApiId = nifiApiId;
+    }
 }
 

base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml

@@ -10,6 +10,7 @@
         <result property="appCode" column="app_code"/>
         <result property="apiPath" column="api_path" jdbcType="VARCHAR"/>
         <result property="appId" column="app_id" jdbcType="VARCHAR"/>
+        <result property="nifiApiId" column="nifi_api_id" jdbcType="VARCHAR"/>
         <result property="appName" column="app_name" jdbcType="VARCHAR"/>
         <result property="appUrl" column="app_url" jdbcType="VARCHAR"/>
         <result property="catalogueId" column="catalogue_id" jdbcType="VARCHAR"/>
@@ -42,6 +43,7 @@
         <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
         <result property="sts" column="sts" jdbcType="VARCHAR"/>
         <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
+        <result property="appName" column="app_name" jdbcType="VARCHAR"/>
     </resultMap>
     <!-- 查询的字段-->
     <sql id="SysApplicationApiEntity_Base_Column_List">
@@ -50,7 +52,8 @@
        ,api_code
        ,api_path
         ,app_id
-        ,catalogue_id 
+        ,nifi_api_id
+        ,catalogue_id
         ,api_name 
         ,api_remark 
         ,need_Login 
@@ -84,6 +87,7 @@
     <sql id="SysApplicationApiEntity_join_sysApp_like_Column_Lis">
     sys_application_api.id,
 	sys_application.app_id as app_code,
+	sys_application.nifi_api_id as nifi_api_id,
 	sys_application_api.api_code,
 	sys_application_api.api_name,
 	sys_application_api.api_remark,
@@ -110,6 +114,7 @@
 	b.name as app_name,
 	b.interface_address as app_url,
 	a.app_id,
+	a.nifi_api_id,
 	a.catalogue_id,
 	c.name as catalogue_name,
 	a.api_name,
@@ -156,52 +161,89 @@ WHERE
     <select id="entity_list_base" resultMap="get-SysApplicationApiEntity-result"
             parameterType="com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity">
         select
-        <include refid="SysApplicationApiEntity_Base_Column_List"/>
-        from sys_application_api
+        api.id
+        ,api.api_status
+        ,api.api_code
+        ,api.api_path
+        ,api.app_id
+        ,api.nifi_api_id
+        ,api.catalogue_id
+        ,api.api_name
+        ,api.api_remark
+        ,api.need_Login
+        ,api.authentication_port
+        ,api.parameter_passing_mode
+        ,api.destination_address
+        ,api.request_coding
+        ,api.request_method
+        ,api.timeout_period
+        ,api.current_limiting
+        ,api.header_in
+        ,api.query_in
+        ,api.body_in_type
+        ,api.body_in
+        ,api.body_out
+        ,api.bean_name
+        ,api.return_msg
+        ,api.return_success_field
+        ,api.return_success_value
+        ,api.fun_name
+        ,api.extension_api
+        ,api.sorts
+        ,api.create_user_id
+        ,api.create_time
+        ,api.modify_user_id
+        ,api.modify_time
+        ,api.sts
+        ,api.org_id
+        ,app.name as app_name
+        from sys_application_api api
+        left join sys_application app on api.app_id = app.id
         <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and id = #{id}</if>
-            <if test="apiStatus != null and apiStatus != ''">and api_status = #{apiStatus}</if>
-            <if test="apiCode != null ">and api_code = #{apiCode}</if>
-            <if test="apiPath != null and apiPath != ''">and api_path = #{apiPath}</if>
-            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
-            <if test="catalogueId != null and catalogueId != ''">and catalogue_id = #{catalogueId}</if>
-            <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
-            <if test="apiRemark != null and apiRemark != ''">and api_remark = #{apiRemark}</if>
-            <if test="needLogin != null and needLogin != ''">and need_Login = #{needLogin}</if>
-            <if test="authenticationPort != null and authenticationPort != ''">and authentication_port =
+            <if test="id != null and id != ''">and api.id = #{id}</if>
+            <if test="apiStatus != null and apiStatus != ''">and api.api_status = #{apiStatus}</if>
+            <if test="apiCode != null ">and api.api_code = #{apiCode}</if>
+            <if test="apiPath != null and apiPath != ''">and api.api_path = #{apiPath}</if>
+            <if test="appId != null and appId != ''">and api.app_id = #{appId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and api.nifi_api_id = #{nifiApiId}</if>
+            <if test="catalogueId != null and catalogueId != ''">and api.catalogue_id = #{catalogueId}</if>
+            <if test="apiName != null and apiName != ''">and api.api_name = #{apiName}</if>
+            <if test="apiRemark != null and apiRemark != ''">and api.api_remark = #{apiRemark}</if>
+            <if test="needLogin != null and needLogin != ''">and api.need_Login = #{needLogin}</if>
+            <if test="authenticationPort != null and authenticationPort != ''">and api.authentication_port =
                 #{authenticationPort}
             </if>
-            <if test="parameterPassingMode != null and parameterPassingMode != ''">and parameter_passing_mode =
+            <if test="parameterPassingMode != null and parameterPassingMode != ''">and api.parameter_passing_mode =
                 #{parameterPassingMode}
             </if>
-            <if test="destinationAddress != null and destinationAddress != ''">and destination_address =
+            <if test="destinationAddress != null and destinationAddress != ''">and api.destination_address =
                 #{destinationAddress}
             </if>
-            <if test="requestCoding != null and requestCoding != ''">and request_coding = #{requestCoding}</if>
-            <if test="requestMethod != null and requestMethod != ''">and request_method = #{requestMethod}</if>
-            <if test="timeoutPeriod != null and timeoutPeriod != ''">and timeout_period = #{timeoutPeriod}</if>
-            <if test="currentLimiting != null and currentLimiting != ''">and current_limiting = #{currentLimiting}</if>
-            <if test="headerIn != null and headerIn != ''">and header_in = #{headerIn}</if>
-            <if test="queryIn != null and queryIn != ''">and query_in = #{queryIn}</if>
-            <if test="bodyInType != null and bodyInType != ''">and body_in_type = #{bodyInType}</if>
-            <if test="bodyIn != null and bodyIn != ''">and body_in = #{bodyIn}</if>
-            <if test="bodyOut != null and bodyOut != ''">and body_out = #{bodyOut}</if>
-            <if test="beanName != null and beanName != ''">and bean_name = #{beanName}</if>
-            <if test="returnMsg != null and returnMsg != ''">and return_msg = #{returnMsg}</if>
-            <if test="returnSuccessField != null and returnSuccessField != ''">and return_success_field = #{returnSuccessField}</if>
-            <if test="returnSuccessValue != null and returnSuccessValue != ''">and return_success_value = #{returnSuccessValue}</if>
-            <if test="funName != null and funName != ''">and fun_name = #{funName}</if>
-            <if test="extensionApi != null and extensionApi != ''">and extension_api = #{extensionApi}</if>
-            <if test="sorts != null">and sorts = #{sorts}</if>
-            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
-            <if test="create_time != null">and create_time = #{create_time}</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
-            <if test="modify_time != null">and modify_time = #{modify_time}</if>
-            <if test="sts != null and sts != ''">and sts = #{sts}</if>
-            <if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
-            and sts='Y'
+            <if test="requestCoding != null and requestCoding != ''">and api.request_coding = #{requestCoding}</if>
+            <if test="requestMethod != null and requestMethod != ''">and api.request_method = #{requestMethod}</if>
+            <if test="timeoutPeriod != null and timeoutPeriod != ''">and api.timeout_period = #{timeoutPeriod}</if>
+            <if test="currentLimiting != null and currentLimiting != ''">and api.current_limiting = #{currentLimiting}</if>
+            <if test="headerIn != null and headerIn != ''">and api.header_in = #{headerIn}</if>
+            <if test="queryIn != null and queryIn != ''">and api.query_in = #{queryIn}</if>
+            <if test="bodyInType != null and bodyInType != ''">and api.body_in_type = #{bodyInType}</if>
+            <if test="bodyIn != null and bodyIn != ''">and api.body_in = #{bodyIn}</if>
+            <if test="bodyOut != null and bodyOut != ''">and api.body_out = #{bodyOut}</if>
+            <if test="beanName != null and beanName != ''">and api.bean_name = #{beanName}</if>
+            <if test="returnMsg != null and returnMsg != ''">and api.return_msg = #{returnMsg}</if>
+            <if test="returnSuccessField != null and returnSuccessField != ''">and api.return_success_field = #{returnSuccessField}</if>
+            <if test="returnSuccessValue != null and returnSuccessValue != ''">and api.return_success_value = #{returnSuccessValue}</if>
+            <if test="funName != null and funName != ''">and api.fun_name = #{funName}</if>
+            <if test="extensionApi != null and extensionApi != ''">and api.extension_api = #{extensionApi}</if>
+            <if test="sorts != null">and api.sorts = #{sorts}</if>
+            <if test="create_user_id != null and create_user_id != ''">and api.create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and api.create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and api.modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and api.modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and api.sts = #{sts}</if>
+            <if test="org_id != null and org_id != ''">and api.org_id = #{org_id}</if>
+            and api.sts='Y'
         </trim>
-        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort == null or sort == ''.toString() ">order by api.sorts asc</if>
         <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
@@ -215,6 +257,7 @@ WHERE
             <if test="apiCode != null ">and api_code = #{apiCode}</if>
             <if test="apiPath != null and apiPath != ''">and api_path = #{apiPath}</if>
             <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id = #{nifiApiId}</if>
             <if test="catalogueId != null and catalogueId != ''">and catalogue_id = #{catalogueId}</if>
             <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
             <if test="apiRemark != null and apiRemark != ''">and api_remark = #{apiRemark}</if>
@@ -268,6 +311,7 @@ WHERE
             <if test="apiCode != null ">and api_code like concat('%',#{apiCode},'%')</if>
             <if test="apiPath != null and apiPath != ''">and api_path like concat('%',#{apiPath},'%')</if>
             <if test="appId != null and appId != ''">and app_id like concat('%',#{appId},'%')</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id like concat('%',#{nifiApiId},'%')</if>
             <if test="catalogueId != null and catalogueId != ''">and catalogue_id like concat('%',#{catalogueId},'%')
             </if>
             <if test="apiName != null and apiName != ''">and api_name like concat('%',#{apiName},'%')</if>
@@ -336,6 +380,7 @@ WHERE
             <if test="apiCode != null ">and sys_application_api.api_code like concat('%',#{apiCode},'%')</if>
             <if test="apiPath != null and apiPath != ''">and sys_application_api.api_path like concat('%',#{apiPath},'%')</if>
             <if test="appId != null and appId != ''">and sys_application_api.app_id like concat('%',#{appId},'%')</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and sys_application_api.nifi_api_id like concat('%',#{nifiApiId},'%')</if>
             <if test="catalogueId != null and catalogueId != ''">and sys_application_api.catalogue_id like concat('%',#{catalogueId},'%')
             </if>
             <if test="apiName != null and apiName != ''">and sys_application_api.api_name like concat('%',#{apiName},'%')</if>
@@ -402,6 +447,7 @@ WHERE
             <if test="apiCode != null ">or api_code = #{apiCode}</if>
             <if test="apiPath != null and apiPath != ''">or api_path = #{apiPath}</if>
             <if test="appId != null and appId != ''">or app_id = #{appId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">or nifi_api_id = #{nifiApiId}</if>
             <if test="catalogueId != null and catalogueId != ''">or catalogue_id = #{catalogueId}</if>
             <if test="apiName != null and apiName != ''">or api_name = #{apiName}</if>
             <if test="apiRemark != null and apiRemark != ''">or api_remark = #{apiRemark}</if>
@@ -454,6 +500,7 @@ WHERE
             <if test="apiCode == null ">api_code ,</if>
             <if test="apiPath != null and apiPath != ''">api_path ,</if>
             <if test="appId != null and appId != ''">app_id ,</if>
+            <if test="nifiApiId != null and nifiApiId != ''">nifi_api_id ,</if>
             <if test="catalogueId != null and catalogueId != ''">catalogue_id ,</if>
             <if test="apiName != null and apiName != ''">api_name ,</if>
             <if test="apiRemark != null and apiRemark != ''">api_remark ,</if>
@@ -495,6 +542,7 @@ WHERE
             </if>
             <if test="apiPath != null and apiPath != ''">#{apiPath} ,</if>
             <if test="appId != null and appId != ''">#{appId} ,</if>
+            <if test="nifiApiId != null and nifiApiId != ''">#{nifiApiId} ,</if>
             <if test="catalogueId != null and catalogueId != ''">#{catalogueId} ,</if>
             <if test="apiName != null and apiName != ''">#{apiName} ,</if>
             <if test="apiRemark != null and apiRemark != ''">#{apiRemark} ,</if>
@@ -531,31 +579,32 @@ WHERE
     </insert>
     <!-- 批量新增 -->
     <insert id="entityInsertBatch" >
-        insert into sys_application_api(api_status,api_code,api_path, app_id, catalogue_id, api_name, api_remark,
+        insert into sys_application_api(api_status,api_code,api_path, app_id,nifi_api_id, catalogue_id, api_name, api_remark,
         need_Login, authentication_port, parameter_passing_mode, destination_address, request_coding, request_method,
         timeout_period, current_limiting, header_in, query_in, body_in_type, body_in, body_out, bean_name,return_msg,return_success_field,return_success_value, fun_name, extension_api, sorts, create_user_id,
         create_time, modify_user_id, modify_time, sts, org_id, sts)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
+            (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.nifiApiId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
             'Y')
         </foreach>
     </insert>
     <!-- 批量新增或者修改-->
     <insert id="entityInsertOrUpdateBatch" >
-        insert into sys_application_api(api_status,api_code,api_path, app_id, catalogue_id, api_name, api_remark,
+        insert into sys_application_api(api_status,api_code,api_path, app_id,nifi_api_id, catalogue_id, api_name, api_remark,
         need_Login, authentication_port, parameter_passing_mode, destination_address, request_coding, request_method,
         timeout_period, current_limiting, header_in, query_in, body_in_type, body_in, body_out,bean_name,return_msg,return_success_field,return_success_value,fun_name,extension_api, sorts, create_user_id,
         create_time, modify_user_id, modify_time, sts, org_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
+            (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.nifiApiId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
         </foreach>
         on duplicate key update
         api_status = values(api_status),
         api_code = values(api_code),
         api_path = values(api_path),
         app_id = values(app_id),
+        nifi_api_id = values(nifi_api_id),
         catalogue_id = values(catalogue_id),
         api_name = values(api_name),
         api_remark = values(api_remark),
@@ -594,6 +643,7 @@ WHERE
             <if test="apiCode != null ">api_code = #{apiCode},</if>
             <if test="apiPath != null and apiPath != ''">api_path = #{apiPath},</if>
             <if test="appId != null and appId != ''">app_id = #{appId},</if>
+            <if test="nifiApiId != null and nifiApiId != ''">nifi_api_id = #{nifiApiId},</if>
             <if test="catalogueId != null and catalogueId != ''">catalogue_id = #{catalogueId},</if>
             <if test="apiName != null and apiName != ''">api_name = #{apiName},</if>
             <if test="apiRemark != null and apiRemark != ''">api_remark = #{apiRemark},</if>
@@ -647,6 +697,7 @@ where id = #{id}
             <if test="apiCode != null ">and api_code = #{apiCode}</if>
             <if test="apiPath != null and apiPath != ''">and api_path = #{apiPath}</if>
             <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id = #{nifiApiId}</if>
             <if test="catalogueId != null and catalogueId != ''">and catalogue_id = #{catalogueId}</if>
             <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
             <if test="apiRemark != null and apiRemark != ''">and api_remark = #{apiRemark}</if>
@@ -883,6 +934,7 @@ where id = #{id}
         select
         id
         ,app_id
+        ,nifi_api_id
         ,api_name
         from sys_application_api
         <trim prefix="where" prefixOverrides="and">
@@ -891,6 +943,7 @@ where id = #{id}
             <if test="apiCode != null ">and api_code = #{apiCode}</if>
             <if test="apiPath != null and apiPath != ''">and api_path = #{apiPath}</if>
             <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="nifiApiId != null and nifiApiId != ''">and nifi_api_id = #{nifiApiId}</if>
             <if test="catalogueId != null and catalogueId != ''">and catalogue_id = #{catalogueId}</if>
             <if test="apiName != null and apiName != ''">and api_name = #{apiName}</if>
             <if test="apiRemark != null and apiRemark != ''">and api_remark = #{apiRemark}</if>

base-service/src/main/java/com/hzya/frame/sysnew/application/api/service/ISysApplicationApiService.java

@@ -24,6 +24,8 @@ public interface ISysApplicationApiService extends IBaseService<SysApplicationAp
      **/
     JsonResultEntity queryEntity(JSONObject jsonObject);
 
+    JsonResultEntity queryMultiAppPage(JSONObject jsonObject);
+
     /**
      * 模糊查询，联查sys_app
      * @param entity

base-service/src/main/java/com/hzya/frame/sysnew/application/api/service/impl/SysApplicationApiServiceImpl.java

@@ -1,10 +1,13 @@
 package com.hzya.frame.sysnew.application.api.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity;
 import com.hzya.frame.sysnew.application.api.dao.ISysApplicationApiDao;
 import com.hzya.frame.sysnew.application.api.service.ISysApplicationApiService;
 import com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity;
+import com.hzya.frame.sysnew.messageTemplate.entity.SysMessageTemplateEntity;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.springframework.stereotype.Service;
@@ -12,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import javax.annotation.Resource;
 import com.hzya.frame.basedao.service.impl.BaseService;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -49,6 +53,42 @@ public class SysApplicationApiServiceImpl extends BaseService<SysApplicationApiE
 		return BaseResult.getSuccessMessageEntity("查询数据成功", list);
 	}
 
+	@Override
+	public JsonResultEntity queryMultiAppPage(JSONObject jsonObject){
+		SysApplicationApiEntity entity = getData("jsonStr", jsonObject, SysApplicationApiEntity.class);
+		//判断分页
+		if (entity == null || entity.getPageNum() == null || entity.getPageSize() == null) {
+			return BaseResult.getFailureMessageEntity("分页查询参数不存在");
+		}
+		int pageNum = entity.getPageNum();
+		int pageSize = entity.getPageSize();
+		//查询时不分页
+		entity.setPageNum(null);
+		entity.setPageSize(null);
+		String appIds = entity.getAppId();
+		if(appIds == null || "".equals(appIds.trim())){
+			return BaseResult.getFailureMessageEntity("应用ID不能为空");
+		}
+		String[] appIdList = appIds.split(",");
+		List<SysApplicationApiEntity> resultList = new ArrayList<>();
+		for (int i = 0; i < appIdList.length; i++) {
+			entity.setAppId(appIdList[i]);
+			List<SysApplicationApiEntity> list = sysApplicationApiDao.queryBase(entity);
+			resultList.addAll(list);
+		}
+        //手动分页
+		int total = resultList.size();
+		int fromIndex = (pageNum - 1) * pageSize;
+		int toIndex = Math.min(fromIndex + pageSize, total);
+		List<SysApplicationApiEntity> pageList = resultList.subList(fromIndex, toIndex);
+
+		PageInfo<SysApplicationApiEntity> pageInfo = new PageInfo<>(pageList);
+		pageInfo.setTotal(total);
+		pageInfo.setPages((total + pageSize - 1) / pageSize);
+
+		return BaseResult.getSuccessMessageEntity("查询数据成功", pageInfo);
+	}
+
 	/**
 	 * 模糊查询，联查sys_app
 	 *

base-service/src/main/java/com/hzya/frame/sysnew/application/appAcount/dao/ISysApplicationAccountDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sysnew.application.appAcount.dao;
+
+import com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 应用账户表(sys_application_account: table)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-05-10 15:52:21
+ */
+public interface ISysApplicationAccountDao extends IBaseDao<SysApplicationAccountEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sysnew/application/appAcount/dao/impl/SysApplicationAccountDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sysnew.application.appAcount.dao.impl;
+
+import com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity;
+import com.hzya.frame.sysnew.application.appAcount.dao.ISysApplicationAccountDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 应用账户表(SysApplicationAccount)表数据库访问层
+ *
+ * @author xiang2lin
+ * @since 2025-05-10 15:52:23
+ */
+@Repository(value = "SysApplicationAccountDaoImpl")
+public class SysApplicationAccountDaoImpl extends MybatisGenericDao<SysApplicationAccountEntity, String> implements ISysApplicationAccountDao{
+ 
+}
+

base-service/src/main/java/com/hzya/frame/sysnew/application/appAcount/entity/SysApplicationAccountEntity.java

@@ -0,0 +1,138 @@
+package com.hzya.frame.sysnew.application.appAcount.entity;
+
+import java.util.Date;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 应用账户表(SysApplicationAccount)实体类
+ *
+ * @author xiang2lin
+ * @since 2025-05-10 15:52:24
+ */
+public class SysApplicationAccountEntity extends BaseEntity {
+
+    /**
+     * 应用id
+     */
+  private String appId;
+  /**  账户名称 */
+   private String name;
+  /**  ip地址 */
+   private String ipAddress;
+  /**  端口 */
+   private String port;
+  /**  数据库名称 */
+   private String dbName;
+  /**  用户名 */
+   private String userName;
+  /**  密码 */
+   private String password;
+  /**  数据库类型 */
+   private String dbType;
+  /**  应用key */
+   private String appKey;
+  /**  应用密钥 */
+   private String appSecret;
+  /**  企业id */
+   private String corpid;
+  /**  应用id */
+   private String agentid;
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    public void setPort(String port) {
+        this.port = port;
+    }
+
+    public String getDbName() {
+        return dbName;
+    }
+
+    public void setDbName(String dbName) {
+        this.dbName = dbName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getDbType() {
+        return dbType;
+    }
+
+    public void setDbType(String dbType) {
+        this.dbType = dbType;
+    }
+
+    public String getAppKey() {
+        return appKey;
+    }
+
+    public void setAppKey(String appKey) {
+        this.appKey = appKey;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid;
+    }
+
+    public String getAgentid() {
+        return agentid;
+    }
+
+    public void setAgentid(String agentid) {
+        this.agentid = agentid;
+    }
+}
+

base-service/src/main/java/com/hzya/frame/sysnew/application/appAcount/entity/SysApplicationAccountEntity.xml

@@ -0,0 +1,346 @@
+<?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.hzya.frame.sysnew.application.appAcount.dao.impl.SysApplicationAccountDaoImpl">
+
+    <resultMap id="get-SysApplicationAccountEntity-result"
+               type="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
+        <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+        <result property="sts" column="sts" jdbcType="VARCHAR"/>
+        <result property="sorts" column="sorts" jdbcType="INTEGER"/>
+        <result property="appId" column="app_id" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="ipAddress" column="ip_address" jdbcType="VARCHAR"/>
+        <result property="port" column="port" jdbcType="VARCHAR"/>
+        <result property="dbName" column="db_name" jdbcType="VARCHAR"/>
+        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+        <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="dbType" column="db_type" jdbcType="VARCHAR"/>
+        <result property="appKey" column="app_key" jdbcType="VARCHAR"/>
+        <result property="appSecret" column="app_secret" jdbcType="VARCHAR"/>
+        <result property="corpid" column="corpId" jdbcType="VARCHAR"/>
+        <result property="agentid" column="agentId" jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 查询的字段-->
+    <sql id="SysApplicationAccountEntity_Base_Column_List">
+        id
+        ,create_user_id
+        ,create_time 
+        ,modify_user_id 
+        ,modify_time 
+        ,sts 
+        ,sorts 
+        ,app_id
+        ,name
+        ,ip_address
+        ,port 
+        ,db_name 
+        ,user_name 
+        ,password 
+        ,db_type 
+        ,app_key 
+        ,app_secret 
+        ,corpId 
+        ,agentId
+    </sql>
+
+    <select id="entity_get" parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity" resultMap="get-SysApplicationAccountEntity-result">
+        select
+        <include refid="SysApplicationAccountEntity_Base_Column_List"/>
+        from sys_application_account
+        where id = #{id}
+        and sts = 'Y'
+    </select>
+    <!-- 查询 采用==查询 -->
+    <select id="entity_list_base" resultMap="get-SysApplicationAccountEntity-result"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        select
+        <include refid="SysApplicationAccountEntity_Base_Column_List"/>
+        from sys_application_account
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="ipAddress != null and ipAddress != ''">and ip_address = #{ipAddress}</if>
+            <if test="port != null and port != ''">and port = #{port}</if>
+            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
+            <if test="userName != null and userName != ''">and user_name = #{userName}</if>
+            <if test="password != null and password != ''">and password = #{password}</if>
+            <if test="dbType != null and dbType != ''">and db_type = #{dbType}</if>
+            <if test="appKey != null and appKey != ''">and app_key = #{appKey}</if>
+            <if test="appSecret != null and appSecret != ''">and app_secret = #{appSecret}</if>
+            <if test="corpid != null and corpid != ''">and corpId = #{corpid}</if>
+            <if test="agentid != null and agentid != ''">and agentId = #{agentid}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询符合条件的数量 -->
+    <select id="entity_count" resultType="Integer"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        select count(1) from sys_application_account
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">and create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">and modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="ipAddress != null and ipAddress != ''">and ip_address = #{ipAddress}</if>
+            <if test="port != null and port != ''">and port = #{port}</if>
+            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
+            <if test="userName != null and userName != ''">and user_name = #{userName}</if>
+            <if test="password != null and password != ''">and password = #{password}</if>
+            <if test="dbType != null and dbType != ''">and db_type = #{dbType}</if>
+            <if test="appKey != null and appKey != ''">and app_key = #{appKey}</if>
+            <if test="appSecret != null and appSecret != ''">and app_secret = #{appSecret}</if>
+            <if test="corpid != null and corpid != ''">and corpId = #{corpid}</if>
+            <if test="agentid != null and agentid != ''">and agentId = #{agentid}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 分页查询列表 采用like格式 -->
+    <select id="entity_list_like" resultMap="get-SysApplicationAccountEntity-result"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        select
+        <include refid="SysApplicationAccountEntity_Base_Column_List"/>
+        from sys_application_account
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
+            <if test="create_user_id != null and create_user_id != ''">and create_user_id like
+                concat('%',#{create_user_id},'%')
+            </if>
+            <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+            <if test="modify_user_id != null and modify_user_id != ''">and modify_user_id like
+                concat('%',#{modify_user_id},'%')
+            </if>
+            <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+            <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+            <if test="sorts != null">and sorts like concat('%',#{sorts},'%')</if>
+            <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+            <if test="appId != null and appId != ''">and app_id like concat('%',#{appId},'%')</if>
+            <if test="ipAddress != null and ipAddress != ''">and ip_address like concat('%',#{ipAddress},'%')</if>
+            <if test="port != null and port != ''">and port like concat('%',#{port},'%')</if>
+            <if test="dbName != null and dbName != ''">and db_name like concat('%',#{dbName},'%')</if>
+            <if test="userName != null and userName != ''">and user_name like concat('%',#{userName},'%')</if>
+            <if test="password != null and password != ''">and password like concat('%',#{password},'%')</if>
+            <if test="dbType != null and dbType != ''">and db_type like concat('%',#{dbType},'%')</if>
+            <if test="appKey != null and appKey != ''">and app_key like concat('%',#{appKey},'%')</if>
+            <if test="appSecret != null and appSecret != ''">and app_secret like concat('%',#{appSecret},'%')</if>
+            <if test="corpid != null and corpid != ''">and corpId like concat('%',#{corpid},'%')</if>
+            <if test="agentid != null and agentid != ''">and agentId like concat('%',#{agentid},'%')</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!-- 查询列表 字段采用or格式 -->
+    <select id="SysApplicationAccountentity_list_or" resultMap="get-SysApplicationAccountEntity-result"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        select
+        <include refid="SysApplicationAccountEntity_Base_Column_List"/>
+        from sys_application_account
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">or id = #{id}</if>
+            <if test="create_user_id != null and create_user_id != ''">or create_user_id = #{create_user_id}</if>
+            <if test="create_time != null">or create_time = #{create_time}</if>
+            <if test="modify_user_id != null and modify_user_id != ''">or modify_user_id = #{modify_user_id}</if>
+            <if test="modify_time != null">or modify_time = #{modify_time}</if>
+            <if test="sts != null and sts != ''">or sts = #{sts}</if>
+            <if test="sorts != null">or sorts = #{sorts}</if>
+            <if test="name != null and name != ''">or name = #{name}</if>
+            <if test="ipAddress != null and ipAddress != ''">or ip_address = #{ipAddress}</if>
+            <if test="port != null and port != ''">or port = #{port}</if>
+            <if test="dbName != null and dbName != ''">or db_name = #{dbName}</if>
+            <if test="userName != null and userName != ''">or user_name = #{userName}</if>
+            <if test="password != null and password != ''">or password = #{password}</if>
+            <if test="dbType != null and dbType != ''">or db_type = #{dbType}</if>
+            <if test="appKey != null and appKey != ''">or app_key = #{appKey}</if>
+            <if test="appSecret != null and appSecret != ''">or app_secret = #{appSecret}</if>
+            <if test="corpid != null and corpid != ''">or corpId = #{corpid}</if>
+            <if test="agentid != null and agentid != ''">or agentId = #{agentid}</if>
+            and sts='Y'
+        </trim>
+        <if test=" sort == null or sort == ''.toString()  ">order by sorts asc</if>
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="entity_insert"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity"
+            keyProperty="id" useGeneratedKeys="true">
+        insert into sys_application_account(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">id ,</if>
+            <if test="create_user_id != null and create_user_id != ''">create_user_id ,</if>
+            <if test="create_time != null">create_time ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id ,</if>
+            <if test="modify_time != null">modify_time ,</if>
+            <if test="sts != null and sts != ''">sts ,</if>
+            <if test="sorts != null">sorts ,</if>
+            <if test="name != null and name != ''">name ,</if>
+            <if test="ipAddress != null and ipAddress != ''">ip_address ,</if>
+            <if test="port != null and port != ''">port ,</if>
+            <if test="dbName != null and dbName != ''">db_name ,</if>
+            <if test="userName != null and userName != ''">user_name ,</if>
+            <if test="password != null and password != ''">password ,</if>
+            <if test="dbType != null and dbType != ''">db_type ,</if>
+            <if test="appKey != null and appKey != ''">app_key ,</if>
+            <if test="appSecret != null and appSecret != ''">app_secret ,</if>
+            <if test="corpid != null and corpid != ''">corpId ,</if>
+            <if test="agentid != null and agentid != ''">agentId ,</if>
+            <if test="appId != null and appId != ''">app_id ,</if>
+            <if test="sorts == null ">sorts,</if>
+            <if test="sts == null ">sts,</if>
+        </trim>
+        )values(
+        <trim suffix="" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id} ,</if>
+            <if test="create_user_id != null and create_user_id != ''">#{create_user_id} ,</if>
+            <if test="create_time != null">#{create_time} ,</if>
+            <if test="modify_user_id != null and modify_user_id != ''">#{modify_user_id} ,</if>
+            <if test="modify_time != null">#{modify_time} ,</if>
+            <if test="sts != null and sts != ''">#{sts} ,</if>
+            <if test="sorts != null">#{sorts} ,</if>
+            <if test="name != null and name != ''">#{name} ,</if>
+            <if test="ipAddress != null and ipAddress != ''">#{ipAddress} ,</if>
+            <if test="port != null and port != ''">#{port} ,</if>
+            <if test="dbName != null and dbName != ''">#{dbName} ,</if>
+            <if test="userName != null and userName != ''">#{userName} ,</if>
+            <if test="password != null and password != ''">#{password} ,</if>
+            <if test="dbType != null and dbType != ''">#{dbType} ,</if>
+            <if test="appKey != null and appKey != ''">#{appKey} ,</if>
+            <if test="appSecret != null and appSecret != ''">#{appSecret} ,</if>
+            <if test="corpid != null and corpid != ''">#{corpid} ,</if>
+            <if test="agentid != null and agentid != ''">#{agentid} ,</if>
+            <if test="appId != null and appId != ''">#{appId} ,</if>
+            <if test="sorts == null ">
+                COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_application_account a WHERE
+                a.sts = 'Y' ),1),
+            </if>
+            <if test="sts == null ">'Y',</if>
+        </trim>
+        )
+    </insert>
+    <!-- 批量新增 -->
+    <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sys_application_account(create_user_id, create_time, modify_user_id, modify_time, sts, sorts, name,
+        ip_address, port, db_name, user_name, password, db_type, app_key, app_secret, corpId, agentId, sts)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.sorts},#{entity.name},#{entity.ipAddress},#{entity.port},#{entity.dbName},#{entity.userName},#{entity.password},#{entity.dbType},#{entity.appKey},#{entity.appSecret},#{entity.corpid},#{entity.agentid},
+            'Y')
+        </foreach>
+    </insert>
+    <!-- 批量新增或者修改-->
+    <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sys_application_account(create_user_id, create_time, modify_user_id, modify_time, sts, sorts, name,
+        ip_address, port, db_name, user_name, password, db_type, app_key, app_secret, corpId, agentId)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.sorts},#{entity.name},#{entity.ipAddress},#{entity.port},#{entity.dbName},#{entity.userName},#{entity.password},#{entity.dbType},#{entity.appKey},#{entity.appSecret},#{entity.corpid},#{entity.agentid})
+        </foreach>
+        on duplicate key update
+        create_user_id = values(create_user_id),
+        create_time = values(create_time),
+        modify_user_id = values(modify_user_id),
+        modify_time = values(modify_time),
+        sts = values(sts),
+        sorts = values(sorts),
+        name = values(name),
+        ip_address = values(ip_address),
+        port = values(port),
+        db_name = values(db_name),
+        user_name = values(user_name),
+        password = values(password),
+        db_type = values(db_type),
+        app_key = values(app_key),
+        app_secret = values(app_secret),
+        corpId = values(corpId),
+        agentId = values(agentId)
+    </insert>
+    <!--通过主键修改方法-->
+    <update id="entity_update"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        update sys_application_account set
+        <trim suffix="" suffixOverrides=",">
+            <if test="create_user_id != null and create_user_id != ''">create_user_id = #{create_user_id},</if>
+            <if test="create_time != null">create_time = #{create_time},</if>
+            <if test="modify_user_id != null and modify_user_id != ''">modify_user_id = #{modify_user_id},</if>
+            <if test="modify_time != null">modify_time = #{modify_time},</if>
+            <if test="sts != null and sts != ''">sts = #{sts},</if>
+            <if test="sorts != null">sorts = #{sorts},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="ipAddress != null and ipAddress != ''">ip_address = #{ipAddress},</if>
+            <if test="port != null and port != ''">port = #{port},</if>
+            <if test="dbName != null and dbName != ''">db_name = #{dbName},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="password != null and password != ''">password = #{password},</if>
+            <if test="dbType != null and dbType != ''">db_type = #{dbType},</if>
+            <if test="appId != null and appId != ''">app_id = #{appId},</if>
+            <if test="appKey != null and appKey != ''">app_key = #{appKey},</if>
+            <if test="appSecret != null and appSecret != ''">app_secret = #{appSecret},</if>
+            <if test="corpid != null and corpid != ''">corpId = #{corpid},</if>
+            <if test="agentid != null and agentid != ''">agentId = #{agentid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+    <!-- 逻辑删除 -->
+    <update id="entity_logicDelete"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        update sys_application_account
+        set sts= 'N',
+            modify_time = #{modify_time},
+            modify_user_id = #{modify_user_id}
+        where id = #{id}
+    </update>
+    <!-- 多条件逻辑删除 -->
+    <update id="entity_logicDelete_Multi_Condition"
+            parameterType="com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity">
+        update sys_application_account set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
+        <trim prefix="where" prefixOverrides="and">
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="sts != null and sts != ''">and sts = #{sts}</if>
+            <if test="sorts != null">and sorts = #{sorts}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="ipAddress != null and ipAddress != ''">and ip_address = #{ipAddress}</if>
+            <if test="port != null and port != ''">and port = #{port}</if>
+            <if test="dbName != null and dbName != ''">and db_name = #{dbName}</if>
+            <if test="userName != null and userName != ''">and user_name = #{userName}</if>
+            <if test="password != null and password != ''">and password = #{password}</if>
+            <if test="dbType != null and dbType != ''">and db_type = #{dbType}</if>
+            <if test="appKey != null and appKey != ''">and app_key = #{appKey}</if>
+            <if test="appSecret != null and appSecret != ''">and app_secret = #{appSecret}</if>
+            <if test="corpid != null and corpid != ''">and corpId = #{corpid}</if>
+            <if test="appId != null and appId != ''">and app_id = #{appId}</if>
+            <if test="agentid != null and agentid != ''">and agentId = #{agentid}</if>
+            and sts='Y'
+        </trim>
+    </update>
+    <!--通过主键删除-->
+    <delete id="entity_delete">
+        delete
+        from sys_application_account
+        where id = #{id}
+    </delete>
+
+</mapper>
+

base-service/src/main/java/com/hzya/frame/sysnew/application/appAcount/service/ISysApplicationAccountService.java

@@ -0,0 +1,57 @@
+package com.hzya.frame.sysnew.application.appAcount.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/**
+ * 应用账户表(SysApplicationAccount)表服务接口
+ *
+ * @author xiang2lin
+ * @since 2025-05-10 15:52:25
+ */
+public interface ISysApplicationAccountService extends IBaseService<SysApplicationAccountEntity, String>{
+
+    /**
+     * 保存账户信息
+     * @param object
+     * @return
+     */
+    JsonResultEntity saveAccount(JSONObject object);
+
+    /**
+     * 更新账户信息
+     * @param object
+     * @return
+     */
+    JsonResultEntity updateAccount(JSONObject object);
+
+    /**
+     * 删除账户信息
+     * @param object
+     * @return
+     */
+    JsonResultEntity deleteAccount(JSONObject object);
+
+    /**
+     * 查询账户详情
+     * @param object
+     * @return
+     */
+    JsonResultEntity getAccount(JSONObject object);
+
+    /**
+     * 查询账户列表数据
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryAccountList(JSONObject object);
+
+    /**
+     * 查询账户分页数据
+     * @param object
+     * @return
+     */
+    JsonResultEntity queryAccountPaged(JSONObject object);
+}

base-service/src/main/java/com/hzya/frame/sysnew/application/appAcount/service/impl/SysApplicationAccountServiceImpl.java

@@ -0,0 +1,187 @@
+package com.hzya.frame.sysnew.application.appAcount.service.impl;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.sysnew.application.appAcount.entity.SysApplicationAccountEntity;
+import com.hzya.frame.sysnew.application.appAcount.dao.ISysApplicationAccountDao;
+import com.hzya.frame.sysnew.application.appAcount.service.ISysApplicationAccountService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 应用账户表(SysApplicationAccount)表服务实现类
+ *
+ * @author xiang2lin
+ * @since 2025-05-10 15:52:26
+ */
+@Service(value = "sysApplicationAccountService")
+public class SysApplicationAccountServiceImpl extends BaseService<SysApplicationAccountEntity, String> implements ISysApplicationAccountService {
+     
+    private ISysApplicationAccountDao sysApplicationAccountDao;
+    
+    @Autowired
+	public void setSysApplicationAccountDao(ISysApplicationAccountDao dao) {
+		this.sysApplicationAccountDao = dao;
+		this.dao = dao;
+	}
+
+	/**
+	 * 保存账户信息
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity saveAccount(JSONObject object) {
+		SysApplicationAccountEntity entity =  getData("jsonStr", object, SysApplicationAccountEntity.class);
+		try {
+			checkParam(entity,"save");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		//控制一下名字不能重复
+		List<SysApplicationAccountEntity> queryList = queryByName(entity);
+		if (CollectionUtils.isNotEmpty(queryList) && queryList.size() > 0){
+			return BaseResult.getFailureMessageEntity(entity.getName()+"重复");
+		}
+		sysApplicationAccountDao.save(entity);
+		return BaseResult.getSuccessMessageEntity("新增成功");
+	}
+
+	/**
+	 * 更新账户信息
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity updateAccount(JSONObject object) {
+		SysApplicationAccountEntity entity =  getData("jsonStr", object, SysApplicationAccountEntity.class);
+		try {
+			checkParam(entity,"update");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		//检查一下名字不能重复
+		List<SysApplicationAccountEntity> queryList = queryByName(entity);
+		if (CollectionUtils.isNotEmpty(queryList) && queryList.size() > 0){
+			for (SysApplicationAccountEntity acc : queryList) {
+				if (!acc.getId().equals(entity.getId())){
+					return BaseResult.getFailureMessageEntity(entity.getName()+"重复");
+				}
+			}
+		}
+		sysApplicationAccountDao.update(entity);
+		return BaseResult.getSuccessMessageEntity("更新成功");
+	}
+
+	/**
+	 * 删除账户信息
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity deleteAccount(JSONObject object) {
+		SysApplicationAccountEntity entity =  getData("jsonStr", object, SysApplicationAccountEntity.class);
+		try {
+			checkParam(entity,"delete");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		sysApplicationAccountDao.logicRemove(entity);
+		return BaseResult.getSuccessMessageEntity("删除成功");
+	}
+
+	/**
+	 * 查询账户详情
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity getAccount(JSONObject object) {
+		SysApplicationAccountEntity entity =  getData("jsonStr", object, SysApplicationAccountEntity.class);
+		try {
+			checkParam(entity,"get");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		SysApplicationAccountEntity sysApplicationAccountEntity = sysApplicationAccountDao.get(entity.getId());
+		return BaseResult.getSuccessMessageEntity("查询账户详情成功",sysApplicationAccountEntity);
+	}
+
+	/**
+	 * 查询账户列表数据
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryAccountList(JSONObject object) {
+		SysApplicationAccountEntity entity =  getData("jsonStr", object, SysApplicationAccountEntity.class);
+		try {
+			checkParam(entity,"queryList");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		List<SysApplicationAccountEntity> queryList = sysApplicationAccountDao.query(entity);
+		return BaseResult.getSuccessMessageEntity("查询列表成功",queryList);
+	}
+
+	/**
+	 * 查询账户分页数据
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public JsonResultEntity queryAccountPaged(JSONObject object) {
+		SysApplicationAccountEntity entity =  getData("jsonStr", object, SysApplicationAccountEntity.class);
+		try {
+			checkParam(entity,"queryPaged");
+		}catch (Exception e){
+			return BaseResult.getFailureMessageEntity(e.getMessage());
+		}
+		return null;
+	}
+
+
+	//根据账户名称查询
+	private List<SysApplicationAccountEntity> queryByName(SysApplicationAccountEntity entity){
+		if (StrUtil.isNotEmpty(entity.getName())){
+			SysApplicationAccountEntity account = new SysApplicationAccountEntity();
+			account.setName(entity.getName());
+			List<SysApplicationAccountEntity> queryList = sysApplicationAccountDao.query(account);
+			return queryList;
+		}
+		return null;
+	}
+	//数据检查
+	private void checkParam(SysApplicationAccountEntity entity,String type){
+		Assert.notNull(entity,"参数不能为空");
+		if ("save".equals(type)){
+			Assert.notEmpty(entity.getAppId(),"appId不能为空");
+			Assert.notEmpty(entity.getName(),"账户名称不能为空");
+		}else if ("update".equals(type)){
+			Assert.notEmpty(entity.getId(),"id不能为空");
+		}else if ("delete".equals(type)){
+			Assert.notEmpty(entity.getId(),"id不能为空");
+		}else if ("get".equals(type)){
+			Assert.notEmpty(entity.getId(),"id不能为空");
+		}else if ("queryList".equals(type)){
+			Assert.notEmpty(entity.getAppId(),"appId不能为空");
+		}else if ("queryPaged".equals(type)){
+			Assert.notNull(entity.getPageNum(),"pageNum不能为空");
+			Assert.notNull(entity.getPageSize(),"pageSize不能为空");
+		}
+	}
+}

base-service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationDto.java

@@ -61,6 +61,8 @@ public class SysApplicationDto {
     private List<SysApplicationApiParaEntity> apiParas;
     /**  系统类型  1、致远OA 2、用友U8C 3、用友BIP */
     private String appType;
+    //nifi的id
+    private String nifiAppId;
     //数据源
     private SysApplicationDatabaseEntity databaseEntity;
     private Integer pageNum;
@@ -271,5 +273,13 @@ public class SysApplicationDto {
     public void setAppType(String appType) {
         this.appType = appType;
     }
+
+    public String getNifiAppId() {
+        return nifiAppId;
+    }
+
+    public void setNifiAppId(String nifiAppId) {
+        this.nifiAppId = nifiAppId;
+    }
 }
 

base-service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.java

@@ -42,6 +42,18 @@ public class SysApplicationEntity extends BaseEntity {
    private String interfaceStatus;
   /**  数据源是否启用（1、开启 2、关闭） */
    private String dbStatus;
+   /**  新消息数 */
+   private int newMessageCount;
+   //nifi的appid
+   private String nifiAppId;
+
+    public int getNewMessageCount() {
+        return newMessageCount;
+    }
+
+    public void setNewMessageCount(int newMessageCount) {
+        this.newMessageCount = newMessageCount;
+    }
 
     /**  系统类型  1、致远OA 2、用友U8C 3、用友BIP */
     private String appType;
@@ -201,5 +213,13 @@ public class SysApplicationEntity extends BaseEntity {
     public void setAppType(String appType) {
         this.appType = appType;
     }
+
+    public String getNifiAppId() {
+        return nifiAppId;
+    }
+
+    public void setNifiAppId(String nifiAppId) {
+        this.nifiAppId = nifiAppId;
+    }
 }
 

base-service/src/main/java/com/hzya/frame/sysnew/application/entity/SysApplicationEntity.xml

@@ -23,6 +23,7 @@
            <result property="interfaceStatus" column="interface_status" jdbcType="VARCHAR"/>
            <result property="dbStatus" column="db_status" jdbcType="VARCHAR"/>
            <result property="appType" column="app_type" jdbcType="VARCHAR"/>
+           <result property="nifiAppId" column="nifi_app_id" jdbcType="VARCHAR"/>
            <result property="sorts" column="sorts" jdbcType="INTEGER"/>
            <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
            <result property="sts" column="sts" jdbcType="VARCHAR"/>
@@ -53,6 +54,7 @@
         ,interface_status 
         ,db_status 
         ,app_type
+        ,nifi_app_id
         ,sorts
         ,org_id 
         ,sts 
@@ -93,6 +95,7 @@
             <if test="interfaceStatus != null and interfaceStatus != ''"> and interface_status = #{interfaceStatus} </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
             <if test="appType != null and appType != ''"> and app_type = #{appType} </if>
+            <if test="nifiAppId != null and nifiAppId != ''"> and nifi_app_id = #{nifiAppId} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="sts != null and sts != ''"> and sts = #{sts} </if>
@@ -130,6 +133,7 @@
             <if test="interfaceStatus != null and interfaceStatus != ''"> and interface_status = #{interfaceStatus} </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
             <if test="appType != null and appType != ''"> and app_type = #{appType} </if>
+            <if test="nifiAppId != null and nifiAppId != ''"> and nifi_app_id = #{nifiAppId} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="sts != null and sts != ''"> and sts = #{sts} </if>
@@ -169,6 +173,7 @@
             <if test="interfaceStatus != null and interfaceStatus != ''"> and interface_status like concat('%',#{interfaceStatus},'%') </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status like concat('%',#{dbStatus},'%') </if>
             <if test="appType != null and appType != ''"> and app_type like concat('%',#{appType},'%') </if>
+            <if test="nifiAppId != null and nifiAppId != ''"> and nifi_app_id like concat('%',#{nifiAppId},'%') </if>
             <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
             <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
             <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
@@ -208,6 +213,7 @@
              <if test="interfaceStatus != null and interfaceStatus != ''"> or interface_status = #{interfaceStatus} </if>
              <if test="dbStatus != null and dbStatus != ''"> or db_status = #{dbStatus} </if>
              <if test="appType != null and appType != ''"> or app_type = #{appType} </if>
+             <if test="nifiAppId != null and nifiAppId != ''"> or nifi_app_id = #{nifiAppId} </if>
              <if test="sorts != null"> or sorts = #{sorts} </if>
              <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
               <if test="sts != null and sts != ''"> or sts = #{sts} </if>
@@ -246,6 +252,7 @@
             <if test="interfaceStatus != null and interfaceStatus != ''"> interface_status , </if>
             <if test="dbStatus != null and dbStatus != ''"> db_status , </if>
             <if test="appType != null and appType != ''"> app_type , </if>
+            <if test="nifiAppId != null and nifiAppId != ''"> nifi_app_id , </if>
             <if test="sorts != null"> sorts , </if>
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="sts != null and sts != ''"> sts , </if>
@@ -278,6 +285,7 @@
             <if test="interfaceStatus != null and interfaceStatus != ''"> #{interfaceStatus} ,</if>
             <if test="dbStatus != null and dbStatus != ''"> #{dbStatus} ,</if>
             <if test="appType != null and appType != ''"> #{appType} ,</if>
+            <if test="nifiAppId != null and nifiAppId != ''"> #{nifiAppId} ,</if>
             <if test="sorts != null"> #{sorts} ,</if>
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="sts != null and sts != ''"> #{sts} ,</if>
@@ -291,18 +299,18 @@
 </insert>
 <!-- 批量新增 -->
 <insert id="entityInsertBatch" >
-  insert into sys_application(app_logo, app_status, name, version_number, app_id, system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status,app_type, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id,  sts)
+  insert into sys_application(app_logo, app_status, name, version_number, app_id, system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status,app_type,nifi_app_id, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id,  sts)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.appType},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}, 'Y')
+    (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.appType},#{entity.nifiAppId},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id}, 'Y')
     </foreach>
 </insert>
 <!-- 批量新增或者修改-->
 <insert id="entityInsertOrUpdateBatch" >
-    insert into sys_application(app_logo, app_status, name, version_number,app_id,system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status,app_type, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id)
+    insert into sys_application(app_logo, app_status, name, version_number,app_id,system_address, access_mode, affiliation_field, manufacturer, app_introduction, client_path, web_path, program_path, public_key, secret_key, interface_address, interface_status, db_status,app_type,nifi_app_id, sorts, org_id, sts, create_time, create_user_id, modify_time, modify_user_id)
     values
     <foreach collection="entities" item="entity" separator=",">
-    (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.appType},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id})
+    (#{entity.appLogo},#{entity.appStatus},#{entity.name},#{entity.versionNumber},#{entity.appId},#{entity.systemAddress},#{entity.accessMode},#{entity.affiliationField},#{entity.manufacturer},#{entity.appIntroduction},#{entity.clientPath},#{entity.webPath},#{entity.programPath},#{entity.publicKey},#{entity.secretKey},#{entity.interfaceAddress},#{entity.interfaceStatus},#{entity.dbStatus},#{entity.appType},#{entity.nifiAppId},#{entity.sorts},#{entity.org_id},#{entity.sts},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id})
     </foreach>
     on duplicate key update
     app_logo = values(app_logo),
@@ -324,6 +332,7 @@
     interface_status = values(interface_status),
     db_status = values(db_status),
     app_type = values(app_type),
+    nifi_app_id = values(nifi_app_id),
     sorts = values(sorts),
     org_id = values(org_id),
     sts = values(sts),
@@ -354,6 +363,7 @@ update sys_application  set
   <if test="interfaceStatus != null and interfaceStatus != ''"> interface_status = #{interfaceStatus},</if>
   <if test="dbStatus != null and dbStatus != ''"> db_status = #{dbStatus},</if>
   <if test="appType != null and appType != ''"> app_type = #{appType},</if>
+  <if test="nifiAppId != null and nifiAppId != ''"> nifi_app_id = #{nifiAppId},</if>
   <if test="sorts != null"> sorts = #{sorts},</if>
   <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
     <if test="sts != null and sts != ''"> sts = #{sts},</if>
@@ -393,6 +403,7 @@ update sys_application  set sts= 'N' ,modify_time = #{modify_time},modify_user_i
             <if test="interfaceStatus != null and interfaceStatus != ''"> and interface_status = #{interfaceStatus} </if>
             <if test="dbStatus != null and dbStatus != ''"> and db_status = #{dbStatus} </if>
             <if test="appType != null and appType != ''"> and app_type = #{appType} </if>
+            <if test="nifiAppId != null and nifiAppId != ''"> and nifi_app_id = #{nifiAppId} </if>
             <if test="sorts != null"> and sorts = #{sorts} </if>
                          <if test="sts != null and sts != ''"> and sts = #{sts} </if>
                                                                 and sts='Y'
@@ -421,6 +432,7 @@ update sys_application  set sts= 'N' ,modify_time = #{modify_time},modify_user_i
         ,a.interface_status  as interfaceStatus
         ,a.db_status  as dbStatus
         ,a.app_type  as appType
+        ,a.nifi_app_id  as nifiAppId
         from sys_application  a
         <trim prefix="where" prefixOverrides="and">
             <if test="affiliationField != null and affiliationField != ''"> and a.affiliation_field  = #{affiliationField}  </if>

base-service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginDto.java

@@ -20,6 +20,16 @@ public class SysApplicationPluginDto {
     private Integer pageNum;
     private Integer pageSize;
 
+    private String typeId;
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
     public String getAppId() {
         return appId;
     }

base-service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.java

@@ -22,13 +22,33 @@ public class SysApplicationPluginEntity extends BaseEntity {
    private String pluginVersion;
   /**  描述 */
    private String pluginRemark;
+   /**  插件类型id */
+   private String typeId;
+   /**  插件类型名称 */
+   private String typeName;
   /**  发布日期 */
    private Date releaseDate;
   /**  启用停用（1启用2停用） */
    private String pluginStatus;
-
+   /**  附件id */
    private String attachmentId;
 
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
     public String getPluginPackageName() {
         return pluginPackageName;
     }

base-service/src/main/java/com/hzya/frame/sysnew/application/plugin/entity/SysApplicationPluginEntity.xml

@@ -20,6 +20,8 @@
            <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
            <result property="attachmentId" column="attachment_id" jdbcType="VARCHAR"/>
            <result property="pluginPackageName" column="plugin_package_name" jdbcType="VARCHAR"/>
+           <result property="typeId" column="type_id" jdbcType="VARCHAR"/>
+            <result property="typeName" column="type_name" jdbcType="VARCHAR"/>
         </resultMap>
     <!-- 查询的字段-->
     <sql id = "SysApplicationPluginEntity_Base_Column_List">
@@ -40,6 +42,7 @@
         ,org_id
         ,attachment_id
         ,plugin_package_name
+        ,type_id
      </sql>
     <!--通过ID获取数据 -->
     <select id="entity_get" resultMap="get-SysApplicationPluginEntity-result">
@@ -70,6 +73,7 @@
             <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
             <if test="attachmentId != null and attachmentId != ''"> and attachment_id = #{attachmentId} </if>
             <if test="pluginPackageName != null and pluginPackageName != ''"> and plugin_package_name = #{pluginPackageName} </if>
+            <if test="typeId != null and typeId != ''"> and type_id = #{typeId} </if>
             and sts='Y'
     </trim>
     <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
@@ -105,30 +109,34 @@
 
     <!-- 分页查询列表 采用like格式 -->
 <select id="entity_list_like" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginEntity">
-    select
-    <include refid="SysApplicationPluginEntity_Base_Column_List" />
-    from sys_application_plugin
+    SELECT
+    p.*,
+    type.NAME AS type_name
+    FROM
+    sys_application_plugin p
+    LEFT JOIN sys_application_plugin_type type ON p.type_id = type.id
     <trim prefix="where" prefixOverrides="and"> 
-        <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
-            <if test="appId != null and appId != ''"> and app_id like concat('%',#{appId},'%') </if>
-            <if test="pluginName != null and pluginName != ''"> and plugin_name like concat('%',#{pluginName},'%') </if>
-            <if test="pluginCode != null and pluginCode != ''"> and plugin_code like concat('%',#{pluginCode},'%') </if>
-            <if test="pluginVersion != null and pluginVersion != ''"> and plugin_version like concat('%',#{pluginVersion},'%') </if>
-            <if test="pluginRemark != null and pluginRemark != ''"> and plugin_remark like concat('%',#{pluginRemark},'%') </if>
-            <if test="releaseDate != null"> and release_date like concat('%',#{releaseDate},'%') </if>
-            <if test="pluginStatus != null and pluginStatus != ''"> and plugin_status like concat('%',#{pluginStatus},'%') </if>
-            <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
-            <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
-            <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
-            <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
-            <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
-            <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
-            <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
-            <if test="attachmentId != null and attachmentId != ''"> and attachment_id like concat('%',#{attachmentId},'%') </if>
-            <if test="pluginPackageName != null and pluginPackageName != ''"> and plugin_package_name like concat('%',#{pluginPackageName},'%') </if>
-            and sts='Y'
+        <if test="id != null and id != ''"> and p.id like concat('%',#{id},'%') </if>
+            <if test="appId != null and appId != ''"> and p.app_id like concat('%',#{appId},'%') </if>
+            <if test="pluginName != null and pluginName != ''"> and p.plugin_name like concat('%',#{pluginName},'%') </if>
+            <if test="pluginCode != null and pluginCode != ''"> and p.plugin_code like concat('%',#{pluginCode},'%') </if>
+            <if test="pluginVersion != null and pluginVersion != ''"> and p.plugin_version like concat('%',#{pluginVersion},'%') </if>
+            <if test="pluginRemark != null and pluginRemark != ''"> and p.plugin_remark like concat('%',#{pluginRemark},'%') </if>
+            <if test="releaseDate != null"> and p.release_date like concat('%',#{releaseDate},'%') </if>
+            <if test="pluginStatus != null and pluginStatus != ''"> and p.plugin_status like concat('%',#{pluginStatus},'%') </if>
+            <if test="sorts != null"> and p.sorts like concat('%',#{sorts},'%') </if>
+            <if test="create_user_id != null and create_user_id != ''"> and p.create_user_id like concat('%',#{create_user_id},'%') </if>
+            <if test="create_time != null"> and p.create_time like concat('%',#{create_time},'%') </if>
+            <if test="modify_user_id != null and modify_user_id != ''"> and p.modify_user_id like concat('%',#{modify_user_id},'%') </if>
+            <if test="modify_time != null"> and p.modify_time like concat('%',#{modify_time},'%') </if>
+            <if test="sts != null and sts != ''"> and p.sts like concat('%',#{sts},'%') </if>
+            <if test="org_id != null and org_id != ''"> and p.org_id like concat('%',#{org_id},'%') </if>
+            <if test="attachmentId != null and attachmentId != ''"> and p.attachment_id like concat('%',#{attachmentId},'%') </if>
+            <if test="pluginPackageName != null and pluginPackageName != ''"> and p.plugin_package_name like concat('%',#{pluginPackageName},'%') </if>
+            <if test="typeId != null and typeId != ''"> and p.type_id like concat('%',#{typeId},'%') </if>
+            and p.sts='Y'
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
+    <if test=" sort == null or sort == ''.toString() "> order by p.sorts asc</if>
     <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
 
@@ -182,6 +190,7 @@
             <if test="org_id != null and org_id != ''"> org_id , </if>
             <if test="attachmentId != null and attachmentId != ''"> attachment_id , </if>
             <if test="pluginPackageName != null and pluginPackageName != ''"> plugin_package_name , </if>
+            <if test="typeId != null and typeId != ''"> type_id , </if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -203,6 +212,7 @@
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
             <if test="attachmentId != null and attachmentId != ''"> #{attachmentId} ,</if>
             <if test="pluginPackageName != null and pluginPackageName != ''"> #{pluginPackageName} ,</if>
+            <if test="typeId != null and typeId != ''"> #{typeId} ,</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
@@ -254,9 +264,10 @@ update sys_application_plugin  set
     <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
     <if test="modify_time != null"> modify_time = #{modify_time},</if>
     <if test="sts != null and sts != ''"> sts = #{sts},</if>
-  <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
+    <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
     <if test="attachmentId != null and attachmentId != ''"> attachment_id = #{attachmentId},</if>
     <if test="pluginPackageName != null and pluginPackageName != ''"> plugin_package_name = #{pluginPackageName},</if>
+    <if test="typeId != null and typeId != ''"> type_id = #{typeId},</if>
   </trim>
 where id = #{id}
 </update>
@@ -291,16 +302,20 @@ update sys_application_plugin  set sts= 'N' ,modify_time = #{modify_time},modify
 
     <!-- 分页查询列表 采用like格式 -->
     <select id="queryListlike" resultMap="get-SysApplicationPluginEntity-result" parameterType = "com.hzya.frame.sysnew.application.plugin.entity.SysApplicationPluginDto">
-        select
-        <include refid="SysApplicationPluginEntity_Base_Column_List" />
-        from sys_application_plugin
+        SELECT
+        p.*,
+        type.NAME AS type_name
+        FROM
+        sys_application_plugin p
+        LEFT JOIN sys_application_plugin_type type ON p.type_id = type.id
         <trim prefix="where" prefixOverrides="and">
-            <if test="appId != null and appId != ''"> and app_id = #{appId} </if>
-            <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
-            <if test="name != null and name != ''"> and ( plugin_name like concat('%',#{name},'%')  or plugin_code like concat('%',#{name},'%') or plugin_version like concat('%',#{name},'%') )</if>
-            and sts='Y'
+            <if test="appId != null and appId != ''"> and p.app_id = #{appId} </if>
+            <if test="id != null and id != ''"> and p.id like concat('%',#{id},'%') </if>
+            <if test="name != null and name != ''"> and ( p.plugin_name like concat('%',#{name},'%')  or p.plugin_code like concat('%',#{name},'%') or p.plugin_version like concat('%',#{name},'%') )</if>
+            <if test="typeId != null and typeId != ''"> and p.type_id like concat('%',#{typeId},'%')</if>
+            and p.sts='Y'
         </trim>
-        order by sorts asc
+        order by p.sorts asc
     </select>
 
 </mapper>

base-service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/ISysApplicationPluginTypeDao.java

@@ -0,0 +1,15 @@
+package com.hzya.frame.sysnew.application.pluginType.dao;
+
+import com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity;
+import com.hzya.frame.basedao.dao.IBaseDao; 
+
+/**
+ * 插件类型表(sys_application_plugin_type: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+public interface ISysApplicationPluginTypeDao extends IBaseDao<SysApplicationPluginTypeEntity, String> {
+
+}
+

base-service/src/main/java/com/hzya/frame/sysnew/application/pluginType/dao/impl/SysApplicationPluginTypeDaoImpl.java

@@ -0,0 +1,17 @@
+package com.hzya.frame.sysnew.application.pluginType.dao.impl;
+
+import com.hzya.frame.sysnew.application.pluginType.entity.SysApplicationPluginTypeEntity;
+import com.hzya.frame.sysnew.application.pluginType.dao.ISysApplicationPluginTypeDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 插件类型表(SysApplicationPluginType)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-09-19 09:56:24
+ */
+@Repository(value = "SysApplicationPluginTypeDaoImpl")
+public class SysApplicationPluginTypeDaoImpl extends MybatisGenericDao<SysApplicationPluginTypeEntity, String> implements ISysApplicationPluginTypeDao{
+ 
+}
+