fix():修复规则引擎

muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/AssetAccreditReq.java

@@ -13,10 +13,19 @@ import java.util.List;
 @SuperBuilder
 public class AssetAccreditReq {
 
+    /**
+     * 存储部门ID的列表。
+     */
     private List<Long> deptIds;
 
+    /**
+     * 用户ID。
+     */
     private Long userId;
 
+    /**
+     * 数据资产ID。
+     */
     private Long dataAssetId;
 
 }

muyu-modules/muyu-etl/src/main/java/com/muyu/etl/domain/req/SourceAccreditReq.java

@@ -13,10 +13,20 @@ import java.util.List;
 @NoArgsConstructor
 public class SourceAccreditReq {
 
-  private List<Long> deptIds;
+    /**
+     * 存储需要授权的部门ID列表。
+     */
+    private List<Long> deptIds;
 
-  private Long userId;
+    /**
+     * 请求授权的用户ID。
+     */
+    private Long userId;
 
-  private Long dataSourceId;
+    /**
+     * 源数据ID，标识了要授权的数据源。
+     */
+    private Long dataSourceId;
 
 }
+

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/controller/EngineMaintenanceController.java

@@ -6,9 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
-import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.rule.engine.domain.EngineMaintenance;
-import com.muyu.rule.engine.service.IEngineMaintenanceService;
+import com.muyu.rule.engine.service.EngineMaintenanceService;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
@@ -25,7 +24,7 @@ import com.muyu.common.core.web.page.TableDataInfo;
 public class EngineMaintenanceController extends BaseController
 {
     @Autowired
-    private IEngineMaintenanceService engineMaintenanceService;
+    private EngineMaintenanceService engineMaintenanceService;
 
     /**
      * 查询【请填写功能名称】列表

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/controller/EngineVersionController.java

@@ -0,0 +1,92 @@
+package com.muyu.rule.engine.controller;
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.poi.ExcelUtil;
+import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.common.core.web.page.TableDataInfo;
+import com.muyu.common.log.annotation.Log;
+import com.muyu.common.log.enums.BusinessType;
+import com.muyu.common.security.annotation.RequiresPermissions;
+import com.muyu.rule.engine.domain.EngineVersion;
+import com.muyu.rule.engine.service.EngineVersionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/version")
+public class EngineVersionController extends BaseController {
+
+    @Autowired
+    private EngineVersionService engineVersionService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:version:list")
+    @GetMapping("/list")
+    public Result<TableDataInfo<EngineVersion>> list(EngineVersion engineVersion){
+        startPage();
+        List<EngineVersion> list = engineVersionService.selectEngineVersionList(engineVersion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出【请填写功能名称】列表
+     */
+    @RequiresPermissions("system:version:export")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EngineVersion engineVersion)
+    {
+        List<EngineVersion> list = engineVersionService.selectEngineVersionList(engineVersion);
+        ExcelUtil<EngineVersion> util = new ExcelUtil<EngineVersion>(EngineVersion.class);
+        util.exportExcel(response, list, "【请填写功能名称】数据");
+    }
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @RequiresPermissions("system:version:query")
+    @GetMapping(value = "/{id}")
+    public Result getInfo(@PathVariable("id") Long id)
+    {
+        return success(engineVersionService.selectEngineVersionById(id));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @RequiresPermissions("system:version:add")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public Result add(@RequestBody EngineVersion engineVersion)
+    {
+        return toAjax(engineVersionService.insertEngineVersion(engineVersion));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @RequiresPermissions("system:version:edit")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public Result edit(@RequestBody EngineVersion engineVersion)
+    {
+        return toAjax(engineVersionService.updateEngineVersion(engineVersion));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @RequiresPermissions("system:version:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public Result remove(@PathVariable Long[] ids)
+    {
+        return toAjax(engineVersionService.deleteEngineVersionByIds(ids));
+    }
+
+}

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/domain/EngineVersion.java

@@ -0,0 +1,138 @@
+package com.muyu.rule.engine.domain;
+
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class EngineVersion extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /** 规则引擎ID */
+    @Excel(name = "规则引擎ID")
+    private Long engineMaintenanceId;
+
+    /** 引擎版本名称 */
+    @Excel(name = "引擎版本名称")
+    private String name;
+
+    /** 引擎版本编码 */
+    @Excel(name = "引擎版本编码")
+    private String code;
+
+    /** 引擎版本状态 */
+    @Excel(name = "引擎版本状态")
+    private String status;
+
+    /** 引擎版本类 */
+    @Excel(name = "引擎版本类")
+    private String versionCode;
+
+    /** 引擎版本激活状态 */
+    @Excel(name = "引擎版本激活状态")
+    private String isActivate;
+
+    /** 引擎版本详情 */
+    @Excel(name = "引擎版本详情")
+    private String description;
+
+    /** 引擎版本代码 */
+    @Excel(name = "引擎版本代码")
+    private String codeIng;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setEngineMaintenanceId(Long engineMaintenanceId) {
+        this.engineMaintenanceId = engineMaintenanceId;
+    }
+
+    public Long getEngineMaintenanceId() {
+        return engineMaintenanceId;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setVersionCode(String versionCode) {
+        this.versionCode = versionCode;
+    }
+
+    public String getVersionCode() {
+        return versionCode;
+    }
+
+    public void setIsActivate(String isActivate) {
+        this.isActivate = isActivate;
+    }
+
+    public String getIsActivate() {
+        return isActivate;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setCodeIng(String codeIng) {
+        this.codeIng = codeIng;
+    }
+
+    public String getCodeIng() {
+        return codeIng;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("engineMaintenanceId", getEngineMaintenanceId())
+                .append("name", getName())
+                .append("code", getCode())
+                .append("status", getStatus())
+                .append("versionCode", getVersionCode())
+                .append("isActivate", getIsActivate())
+                .append("description", getDescription())
+                .append("codeIng", getCodeIng())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+
+}

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/mapper/EngineVersionMapper.java

@@ -0,0 +1,57 @@
+package com.muyu.rule.engine.mapper;
+
+import com.muyu.rule.engine.domain.EngineVersion;
+
+import java.util.List;
+
+public interface EngineVersionMapper {
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public EngineVersion selectEngineVersionById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param engineVersion 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<EngineVersion> selectEngineVersionList(EngineVersion engineVersion);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param engineVersion 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertEngineVersion(EngineVersion engineVersion);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param engineVersion 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateEngineVersion(EngineVersion engineVersion);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteEngineVersionById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEngineVersionByIds(Long[] ids);
+
+}

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/service/EngineMaintenanceService.java

@@ -11,7 +11,7 @@ import com.muyu.rule.engine.domain.EngineMaintenance;
  * @author ruoyi
  * @date 2024-05-02
  */
-public interface IEngineMaintenanceService
+public interface EngineMaintenanceService
 {
     /**
      * 查询【请填写功能名称】

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/service/EngineVersionService.java

@@ -0,0 +1,57 @@
+package com.muyu.rule.engine.service;
+
+import com.muyu.rule.engine.domain.EngineVersion;
+
+import java.util.List;
+
+public interface EngineVersionService {
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    public EngineVersion selectEngineVersionById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param engineVersion 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<EngineVersion> selectEngineVersionList(EngineVersion engineVersion);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param engineVersion 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertEngineVersion(EngineVersion engineVersion);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param engineVersion 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateEngineVersion(EngineVersion engineVersion);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    public int deleteEngineVersionByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    public int deleteEngineVersionById(Long id);
+
+}

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/service/impl/EngineMaintenanceServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.muyu.rule.engine.mapper.EngineMaintenanceMapper;
 import com.muyu.rule.engine.domain.EngineMaintenance;
-import com.muyu.rule.engine.service.IEngineMaintenanceService;
+import com.muyu.rule.engine.service.EngineMaintenanceService;
 
 import javax.tools.JavaCompiler;
 import javax.tools.StandardJavaFileManager;
@@ -31,7 +31,7 @@ import javax.tools.ToolProvider;
  */
 @Service
 @Log4j2
-public class EngineMaintenanceServiceImpl implements IEngineMaintenanceService
+public class EngineMaintenanceServiceImpl implements EngineMaintenanceService
 {
     @Autowired
     private EngineMaintenanceMapper engineMaintenanceMapper;

muyu-modules/muyu-rule-engine/src/main/java/com/muyu/rule/engine/service/impl/EngineVersionServiceImpl.java

@@ -0,0 +1,50 @@
+package com.muyu.rule.engine.service.impl;
+
+import com.muyu.common.core.utils.DateUtils;
+import com.muyu.rule.engine.domain.EngineVersion;
+import com.muyu.rule.engine.mapper.EngineVersionMapper;
+import com.muyu.rule.engine.service.EngineVersionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class EngineVersionServiceImpl implements EngineVersionService {
+
+    @Autowired
+    private EngineVersionMapper engineVersionMapper;
+
+    @Override
+    public EngineVersion selectEngineVersionById(Long id) {
+        return engineVersionMapper.selectEngineVersionById(id);
+    }
+
+    @Override
+    public List<EngineVersion> selectEngineVersionList(EngineVersion engineVersion) {
+        return engineVersionMapper.selectEngineVersionList(engineVersion);
+    }
+
+    @Override
+    public int insertEngineVersion(EngineVersion engineVersion) {
+        engineVersion.setCreateTime(DateUtils.getNowDate());
+        return engineVersionMapper.insertEngineVersion(engineVersion);
+    }
+
+    @Override
+    public int updateEngineVersion(EngineVersion engineVersion) {
+        engineVersion.setUpdateTime(DateUtils.getNowDate());
+        return engineVersionMapper.updateEngineVersion(engineVersion);
+    }
+
+    @Override
+    public int deleteEngineVersionByIds(Long[] ids) {
+        return engineVersionMapper.deleteEngineVersionByIds(ids);
+    }
+
+    @Override
+    public int deleteEngineVersionById(Long id) {
+        return engineVersionMapper.deleteEngineVersionById(id);
+    }
+
+}

muyu-modules/muyu-rule-engine/src/main/resources/mapper/ruleEngine/EngineVersionMapper.xml

@@ -0,0 +1,112 @@
+<?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.muyu.rule.engine.mapper.EngineVersionMapper">
+
+    <resultMap type="com.muyu.rule.engine.domain.EngineVersion" id="EngineVersionResult">
+        <result property="id"    column="id"    />
+        <result property="engineMaintenanceId"    column="engine_maintenance_id"    />
+        <result property="name"    column="name"    />
+        <result property="code"    column="code"    />
+        <result property="status"    column="status"    />
+        <result property="versionCode"    column="versionCode"    />
+        <result property="isActivate"    column="isActivate"    />
+        <result property="description"    column="description"    />
+        <result property="codeIng"    column="codeIng"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectEngineVersionVo">
+        select id, engine_maintenance_id, name, code, status, versionCode, isActivate, description, codeIng, remark, create_by, create_time, update_by, update_time from engine_version
+    </sql>
+
+    <select id="selectEngineVersionList" parameterType="com.muyu.rule.engine.domain.EngineVersion" resultMap="EngineVersionResult">
+        <include refid="selectEngineVersionVo"/>
+        <where>
+            <if test="engineMaintenanceId != null "> and engine_maintenance_id = #{engineMaintenanceId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="versionCode != null  and versionCode != ''"> and versionCode = #{versionCode}</if>
+            <if test="isActivate != null  and isActivate != ''"> and isActivate = #{isActivate}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="codeIng != null  and codeIng != ''"> and codeIng = #{codeIng}</if>
+        </where>
+    </select>
+
+    <select id="selectEngineVersionById" parameterType="Long" resultMap="EngineVersionResult">
+        <include refid="selectEngineVersionVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertEngineVersion" parameterType="com.muyu.rule.engine.domain.EngineVersion" useGeneratedKeys="true" keyProperty="id">
+        insert into engine_version
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="engineMaintenanceId != null">engine_maintenance_id,</if>
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="status != null">status,</if>
+            <if test="versionCode != null">versionCode,</if>
+            <if test="isActivate != null">isActivate,</if>
+            <if test="description != null">description,</if>
+            <if test="codeIng != null">codeIng,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="engineMaintenanceId != null">#{engineMaintenanceId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="status != null">#{status},</if>
+            <if test="versionCode != null">#{versionCode},</if>
+            <if test="isActivate != null">#{isActivate},</if>
+            <if test="description != null">#{description},</if>
+            <if test="codeIng != null">#{codeIng},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateEngineVersion" parameterType="com.muyu.rule.engine.domain.EngineVersion">
+        update engine_version
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="engineMaintenanceId != null">engine_maintenance_id = #{engineMaintenanceId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="versionCode != null">versionCode = #{versionCode},</if>
+            <if test="isActivate != null">isActivate = #{isActivate},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="codeIng != null">codeIng = #{codeIng},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEngineVersionById" parameterType="Long">
+        delete from engine_version where id = #{id}
+    </delete>
+
+    <delete id="deleteEngineVersionByIds" parameterType="String">
+        delete from engine_version where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>