1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRuleManagementController.java

@@ -35,19 +35,9 @@ public class SysRuleManagementController extends BaseController
     public TableDataInfo list(SysRuleManagement sysRuleManagement)
     {
         startPage();
-        List<SysRuleManagement> list = iSysRuleManagement.list();
+        List<SysRuleManagement> list = iSysRuleManagement.list(sysRuleManagement);
         return getDataTable(list);
     }
-    /**
-     * 保存规则
-     */
-    @PreAuthorize("@ss.hasPermi('system:ruleManagement:save')")
-    @Log(title = "模板详情", businessType = BusinessType.INSERT)
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody SysRuleManagement sysRuleManagement)
-    {
-        return toAjax(iSysRuleManagement.save(sysRuleManagement));
-    }
 
     /**
      * 获取规则详情详细信息
@@ -60,4 +50,38 @@ public class SysRuleManagementController extends BaseController
         return AjaxResult.success(iSysRuleManagement.selectExcelById(id));
     }
 
+    /**
+     * 新增规则
+     */
+    @PreAuthorize("@ss.hasPermi('system:ruleManagement:add')")
+    @Log(title = "规则详情", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SysRuleManagement sysRuleManagement)
+    {
+        return toAjax(iSysRuleManagement.add(sysRuleManagement));
+    }
+
+    /**
+     * 修改规则
+     */
+    @PreAuthorize("@ss.hasPermi('system:ruleManagement:edit')")
+    @Log(title = "规则详情", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysRuleManagement sysRuleManagement)
+    {
+        return toAjax(iSysRuleManagement.updateRule(sysRuleManagement));
+    }
+
+    /**
+     * 删除规则
+     */
+    @PreAuthorize("@ss.hasPermi('system:ruleManagement:remove')")
+    @Log(title = "规则详情", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
+    {
+        return toAjax(iSysRuleManagement.deleteRuleById(id));
+    }
+
+
 }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源  114.115.162.32   127.0.0.1    hbghgz  jDkrSt5Ts77zXWCJ
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://localhost:3306/hbghgz_sc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRuleManagement.java

@@ -3,8 +3,8 @@ package com.ruoyi.system.domain;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 物资管理 sys_supplies
- * 
+ * 物资管理 sys_rule
+ *
  * @author
  * @date
  */
@@ -15,7 +15,7 @@ public class SysRuleManagement extends BaseEntity
     /** 主键 */
     private Long id;
 
-    /** 模板名称 */
+    /** 规则名称 */
     private String name;
 
     /** JSON */

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ISysRuleManagement.java

@@ -6,16 +6,21 @@ import java.util.List;
 
 /**
  * 物资管理Mapper接口
- * 
+ *
  * @author
  * @date
  */
 public interface ISysRuleManagement
 {
 
-    Integer save(SysRuleManagement s);
-
-    List<SysRuleManagement> list();
+    List<SysRuleManagement> list(SysRuleManagement sysRuleManagement);
 
     SysRuleManagement selectExcelById(Long id);
+
+    Integer add(SysRuleManagement s);
+
+
+    int updateRule(SysRuleManagement sysRuleManagement);
+
+    int deleteRuleById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRuleManagementService.java

@@ -6,16 +6,20 @@ import java.util.List;
 
 /**
  * 物资管理Service接口
- * 
+ *
  * @author
  * @date
  */
 public interface ISysRuleManagementService
 {
 
-    List<SysRuleManagement> list();
+    List<SysRuleManagement> list( SysRuleManagement sysRuleManagement);
 
-    Integer save(SysRuleManagement s);
+    Integer add(SysRuleManagement s);
 
     SysRuleManagement selectExcelById(Long id);
+
+    int updateRule(SysRuleManagement sysRuleManagement);
+
+    int deleteRuleById(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRuleManagementImpl.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 物资管理Service业务层处理
- * 
+ *
  * @author
  * @date
  */
@@ -21,8 +21,8 @@ public class SysRuleManagementImpl implements ISysRuleManagementService
     private ISysRuleManagement iSysRuleManagement;
 
     @Override
-    public List<SysRuleManagement> list() {
-        return iSysRuleManagement.list();
+    public List<SysRuleManagement> list(SysRuleManagement sysRuleManagement) {
+        return iSysRuleManagement.list(sysRuleManagement);
     }
 
     @Override
@@ -31,10 +31,22 @@ public class SysRuleManagementImpl implements ISysRuleManagementService
     }
 
     @Override
-    public Integer save(SysRuleManagement sysSupplies) {
-        return iSysRuleManagement.save(sysSupplies);
+    public Integer add(SysRuleManagement sysSupplies) {
+        return iSysRuleManagement.add(sysSupplies);
     }
 
+    @Override
+    public int updateRule(SysRuleManagement sysRuleManagement) {
+        return iSysRuleManagement.updateRule(sysRuleManagement);
+    }
+
+    @Override
+    public int deleteRuleById(Long id) {
+        return iSysRuleManagement.deleteRuleById(id);
+    }
+
+
+
 
 
 }

ruoyi-system/src/main/resources/mapper/system/SysRuleManagementMapper.xml

@@ -10,14 +10,18 @@
         <result property="jsons" column="jsons"/>
 
     </resultMap>
-    <select id="list" resultMap="SysRuleManagementResult">
+    <select id="list" parameterType="SysRuleManagement" resultMap="SysRuleManagementResult">
         select
             id,
             name,
             jsons
         from sys_rule
         where 1=1
+        <if test="name !=null">
+            and name = #{name}
+        </if>
     </select>
+
     <select id="selectExcelById" resultMap="SysRuleManagementResult">
         select
             id,
@@ -26,7 +30,8 @@
         from sys_rule
         where id = #{id}
     </select>
-    <insert id="save" parameterType="SysRuleManagement" useGeneratedKeys="true" keyProperty="id">
+    <!--新增-->
+    <insert id="add" parameterType="SysRuleManagement" useGeneratedKeys="true" keyProperty="id">
         insert into sys_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
@@ -39,5 +44,17 @@
 
         </trim>
     </insert>
-
-</mapper>
\ No newline at end of file
+    <!--修改-->
+    <update id="updateRule" parameterType="SysConfig">
+        update sys_rule
+        <set>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="jsons != null and jsons != ''">jsons = #{jsons},</if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--删除-->
+    <delete id="deleteRuleById" parameterType="Long">
+        delete from sys_rule where id = #{id}
+    </delete>
+</mapper>

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

@@ -15,6 +15,37 @@ export function getRule(id) {
     method: 'get'
   })
 }
+// 新增规则详情
+export function addRuleManagement(data) {
+  return request({
+    url: '/system/ruleManagement/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改规则详情
+export function updateRuleManagement(data) {
+  return request({
+    url: '/system/ruleManagement/edit',
+    method: 'put',
+    data: data
+  })
+}
+// 删除规则详情
+export function delRuleManagement(id) {
+  return request({
+    url: '/system/ruleManagement/' + id,
+    method: 'delete'
+  })
+}
+
+
+
+
+
+
+
 // 查询模板列表
 export function listMyluckyexcel(query) {
   return request({