调整rest密码

base-buildpackage/pom.xml

@@ -38,19 +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>
-       
+        <profile>
+            <id>wansheng</id> <!--万向-->
+            <properties>
+                <profile.active>wansheng</profile.active>
+            </properties>
+        </profile>
     </profiles>
     <build>
         <finalName>kangarooDataCenterV3</finalName>

base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java

@@ -2,6 +2,7 @@ package com.hzya.frame.plugin.masterData.plugin;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService;
+import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,6 +52,7 @@ public class MdmPluginInitializer extends PluginBaseEntity{
     public JsonResultEntity executeBusiness(JSONObject requestJson) {
         try {
             logger.info("======开始执行主数据信息同步========");
+            //return BaseResult.getSuccessMessageEntity("成功123");
             return masterDataService.queryArchives(requestJson);
         }catch (Exception e){
             logger.info("======执行主数据同步失败:{}========",e.getMessage());

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/dao/IWsCustomerSynchronizationEventDao.java

@@ -0,0 +1,18 @@
+package com.hzya.frame.plugin.wscustomersynchronizationevent.dao;
+
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.entity.WsCustomerSynchronizationEventEntity;
+
+/****
+ * 万盛客商档案同步插件
+ * @content:
+ * @author 👻👻👻👻👻👻👻👻 gjh
+ * @date  2025-03-03 10:57
+ * @param
+ * @return
+ **/
+public interface IWsCustomerSynchronizationEventDao extends IBaseDao<WsCustomerSynchronizationEventEntity, String> {
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/dao/impl/WsCustomerSynchronizationEventDaoImpl.java

@@ -0,0 +1,18 @@
+package com.hzya.frame.plugin.wscustomersynchronizationevent.dao.impl;
+
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.dao.IWsCustomerSynchronizationEventDao;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.entity.WsCustomerSynchronizationEventEntity;
+
+ /***
+  * 万盛客商
+  * @content:
+  * @author 👻👻👻👻👻👻👻👻 gjh
+  * @date  2025-03-03 11:12
+  * @param
+  * @return
+  **/
+public class WsCustomerSynchronizationEventDaoImpl extends MybatisGenericDao<WsCustomerSynchronizationEventEntity, String> implements IWsCustomerSynchronizationEventDao {
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/entity/WsCustomerSynchronizationEventEntity.java

@@ -0,0 +1,16 @@
+package com.hzya.frame.plugin.wscustomersynchronizationevent.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/****
+ *  万盛客商档案实体类
+ * @content:
+ * @author 👻👻👻👻👻👻👻👻 gjh
+ * @date  2025-03-03 10:53
+ * @param
+ * @return
+ **/
+public class WsCustomerSynchronizationEventEntity extends BaseEntity {
+
+}
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/entity/WsCustomerSynchronizationEventEntity.xml

@@ -0,0 +1,31 @@
+<?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.plugin.masterData.dao.impl.MdmDaoImpl">
+
+    <resultMap id="get-WsCustomerSynchronizationEventEntity-result" type="com.hzya.frame.plugin.wscustomersynchronizationevent.entity.WsCustomerSynchronizationEventEntity" >
+       <result property="id" column="id" jdbcType="VARCHAR"/>
+
+        </resultMap>
+    <!-- 查询的字段-->
+    <sql id = "WsCustomerSynchronizationEventEntity_Base_Column_List">
+        id
+
+     </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-WsCustomerSynchronizationEventEntity-result" parameterType = "com.hzya.frame.plugin.wscustomersynchronizationevent.entity.WsCustomerSynchronizationEventEntity">
+    select
+    <include refid="WsCustomerSynchronizationEventEntity_Base_Column_List" />
+    from mdm_customer
+    <trim prefix="where" prefixOverrides="and">
+        <if test="id != null and id != ''"> and id = #{id} </if>
+
+    </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>
+
+
+
+
+</mapper>
+

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/plugin/WsCustomerSynchronizationEventPluginInitializer.java

@@ -0,0 +1,64 @@
+package com.hzya.frame.plugin.wscustomersynchronizationevent.plugin;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.service.IWsCustomerSynchronizationEventService;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 主数据同步
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public class WsCustomerSynchronizationEventPluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(WsCustomerSynchronizationEventPluginInitializer.class);
+    @Autowired
+    private IWsCustomerSynchronizationEventService customerSynchronizationEventService;
+
+      @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "WsCustomerSynchronizationEventPluginInitializer";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "万盛A8客商接收数据插件";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "WsCustomerSynchronizationEventPluginInitializer";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+        try {
+            logger.info("======开始执行客商档案同步========");
+            return customerSynchronizationEventService.customerSynchronization(requestJson);
+//            return masterDataService.queryArchives(requestJson);
+        }catch (Exception e){
+            logger.info("======客商档案同步失败:{}========",e.getMessage());
+            e.printStackTrace();
+            return BaseResult.getFailureMessageEntity("======客商档案同步失败:{}========",e.getMessage());
+        }
+    }
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/service/IWsCustomerSynchronizationEventService.java

@@ -0,0 +1,28 @@
+package com.hzya.frame.plugin.wscustomersynchronizationevent.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.entity.WsCustomerSynchronizationEventEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+/***
+ * 万盛客商档案同步插件
+ * @content:
+ * @author 👻👻👻👻👻👻👻👻 gjh
+ * @date  2025-03-03 10:55
+ * @param
+ * @return
+ **/
+public interface IWsCustomerSynchronizationEventService extends IBaseService<WsCustomerSynchronizationEventEntity, String> {
+
+    /****
+     *  万盛客商档案同步插件，根据不同类型事件处理客商信息
+     * @content: onBeforeStart 发起前验证供应商重复  onProcessFinished  结束后同步数据到U8C
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date  2025-03-03 14:11
+     * @param
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    JsonResultEntity customerSynchronization(JSONObject requestJson);
+
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/wscustomersynchronizationevent/service/impl/WsCustomerSynchronizationEventServiceImpl.java

@@ -0,0 +1,515 @@
+package com.hzya.frame.plugin.wscustomersynchronizationevent.service.impl;
+
+import cn.hutool.core.map.MapBuilder;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.dao.IWsCustomerSynchronizationEventDao;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.entity.WsCustomerSynchronizationEventEntity;
+import com.hzya.frame.plugin.wscustomersynchronizationevent.service.IWsCustomerSynchronizationEventService;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import com.sun.org.apache.xerces.internal.dom.DeferredEntityReferenceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Map;
+
+/***
+ * 万盛客商档案同步插件
+ * @content:
+ * @author 👻👻👻👻👻👻👻👻 gjh
+ * @date 2025-03-03 10:56
+ * @param
+ * @return
+ **/
+public class WsCustomerSynchronizationEventServiceImpl extends BaseService<WsCustomerSynchronizationEventEntity, String> implements IWsCustomerSynchronizationEventService {
+   //定义两个环境属性，根据环境绑定OA参数
+    private final String TEST = "TEST";
+    private final String DEV = "DEV";
+    private IWsCustomerSynchronizationEventDao wsCustomerSynchronizationEventDao;
+
+    @Autowired
+    public void setWsCustomerSynchronizationEventDao(IWsCustomerSynchronizationEventDao wsCustomerSynchronizationEventDao) {
+        this.wsCustomerSynchronizationEventDao = wsCustomerSynchronizationEventDao;
+        this.dao = wsCustomerSynchronizationEventDao;
+    }
+
+    @Override
+    public JsonResultEntity customerSynchronization(JSONObject requestJson) {
+        JSONObject reqJson = new JSONObject();
+        JSONObject jsonStr = requestJson.getJSONObject("jsonStr");
+        JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr");
+        String formAppId = requestJson.getString("formAppId");
+        String eventType = requestJson.getString("eventType");
+        switch (eventType) {
+            case "onBeforeStart":
+                //发起前事件，验证供应商重复
+                return validateCustomerName(businessDataStr);
+            case "onBeforeFinishWorkitem":
+                //发起前事件，OA插件错误,临时配置事件
+                return validateCustomerName(businessDataStr);
+            case "onProcessFinished":
+                //流程结束事件，同步客商到U8C
+                return optionCustomerSynchronization(businessDataStr);
+            default:
+                return BaseResult.getFailureMessageEntity("未匹配到流程监听事件！当前传入的eventType：" + eventType);
+        }
+
+    }
+
+    /****
+     * 验证客商档案重复
+     * @content:
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2025-03-03 15:22
+     * @param
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    private JsonResultEntity validateCustomerName(JSONObject data) {
+        JSONObject formBean = data.getJSONObject("formmain_4389");
+        //客商名称
+        String field0006 = formBean.getString("field0006").trim();
+        //纳税人登记号
+        String field0007 = formBean.getString("field0007");
+        JSONObject requestJson = new JSONObject();
+        requestJson.put("custnameis", field0006);
+        String body = requestApi("validateCustomerName", requestJson, "800054", "8000540095", null);
+        JSONObject req = JSON.parseObject(body);
+        boolean flag = req.getBoolean("flag");
+        if (flag) {
+            JSONObject attribute = req.getJSONObject("attribute");
+            String status = attribute.getString("status");
+            if ("success".equals(status)) {
+                JSONObject detailsData = attribute.getJSONObject("data");
+                Integer allcount = detailsData.getInteger("allcount");
+                if (allcount > 0) {
+                    return BaseResult.getFailureMessageEntity("客商名称重复！");
+                } else {
+                    requestJson = new JSONObject();
+                    if(null != field0007 && !"".equals(field0007)){
+                        if(field0007.trim().length()>18){
+                            logger.info("当前纳税人识别号接收数据field0007.trim():"+field0007.trim());
+                            return BaseResult.getFailureMessageEntity("纳税人识别号不允许超过18位！");
+                        }
+                        requestJson.put("taxpayer", field0007.trim());
+                        body = requestApi("validateCustomerName", requestJson, "800054", "8000540095", null);
+                        req = JSON.parseObject(body);
+                        flag = req.getBoolean("flag");
+                        if (flag) {
+                            attribute = req.getJSONObject("attribute");
+                            status = attribute.getString("status");
+                            if ("success".equals(status)) {
+                                detailsData = attribute.getJSONObject("data");
+                                allcount = detailsData.getInteger("allcount");
+                                if (allcount > 0) {
+                                    return BaseResult.getFailureMessageEntity("纳税人识别号重复！");
+                                } else {
+                                    return BaseResult.getSuccessMessageEntity("客商未重复！");
+                                }
+                            } else {
+                                return BaseResult.getFailureMessageEntity("转发失败！");
+                            }
+                        } else {
+                            return BaseResult.getFailureMessageEntity("转发失败！" + req.getString("msg"));
+                        }
+                    }else{
+                        return BaseResult.getSuccessMessageEntity("纳税人识别号为空，不校验！");
+                    }
+                }
+            } else {
+                return BaseResult.getFailureMessageEntity("转发失败！");
+            }
+        } else {
+
+            return BaseResult.getFailureMessageEntity("转发失败！" + req.getString("msg"));
+        }
+
+
+    }
+
+
+    /****
+     * 执行客商同步新增和分配
+     * @content:
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2025-03-04 10:45
+     * @param
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     **/
+    private JsonResultEntity optionCustomerSynchronization(JSONObject data) {
+
+        JSONObject formBean = data.getJSONObject("formmain_4389");
+        //客商名称
+        String field0006 = formBean.getString("field0006");
+        //纳税人登记号
+        String field0007 = formBean.getString("field0007");
+        //绑定客商参数
+        JSONObject requestJson = bindMerchantParameters(data, DEV);
+        String apiCode = "8000540093";
+        String body = requestApi("optionCustomerSynchronization客商新增", requestJson, "800054", apiCode, null);
+        JSONObject req = JSON.parseObject(body);
+        boolean flag = req.getBoolean("flag");
+        String pk_cubasdoc = null;
+        if (flag) {
+            JSONObject attribute = req.getJSONObject("attribute");
+            String status = attribute.getString("status");
+            if ("success".equals(status)) {
+                JSONArray returnData = attribute.getJSONArray("data");
+                if (null != returnData && returnData.size() > 0) {
+                    pk_cubasdoc = returnData.getJSONObject(0).getJSONObject("parentvo").getString("pk_cubasdoc");
+                    String custcode = returnData.getJSONObject(0).getJSONObject("parentvo").getString("custcode");
+                    //执行客商档案编码回传OA
+                    updateCustomerCode(formBean.getString("id"), custcode,DEV);
+
+                }
+                logger.info("客商新增成功！返回数据", body);
+            } else {
+                logger.info("客商新增失败！返回数据", body);
+            }
+        } else {
+            return BaseResult.getFailureMessageEntity("转发失败！" + req.getJSONObject("attribute").getString("errormsg"));
+        }
+        //绑定客商分配参数
+        requestJson = bindMerchantDefineParameters(data, pk_cubasdoc,DEV);
+        try {
+            logger.info("新增客商后客商分配参数休眠10秒后触发");
+            // 休眠 10 秒，1000 毫秒为 1 秒，10 秒则是 10 * 1000
+            Thread.sleep(10 * 1000);
+        } catch (InterruptedException e) {
+            // 处理中断异常，这里简单打印异常信息
+            logger.info("新增客商后客商分配参数休眠10秒失败"+e.getMessage());
+            e.printStackTrace();
+        }
+        body = requestApi("optionCustomerSynchronization客商分配", requestJson, "800054", "8000540094", null);
+        req = JSON.parseObject(body);
+        flag = req.getBoolean("flag");
+        if (flag) {
+            JSONObject attribute = req.getJSONObject("attribute");
+            String status = attribute.getString("status");
+            if ("success".equals(status)) {
+                logger.info("客商分配成功！返回数据", body);
+            } else {
+                logger.info("客商分配失败！返回数据", body);
+            }
+        } else {
+            return BaseResult.getFailureMessageEntity("转发失败！" + req.getJSONObject("attribute").getString("errormsg"));
+        }
+        return BaseResult.getSuccessMessageEntity("执行客商同步方法成功");
+
+    }
+
+    /***
+     * 更新OA客商编码
+     * @content:
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2025-03-07 16:43
+     * @param
+     * @return com.alibaba.fastjson.JSONObject
+     **/
+    private JSONObject updateCustomerCode(String id, String custcode,String environment ) {
+        String sql = "update formmain_4389 set field0005 = '" + custcode + "' where id =  " + id;
+
+
+        String md5 = SecureUtil.md5(sql);
+        System.out.println("明文摘要" + md5);
+        String key = "`o7eotan9ws8c:aj";
+        String encrypt = SecureUtil.aes(key.getBytes()).encryptHex(sql);
+        JSONObject requestJson = new JSONObject();
+        requestJson.put("userName", "hzya_rest");
+        /** 生产环境和测试环境字段不一致，根据环境切换绑定*/
+        String pk_currtype = null;
+        if(DEV.equals(environment)){
+            //所属地区编码
+            requestJson.put("password", "23208c92-2e52-404a-a714-52061c2f915c");
+//            requestJson.put("password", "2d6dd7fb-239a-4a0b-8c0a-5003647e9238");
+        }else{
+            requestJson.put("password", "23208c92-2e52-404a-a714-52061c2f915c");
+        }
+        requestJson.put("data", encrypt);
+        requestJson.put("sign", md5);
+        String tokenRest = requestApi("获取token", requestJson, "800055", "8000550010", null);
+        String token = JSON.parseObject(tokenRest).getJSONObject("attribute").getString("id");
+        String result = requestApi("更新A8客商档案", requestJson, "800055", "8000550000", token);
+        //调用OArest接口
+        logger.info("更新A8客商档案结果:" + result);
+
+        return null;
+    }
+
+    /***
+     * 绑定客商分配参数
+     * @content:
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2025-03-05 15:02
+     * @param
+     * @param pk_cubasdoc
+     * @return com.alibaba.fastjson.JSONObject
+     **/
+    private JSONObject bindMerchantDefineParameters(JSONObject data, String pk_cubasdoc,String environment) {
+        JSONObject formBean = data.getJSONObject("formmain_4389");
+        JSONObject returnData = new JSONObject();
+        JSONArray custbasvo = new JSONArray();
+        //客商档案
+        JSONObject customer = new JSONObject();
+
+
+        if(DEV.equals(environment)){
+            //分配公司
+            customer.put("pk_corp", formBean.getString("field0058"));
+            //币种类别
+            customer.put("pk_currtype1", formBean.getString("field0062"));
+        }else{
+            //分配公司
+            customer.put("pk_corp", formBean.getString("field0064"));
+            //币种类别
+            customer.put("pk_currtype1", formBean.getString("field0057"));
+        }
+
+
+        String custprop = formBean.getString("field0027");
+        //客商属性 0：客户，1：供应商，2 ：客商
+        switch (custprop) {
+            case "4109154014131407336":
+                //客户
+                custprop = "0";
+                break;
+            case "-6536959240623403744":
+                //供应商
+                custprop = "1";
+                break;
+            case "5695613751532077780":
+                //客商
+                custprop = "2";
+                break;
+            default:
+                custprop = null;
+                break;
+        }
+        customer.put("custprop", custprop);
+        //客商ID
+        customer.put("pk_cubasdoc", pk_cubasdoc);
+        customer.put("creator", "admin");
+        custbasvo.add(customer);
+        returnData.put("custbasvo", custbasvo);
+        return returnData;
+    }
+
+    /****
+     * 请求API
+     * @content:
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2025-03-04 16:52
+     * @param
+     * @return java.lang.String
+     **/
+    private String requestApi(String method, JSONObject requestJson, String appId, String apiCode, String token) {
+        Map<String, String> headerMap = MapBuilder.<String, String>create(true)
+                .put("apiCode", String.valueOf(apiCode))
+                //这里用中台做为发送方
+                .put("publicKey", "ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj")
+                .put("secretKey", "fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")
+                .put("appId", appId)
+                .build();
+        if (null != token) {
+            headerMap.put("token", token);
+        }
+        String body = HttpRequest.post("http://127.0.0.1:10085/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(requestJson.toJSONString()).timeout(60000).execute().body();
+        logger.info("中台转发到ESB" + method + ":{}", body);
+        return body;
+    }
+
+    /****
+     * 绑定客商新增OA和U8C客商参数
+     * @content:
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2025-03-04 10:53
+     * @param
+     * @return com.alibaba.fastjson.JSONObject
+     **/
+    private JSONObject bindMerchantParameters(JSONObject data,String environment) {
+        JSONObject formBean = data.getJSONObject("formmain_4389");
+        JSONObject returnData = new JSONObject();
+        JSONArray cbdocvo = new JSONArray();
+        //客商档案
+        JSONObject customer = new JSONObject();
+        JSONArray banks = new JSONArray();
+        JSONObject bank = new JSONObject();
+        JSONObject parentvo = new JSONObject();
+        bank.put("accaddr", "银行地址");
+
+        /** 生产环境和测试环境字段不一致，根据环境切换绑定*/
+        String pk_currtype = null;
+        if(DEV.equals(environment)){
+            //所属地区编码
+            parentvo.put("pk_areacl", formBean.getString("field0060"));
+            //币种类别
+            pk_currtype = formBean.getString("field0062");
+            //银行类别
+            bank.put("banktypename", formBean.getString("field0064"));
+        }else{
+            //所属地区编码
+            parentvo.put("pk_areacl", formBean.getString("field0062"));
+            //币种类别
+            pk_currtype = formBean.getString("field0057");
+            //银行类别 TODO 修改为取编码
+            bank.put("banktypename", formBean.getString("field0036"));
+        }
+        //账户属性
+        String accountproperty = formBean.getString("field0042")== null?"":formBean.getString("field0042");
+        switch (accountproperty) {
+            case "-3164025096780690930":
+                accountproperty = "电汇账户";
+                break;
+            case "7943667274710336919":
+                accountproperty = "电汇和承兑账户";
+                break;
+            case "2952563644985590023":
+                accountproperty = "承兑账户";
+                break;
+            default:
+                accountproperty = null;
+                break;
+        }
+        //账户性质 field0042
+        bank.put("remcode", accountproperty);
+        //银行账号
+        bank.put("account", formBean.getString("field0011"));
+        //账户名称
+        bank.put("accountname", formBean.getString("field0012"));
+        bank.put("defflag", "Y");
+        bank.put("memo", formBean.getString("field0054"));
+        //开户银行 传递以后名称
+        bank.put("accname", formBean.getString("field0013"));
+//        bank.put("pk_bankdoc", formBean.getString("field0013"));
+
+        //新增固定传递集团
+        bank.put("pk_corp", formBean.getString("0001"));
+
+        bank.put("pk_currtype", pk_currtype);
+        banks.add(bank);
+
+        //创建人 U8C 制单人 admin
+//        parentvo.put("creator",formBean.getString("field0019"));
+        parentvo.put("creator", "admin");
+
+        //客商名称
+        parentvo.put("custname", formBean.getString("field0006").trim());
+
+        //客商类型（0 - 外部单位1 - 内部核算单位2 - 内部法人单位3 - 内部渠道成员）
+        String custprop = formBean.getString("field0026")== null?"":formBean.getString("field0026");
+        switch (custprop) {
+            case "-5116388890160378443":
+                custprop = "0";
+                break;
+            case "8996290534573949076":
+                custprop = "1";
+                break;
+            case "-2495523144656008721":
+                custprop = "2";
+                break;
+            case "7042886455598794854":
+                custprop = "3";
+                break;
+            default:
+                custprop = null;
+                break;
+        }
+
+        parentvo.put("custprop", custprop);
+        //客商简称
+        parentvo.put("custshortname", formBean.getString("field0001"));
+        //销售方式
+        String def1 = formBean.getString("field0024")== null?"":formBean.getString("field0024");
+
+        switch (def1) {
+            case "-285414580163689148":
+                def1 = "经销";
+                break;
+            case "-3463202988521339445":
+                def1 = "直销";
+                break;
+            default:
+                def1 = null;
+                break;
+        }
+        //销售方式
+        parentvo.put("def1", def1);
+
+        // 运输 自定义项8   001 是  002 否
+
+        String def8 = formBean.getString("field0048")== null?"":formBean.getString("field0048");
+
+        switch (def8) {
+            case "-8661769604040273924":
+                def8 = "001";
+                break;
+            case "-5350125814390239390":
+                def8 = "002";
+                break;
+            default:
+                def8 = null;
+                break;
+        }
+        parentvo.put("def8", def8);
+        //货代 自定义项7  001 是  002 否
+        String def7 = formBean.getString("field0050") == null?"":formBean.getString("field0050");
+
+        switch (def7) {
+            case "-8661769604040273924":
+                def7 = "001";
+                break;
+            case "-5350125814390239390":
+                def7 = "002";
+                break;
+            default:
+                def7 = null;
+                break;
+        }
+        parentvo.put("def7", def7);
+
+        //供应商类型 自定义项9  01 生产商  02 贸易商 03 服务商
+        String def9 = formBean.getString("field0065") == null?"":formBean.getString("field0065");
+
+        switch (def9) {
+
+            case "4599320723300108944":
+                def9 = "01";
+                break;
+            case "-2027733563790049244":
+                def9 = "02";
+                break;
+            case "-2468198780444524154":
+                def9 = "03";
+                break;
+            default:
+                def9 = null;
+                break;
+        }
+
+        parentvo.put("def9", def9 );
+
+        //邮箱
+        parentvo.put("email", formBean.getString("field0052"));
+        //联系人1
+        parentvo.put("linkman1", formBean.getString("field0010"));
+        parentvo.put("memo", formBean.getString("field0054"));
+        //通信地址
+        parentvo.put("conaddr", formBean.getString("field0038"));
+        //电话1  取 电话手机
+        parentvo.put("phone1", formBean.getString("field0008"));
+
+        //总公司名称 TODO 修改为取编码
+        parentvo.put("pk_cubasdoc1", formBean.getString("field0034"));
+        //纳税人识别号
+        parentvo.put("taxpayerid", formBean.getString("field0007"));
+        customer.put("parentvo", parentvo);
+        customer.put("banks", banks);
+        cbdocvo.add(customer);
+        returnData.put("cbdocvo", cbdocvo);
+        return returnData;
+    }
+
+}

base-buildpackage/src/main/java/com/hzya/frame/plugin/wsdata/plugin/WsDataInitializer.java

@@ -0,0 +1,85 @@
+package com.hzya.frame.plugin.wsdata.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.seeyon.customer.service.ICustomerService;
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+
+/**
+ * 主数据模版(MdmModule)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-18 10:33:32
+ */
+public class WsDataInitializer extends PluginBaseEntity {
+    @Autowired
+    private ICustomerService customerService;
+    Logger logger = LoggerFactory.getLogger(WsDataInitializer.class);
+
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    @Override
+    public String getPluginId() {
+        return "WsDataInitializer";
+    }
+
+    @Override
+    public String getPluginName() {
+        return "获取CRM客户档案";
+    }
+
+    @Override
+    public String getPluginLabel() {
+        return "WsDataInitializer";
+    }
+
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) {
+        JsonResultEntity result = new JsonResultEntity();
+        try {
+            result =customerService.getCrmCustomer(requestJson);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+}

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

@@ -1,23 +0,0 @@
-#######################澳星环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: GBK
-  file:
-#    日志保存路径
-    path: E:\yongansystem\log
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/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
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: E:\yongansystem\file
-zt:
-  url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface

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

@@ -1,27 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: D:\yongansystem\kangarooDataCenter\v3\logs
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-#          url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: bd993088e8a7c3dc5f44441617f9b4bf
-#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-           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
-           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: D:\yongansystem\kangarooDataCenter\v3\logs
-zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

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

@@ -1,82 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-    #    日志保存路径
-    path: /Users/apple/Desktop/log/local
-spring:
-  data:
-    mongodb:
-#      host: 192.168.2.237
-#      port: 27017
-#      database: businesscenter
-#      auto-index-creation: true
-#      password: hzya1314
-#      username: hzya
-  flyway:
-    # 启动flyway migration, 默认为true
-    enabled: false
-  datasource:
-    dynamic:
-      druid:
-        filters: stat,log4j2
-      datasource:
-        master:
-#          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-#          username: hzyazt
-#          password: 62e4295b615a30dbf3b8ee96f41c820b
-#          driver-class-name: dm.jdbc.driver.DmDriver
-#          type: com.alibaba.druid.pool.DruidDataSource
-          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
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-#          url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
-#          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-#          username: hzyazt
-#          password: 62e4295b615a30dbf3b8ee96f41c820b
-#          driver-class-name: dm.jdbc.driver.DmDriver
-savefile:
-  #    文件保存路径
-  path: /Users/apple/Desktop/log/local
-  tomcatpath: /Users/apple/Desktop/log/local
-  pluginpath: /Users/apple/Desktop/log/local
-zt:
-  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
-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: 0469146F06BF3B01236E84632441E826
-  #电子回单下载临时存放位置
-  elec_path: /Users/xiangerlin/Downloads/
-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-local.yml

@@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: /Users/apple/Desktop/log/local
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        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
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: /Users/apple/Desktop/log/local
-zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

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

@@ -0,0 +1,53 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: info
+  encodings: UTF-8
+  file:
+    #    日志保存路径
+    path: D:\yongansystem\log
+spring:
+  data:
+    mongodb:
+#      host: 192.168.2.237
+#      port: 27017
+#      database: businesscenter
+#      auto-index-creation: true
+#      password: hzya1314
+#      username: hzya
+  flyway:
+    # 启动flyway migration, 默认为true
+    enabled: false
+  datasource:
+    dynamic:
+      druid:
+        filters: stat,log4j2
+      datasource:
+        master:
+          url: jdbc:mysql://192.168.3.42:3306/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
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: D:\yongansystem\file
+  tomcatpath: D:\yongansystem\apache-tomcat-9.0.97
+  pluginpath: D:\yongansystem\apache-tomcat-9.0.97\webapps\kangarooDataCenterV3\WEB-INF\classes
+zt:
+  url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
+
+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

@@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/dev
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        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: bd993088e8a7c3dc5f44441617f9b4bf
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: /Users/xiangerlin/work/app/file/dev
-  pluginpath: /Users/xiangerlin/work/app/file/dev
-  tomcatpath: /Users/xiangerlin/work/app/file/dev

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

@@ -1,90 +0,0 @@
-#logging:
-#  #日志级别 指定目录级别
-#  level:
-#    root: info
-#  encodings: UTF-8
-#  file:
-#    #    日志保存路径
-#    path: /zt/log
-#spring:
-#  flyway:
-#    # 启动flyway migration, 默认为true
-#    enabled: false
-#  datasource:
-#    dynamic:
-#      druid:
-#        filters: stat,log4j2
-#      datasource:
-#        master:
-#          url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-#          username: businesscenter
-#          password: 6842568689469adad597d144ee104063
-#          driver-class-name: dm.jdbc.driver.DmDriver
-#savefile:
-#  #    文件保存路径
-#  path: /zt/file
-#公司mysql
-#ax:
-#  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
-#logging:
-#  #日志级别 指定目录级别warn
-#  level:
-#    root: info
-#  encodings: UTF-8
-#  file:
-#    #    日志保存路径
-#    path: /home/webservice/zt/log
-#spring:
-#  datasource:
-#    dynamic:
-#      datasource:
-#        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
-#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-#savefile:
-#  #    文件保存路径
-#  path: /home/webservice/zt/file
-
-
-#公司服务器达梦
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-    #    日志保存路径
-    path: /zt/log
-spring:
-  flyway:
-    # 启动flyway migration, 默认为true
-    enabled: false
-  datasource:
-    dynamic:
-      druid:
-        filters: stat,log4j2
-      datasource:
-        master:
-          url: jdbc:dm://ufidahz.com.cn:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
-          username: hzyazt
-          password: 62e4295b615a30dbf3b8ee96f41c820b
-          driver-class-name: dm.jdbc.driver.DmDriver
-savefile:
-  #    文件保存路径
-  path: /zt/file
-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: 0469146F06BF3B01236E84632441E826
-  #电子回单下载临时存放位置
-  elec_path: /zt/elecfile
-OA:
-  data_source_code: yc_oa

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

@@ -1,21 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/ydc
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: bd993088e8a7c3dc5f44441617f9b4bf
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: /Users/xiangerlin/work/app/logs/ydc

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

@@ -1,31 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: /Users/xiangerlin/work/app/logs/yuecheng
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        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
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: /Users/xiangerlin/work/app/logs/yuecheng
-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

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

@@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
-  #日志级别 指定目录级别
-  level:
-    root: info
-  encodings: UTF-8
-  file:
-#    日志保存路径
-    path: E:\yongansystem\log
-spring:
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?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: bd993088e8a7c3dc5f44441617f9b4bf
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
-    #    文件保存路径
-  path: E:\yongansystem\log
-zt:
-  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface

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

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

base-buildpackage/src/main/resources/cfgHome/plugin/wsdata/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="WsDataInitializer" class="com.hzya.frame.plugin.wsdata.plugin.WsDataInitializer" />
+</beans>

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

@@ -31,14 +31,14 @@ import java.util.Map;
  * Date 2023/7/16 8:18 上午
  */
 //@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = {WebappApplication.class})
+//@SpringBootTest(classes = a{WebappApplication.class})
 public class temButtom {
 
     @Test
     public void test01() {
         String a = AESUtil.encrypt("hzya@1314");
         System.out.println(a);
-        String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b");
+        String b = AESUtil.decrypt("617e55dada79e04983a2dfcb3c63ad10");
         System.out.println(b);
     }
 

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

@@ -13,20 +13,4 @@ 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,6 +1,5 @@
 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;
@@ -12,7 +11,7 @@ import org.slf4j.LoggerFactory;
 import com.hzya.frame.web.entity.JsonResultEntity;
 
 import javax.annotation.Resource;
-import java.util.List;
+
 
 
 /**
@@ -34,33 +33,4 @@ 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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,75 +0,0 @@
-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

@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,92 +0,0 @@
-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

@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,66 +0,0 @@
-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

@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,155 +0,0 @@
-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

@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,126 +0,0 @@
-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

@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,145 +0,0 @@
-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

@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,143 +0,0 @@
-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

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,76 +0,0 @@
-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

@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,57 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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

@@ -1,49 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,193 +0,0 @@
-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

@@ -1,179 +0,0 @@
-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

@@ -1,155 +0,0 @@
-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

@@ -1,190 +0,0 @@
-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

@@ -1,284 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,82 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,160 +0,0 @@
-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,9 +82,6 @@ public class SysApplicationApiEntity extends BaseEntity {
     /**  返回描述字段*/
     private String returnMsg;
 
-    //对应nifi的apiid
-    private String nifiApiId;
-
     public String getReturnMsg() {
         return returnMsg;
     }
@@ -324,13 +321,5 @@ 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,7 +10,6 @@
         <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"/>
@@ -52,7 +51,6 @@
        ,api_code
        ,api_path
         ,app_id
-        ,nifi_api_id
         ,catalogue_id 
         ,api_name 
         ,api_remark 
@@ -87,7 +85,6 @@
     <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,
@@ -114,7 +111,6 @@
 	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,
@@ -166,7 +162,6 @@ WHERE
         ,api.api_code
         ,api.api_path
         ,api.app_id
-        ,api.nifi_api_id
         ,api.catalogue_id
         ,api.api_name
         ,api.api_remark
@@ -205,7 +200,6 @@ WHERE
             <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>
@@ -257,7 +251,6 @@ 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>
@@ -311,7 +304,6 @@ 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>
@@ -380,7 +372,6 @@ 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>
@@ -447,7 +438,6 @@ 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>
@@ -500,7 +490,6 @@ 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>
@@ -542,7 +531,6 @@ 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>
@@ -579,32 +567,31 @@ WHERE
     </insert>
     <!-- 批量新增 -->
     <insert id="entityInsertBatch" >
-        insert into sys_application_api(api_status,api_code,api_path, app_id,nifi_api_id, catalogue_id, api_name, api_remark,
+        insert into sys_application_api(api_status,api_code,api_path, app_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.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},
+            (#{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},
             'Y')
         </foreach>
     </insert>
     <!-- 批量新增或者修改-->
     <insert id="entityInsertOrUpdateBatch" >
-        insert into sys_application_api(api_status,api_code,api_path, app_id,nifi_api_id, catalogue_id, api_name, api_remark,
+        insert into sys_application_api(api_status,api_code,api_path, app_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.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})
+            (#{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})
         </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),
@@ -643,7 +630,6 @@ 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>
@@ -697,7 +683,6 @@ 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>
@@ -934,7 +919,6 @@ where id = #{id}
         select
         id
         ,app_id
-        ,nifi_api_id
         ,api_name
         from sys_application_api
         <trim prefix="where" prefixOverrides="and">
@@ -943,7 +927,6 @@ 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/appAcount/dao/ISysApplicationAccountDao.java

@@ -1,15 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,138 +0,0 @@
-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

@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.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

@@ -1,57 +0,0 @@
-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

@@ -1,187 +0,0 @@
-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,8 +61,6 @@ 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;
@@ -273,13 +271,5 @@ 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

@@ -44,8 +44,6 @@ public class SysApplicationEntity extends BaseEntity {
    private String dbStatus;
    /**  新消息数 */
    private int newMessageCount;
-   //nifi的appid
-   private String nifiAppId;
 
     public int getNewMessageCount() {
         return newMessageCount;
@@ -213,13 +211,5 @@ 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,7 +23,6 @@
            <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"/>
@@ -54,7 +53,6 @@
         ,interface_status 
         ,db_status 
         ,app_type
-        ,nifi_app_id
         ,sorts
         ,org_id 
         ,sts 
@@ -95,7 +93,6 @@
             <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>
@@ -133,7 +130,6 @@
             <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>
@@ -173,7 +169,6 @@
             <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>
@@ -213,7 +208,6 @@
              <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>
@@ -252,7 +246,6 @@
             <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>
@@ -285,7 +278,6 @@
             <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>
@@ -299,18 +291,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,nifi_app_id, 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, 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.nifiAppId},#{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.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,nifi_app_id, 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, 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.nifiAppId},#{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.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),
@@ -332,7 +324,6 @@
     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),
@@ -363,7 +354,6 @@ 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>
@@ -403,7 +393,6 @@ 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'
@@ -432,7 +421,6 @@ 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/service/impl/SysApplicationServiceImpl.java

@@ -718,7 +718,6 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
         sysApplicationEntity.setSts("Y");
         sysApplicationEntity.setModify_user_id(StpUtil.getLoginIdAsString());
         sysApplicationEntity.setModify_time(new Date());
-        sysApplicationEntity.setNifiAppId(entity.getNifiAppId());
         sysApplicationDao.update(sysApplicationEntity);
         applicationCache.reloadData("1");
         return sysApplicationEntity;

base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java

@@ -69,8 +69,6 @@ public class SysUserEntity extends BaseEntity {
      * 人员姓名
      */
     private String personName;
-    //编码
-    private String personCode;
     /**
      * 关联组织机构名称
      */
@@ -88,9 +86,6 @@ public class SysUserEntity extends BaseEntity {
 
     private String wxUserId;
 
-    //sys_flow模块用
-    private String flowClassId;
-
     public String getDdUserId() {
         return ddUserId;
     }
@@ -242,21 +237,5 @@ public class SysUserEntity extends BaseEntity {
     public void setOldPassword(String oldPassword) {
         OldPassword = oldPassword;
     }
-
-    public String getPersonCode() {
-        return personCode;
-    }
-
-    public void setPersonCode(String personCode) {
-        this.personCode = personCode;
-    }
-
-    public String getFlowClassId() {
-        return flowClassId;
-    }
-
-    public void setFlowClassId(String flowClassId) {
-        this.flowClassId = flowClassId;
-    }
 }
 

base-service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.xml

@@ -22,7 +22,6 @@
         <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
         <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
         <result property="personName" column="person_Name" jdbcType="VARCHAR"/>
-        <result property="personCode" column="person_code" jdbcType="VARCHAR"/>
         <result property="organName" column="organ_name" jdbcType="VARCHAR"/>
         <result property="mobilePhone" column="mobile_phone" jdbcType="VARCHAR"/>
         <result property="ddUserId" column="dd_user_id" jdbcType="VARCHAR"/>
@@ -73,7 +72,6 @@
         ,a.org_id
         ,a.company_id
         ,p.person_Name
-        ,p.person_code
         ,a.wx_user_id
         ,a.dd_user_id
         from
@@ -268,69 +266,6 @@
         <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
-    <!-- 查询未分配过权限的用户 （sys_flow模块用） -->
-    <select id="entity_list_notin_sys_flowClass" resultMap="get-SysUserEntity-result"
-            parameterType="com.hzya.frame.sysnew.user.entity.SysUserEntity">
-        select
-        a.id
-        ,a.person_id
-        ,a.login_code
-        ,a.password
-        ,a.salt
-        ,a.last_login_time
-        ,a.last_connection_time
-        ,a.last_login_ip
-        ,a.state
-        ,a.remark
-        ,a.sorts
-        ,a.create_user_id
-        ,a.create_time
-        ,a.modify_user_id
-        ,a.modify_time
-        ,a.sts
-        ,a.org_id
-        ,a.company_id
-        ,p.person_Name
-        ,p.person_code
-        ,p.mobile_phone
-        ,o.organ_name
-        from
-        sys_user a
-        LEFT JOIN sys_person p on p.id =  a.person_id and p.sts = 'Y'
-        LEFT JOIN sys_organ o on o.id =  p.organ_id and o.sts = 'Y'
-        <trim prefix="where" prefixOverrides="and">
-            <if test="id != null and id != ''">and a.id like concat('%',#{id},'%')</if>
-            <if test="personId != null and personId != ''">and a.person_id like concat('%',#{personId},'%')</if>
-            <if test="loginCode != null and loginCode != ''">and a.login_code like concat('%',#{loginCode},'%')</if>
-            <if test="password != null and password != ''">and a.password like concat('%',#{password},'%')</if>
-            <if test="salt != null and salt != ''">and a.salt like concat('%',#{salt},'%')</if>
-            <if test="lastLoginTime != null">and a.last_login_time like concat('%',#{lastLoginTime},'%')</if>
-            <if test="lastConnectionTime != null">and a.last_connection_time like concat('%',#{lastConnectionTime},'%')
-            </if>
-            <if test="lastLoginIp != null and lastLoginIp != ''">and a.last_login_ip like concat('%',#{lastLoginIp},'%')
-            </if>
-            <if test="state != null and state != ''">and a.state like concat('%',#{state},'%')</if>
-            <if test="remark != null and remark != ''">and a.remark like concat('%',#{remark},'%')</if>
-            <if test="sorts != null">and a.sorts like concat('%',#{sorts},'%')</if>
-            <if test="create_user_id != null and create_user_id != ''">and a.create_user_id like
-                concat('%',#{create_user_id},'%')
-            </if>
-            <if test="create_time != null">and a.create_time like concat('%',#{create_time},'%')</if>
-            <if test="modify_user_id != null and modify_user_id != ''">and a.modify_user_id like
-                concat('%',#{modify_user_id},'%')
-            </if>
-            <if test="modify_time != null">and a.modify_time like concat('%',#{modify_time},'%')</if>
-            <if test="sts != null and sts != ''">and a.sts like concat('%',#{sts},'%')</if>
-            <if test="org_id != null and org_id != ''">and a.org_id like concat('%',#{org_id},'%')</if>
-            <if test="companyId != null and companyId != ''">and a.company_id like concat('%',#{companyId},'%')</if>
-            <if test="organId != null and organId != ''">and p.organ_id  = #{organId}</if>
-            <if test="mobilePhone != null and mobilePhone != ''">and p.mobile_phone like concat('%',#{mobilePhone},'%')</if>
-            <if test="personName != null and personName != ''">and p.person_Name like concat('%',#{personName},'%')</if>
-            and a.sts='Y'
-            and a.id not in (select user_id from sys_flow_class_rule where sts = 'Y' and flow_class_id = #{flowClassId})
-        </trim>
-    </select>
-
     <!--新增所有列-->
     <insert id="entity_insert" parameterType="com.hzya.frame.sysnew.user.entity.SysUserEntity"
             >

base-service/src/main/java/com/hzya/frame/web/aop/BindUserIdAop.java

@@ -10,7 +10,6 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -39,9 +38,6 @@ public class BindUserIdAop {
                 if (StpUtil.isLogin()) {
                     Object loginId = StpUtil.getLoginId();
                     Object obj = objs[0];
-                    // 获取方法签名
-                    MethodSignature signature = (MethodSignature) point.getSignature();
-                    String methodName = signature.getName();
                     if (obj instanceof HashMap) {
                         ((HashMap<String,Object>) obj).put("create_user_id",loginId);
                         ((HashMap<String,Object>) obj).put("modify_user_id",loginId);
@@ -55,25 +51,21 @@ public class BindUserIdAop {
                             jsonStrObj = JSON.parseObject(jsonStr);
                         }
                         if(null != jsonStrObj){
-                            //如果是update的方法，则不处理create_user_id 和 create_time
-                            if (jsonStrObj.getString("modify_user_id") == null) {
-                                jsonStrObj.put("modify_user_id",loginId);
-                            }
-                            if (jsonStrObj.getString("modify_time") == null) {
-                                jsonStrObj.put("modify_time",DateUtil.now());
-                            }
-                            //save方法才要赋值create_user_id 和 creat_time  id
-                            if (methodName.startsWith("save")){
                             if (jsonStrObj.getString("create_user_id") == null) {
                                 jsonStrObj.put("create_user_id",loginId);
                             }
+                            if (jsonStrObj.getString("modify_user_id") == null) {
+                                jsonStrObj.put("modify_user_id",loginId);
+                            }
                             if (jsonStrObj.getString("create_time") == null) {
                                 jsonStrObj.put("create_time",DateUtil.now());
                             }
+                            if (jsonStrObj.getString("modify_time") == null) {
+                                jsonStrObj.put("modify_time",DateUtil.now());
+                            }
                             if (jsonStrObj.getString("id") == null) {
                                 jsonStrObj.put("id",UUIDLong.longUUID());
                             }
-                            }
                         }else{
                             jsonStrObj = new JSONObject();
                             jsonStrObj.put("create_user_id",loginId);

base-webapp/pom.xml

@@ -54,22 +54,22 @@
 <!--            <artifactId>fw-ningbobank</artifactId>-->
 <!--            <version>${revision}</version>-->
 <!--        </dependency>-->
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>com.hzya.frame</groupId>-->
+            <groupId>com.hzya.frame</groupId>
-<!--            <artifactId>fw-oa</artifactId>-->
+            <artifactId>fw-oa</artifactId>
-<!--            <version>${revision}</version>-->
+            <version>${revision}</version>
-<!--        </dependency>-->
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.hzya.frame</groupId>-->
 <!--            <artifactId>fw-u8</artifactId>-->
 <!--            <version>${revision}</version>-->
 <!--        </dependency>-->
 
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>com.hzya.frame</groupId>-->
+            <groupId>com.hzya.frame</groupId>
-<!--            <artifactId>fw-u8c</artifactId>-->
+            <artifactId>fw-u8c</artifactId>
-<!--            <version>${revision}</version>-->
+            <version>${revision}</version>
-<!--        </dependency>-->
+        </dependency>
 
 <!--        <dependency>-->
 <!--            <groupId>com.hzya.frame</groupId>-->

fw-oa/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>kangarooDataCenterV3</artifactId>
+        <groupId>com.hzya.frame</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>fw-oa</artifactId>
+    <packaging>jar</packaging>
+    <version>${revision}</version>
+
+    <dependencies>
+            <dependency>
+                <groupId>com.hzya.frame</groupId>
+                <artifactId>base-service</artifactId>
+                <version>${revision}</version>
+            </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java}</version>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>none</mainClass>     <!-- 取消查找本项目下的Main方法：为了解决Unable to find main class的问题 -->
+                    <classifier>execute</classifier>    <!-- 为了解决依赖模块找不到此模块中的类或属性 -->
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDTO.java

@@ -0,0 +1,74 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description 无流程表单批量保存请求参数
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:18
+ **/
+public class FormDTO {
+    @JSONField(ordinal = 4)
+    private String formCode;//模版编号
+    @JSONField(ordinal = 5)
+    private String loginName;//模版编号
+    @JSONField(ordinal = 2)
+    private String rightId;//权限id，找到无流程表单，点新增，弹出的窗口上会有这个参数
+    @JSONField(ordinal = 3)
+    private List<FormDataDTO> dataList;//导入的数据
+    @JSONField(ordinal = 1)
+    private String[] uniqueFiled;//更新用的唯一标识
+    @JSONField(ordinal = 6)
+    private Boolean doTrigger;//是否执行触发(Since V8.0sp2),测试中发现传了这个参数会报错
+
+    public String getFormCode() {
+        return formCode;
+    }
+
+    public void setFormCode(String formCode) {
+        this.formCode = formCode;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getRightId() {
+        return rightId;
+    }
+
+    public void setRightId(String rightId) {
+        this.rightId = rightId;
+    }
+
+    public List<FormDataDTO> getDataList() {
+        return dataList;
+    }
+
+    public void setDataList(List<FormDataDTO> dataList) {
+        this.dataList = dataList;
+    }
+
+    public String[] getUniqueFiled() {
+        return uniqueFiled;
+    }
+
+    public void setUniqueFiled(String[] uniqueFiled) {
+        this.uniqueFiled = uniqueFiled;
+    }
+
+    public Boolean getDoTrigger() {
+        return doTrigger;
+    }
+
+    public void setDoTrigger(Boolean doTrigger) {
+        this.doTrigger = doTrigger;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDataDTO.java

@@ -0,0 +1,36 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description dataList节点
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:26
+ **/
+public class FormDataDTO {
+    @JSONField(ordinal = 1)
+    private MasterTableDTO masterTable;//主表数据
+    @JSONField(ordinal = 2)
+    private List<SubTableDTO> subTables;//子表数据
+
+    //private List<> attachmentInfos;//附件列表
+
+    public MasterTableDTO getMasterTable() {
+        return masterTable;
+    }
+
+    public void setMasterTable(MasterTableDTO masterTable) {
+        this.masterTable = masterTable;
+    }
+
+    public List<SubTableDTO> getSubTables() {
+        return subTables;
+    }
+
+    public void setSubTables(List<SubTableDTO> subTables) {
+        this.subTables = subTables;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/MasterTableDTO.java

@@ -0,0 +1,45 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description 主表数据
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:29
+ **/
+
+public class MasterTableDTO {
+    @JSONField(ordinal = 1)
+    private String name;//表名
+    @JSONField(ordinal = 2)
+    private RecordDTO record;//数据
+    @JSONField(ordinal = 3)
+    private List<String> changedFields;//需要计算的字段
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public RecordDTO getRecord() {
+        return record;
+    }
+
+    public void setRecord(RecordDTO record) {
+        this.record = record;
+    }
+
+    public List<String> getChangedFields() {
+        return changedFields;
+    }
+
+    public void setChangedFields(List<String> changedFields) {
+        this.changedFields = changedFields;
+    }
+}

fw-oa/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordDTO.java

@@ -0,0 +1,34 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description record节点
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:31
+ **/
+public class RecordDTO {
+    @JSONField(ordinal = 1)
+    private long id;//数据id，测试中发现新增时这个参数随便填写 不影响导入
+    @JSONField(ordinal = 2)
+    private List<RecordFieldDTO> fields;//字段列表
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public List<RecordFieldDTO> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<RecordFieldDTO> fields) {
+        this.fields = fields;
+    }
+}