修改动态表单条件接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableConditionController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.dragForm;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.system.entity.CommonEntity;
 import com.ruoyi.system.entity.DragTableCondition;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,34 +41,10 @@ public class DragTableConditionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:condition:list')")
     @GetMapping("/list")
-    public TableDataInfo list(DragTableCondition dragTableCondition)
+    public TableDataInfo list(CommonEntity commonEntity)
     {
         startPage();
-        List<DragTableCondition> list = dragTableConditionService.selectDragTableConditionList(dragTableCondition);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出动态格条件列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:condition:export')")
-    @Log(title = "动态格条件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DragTableCondition dragTableCondition)
-    {
-        List<DragTableCondition> list = dragTableConditionService.selectDragTableConditionList(dragTableCondition);
-        ExcelUtil<DragTableCondition> util = new ExcelUtil<DragTableCondition>(DragTableCondition.class);
-        util.exportExcel(response, list, "动态格条件数据");
-    }
-
-    /**
-     * 获取动态格条件详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('system:condition:query')")
-    @GetMapping(value = "/{tcId}")
-    public AjaxResult getInfo(@PathVariable("tcId") Long tcId)
-    {
-        return success(dragTableConditionService.selectDragTableConditionByTcId(tcId));
+        return getDataTable(dragTableConditionService.selectDragTableConditionList(commonEntity));
     }
 
     /**
@@ -76,9 +53,9 @@ public class DragTableConditionController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:condition:add')")
     @Log(title = "动态格条件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DragTableCondition dragTableCondition)
+    public AjaxResult add(@RequestBody CommonEntity commonEntity)
     {
-        return toAjax(dragTableConditionService.insertDragTableCondition(dragTableCondition));
+        return toAjax(dragTableConditionService.insertDragTableCondition(commonEntity));
     }
 
     /**
@@ -87,9 +64,9 @@ public class DragTableConditionController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:condition:edit')")
     @Log(title = "动态格条件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DragTableCondition dragTableCondition)
+    public AjaxResult edit(@RequestBody CommonEntity commonEntity)
     {
-        return toAjax(dragTableConditionService.updateDragTableCondition(dragTableCondition));
+        return toAjax(dragTableConditionService.updateDragTableCondition(commonEntity));
     }
 
     /**
@@ -98,8 +75,8 @@ public class DragTableConditionController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:condition:remove')")
     @Log(title = "动态格条件", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{tcIds}")
-    public AjaxResult remove(@PathVariable Long[] tcIds)
+    public AjaxResult remove(@RequestBody CommonEntity commonEntity)
     {
-        return toAjax(dragTableConditionService.deleteDragTableConditionByTcIds(tcIds));
+        return toAjax(dragTableConditionService.deleteDragTableConditionByTcIds(commonEntity));
     }
 }

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

@@ -1,8 +1,12 @@
 package com.ruoyi.system.mapper;
 
+import com.ruoyi.system.entity.CommonEntity;
 import com.ruoyi.system.entity.DragTableCondition;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 动态格条件Mapper接口
@@ -12,45 +16,20 @@ import java.util.List;
  */
 public interface DragTableConditionMapper 
 {
-    /**
-     * 查询动态格条件
-     * 
-     * @param tcId 动态格条件主键
-     * @return 动态格条件
-     */
-    DragTableCondition selectDragTableConditionByTcId(Long tcId);
-
     /**
      * 查询动态格条件列表
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 动态格条件集合
      */
-    List<DragTableCondition> selectDragTableConditionList(DragTableCondition dragTableCondition);
+    List<CommonEntity> selectDragTableConditionList(@Param("conditions") Map<String, Object> conditions);
 
     /**
      * 新增动态格条件
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 结果
      */
-    int insertDragTableCondition(DragTableCondition dragTableCondition);
+    int insertDragTableCondition(@Param("fieldNames") Set<String> fieldNames,@Param("fieldValues") List<Map<String, Object>> fieldValues);
 
     /**
      * 修改动态格条件
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 结果
-     */
-    int updateDragTableCondition(DragTableCondition dragTableCondition);
-
-    /**
-     * 删除动态格条件
-     * 
-     * @param tcId 动态格条件主键
-     * @return 结果
      */
-    int deleteDragTableConditionByTcId(Long tcId);
+    int updateDragTableCondition(@Param("fields") Map<String, Object> fields, @Param("conditions") Map<String, Object> conditions);
 
     /**
      * 批量删除动态格条件
@@ -58,7 +37,7 @@ public interface DragTableConditionMapper
      * @param tcIds 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteDragTableConditionByTcIds(Long[] tcIds);
+    int deleteDragTableConditionByTcIds(@Param("conditions") Map<String, Object> conditions);
 
     /**
      * 查询动态格条件

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service;
 
+import com.ruoyi.system.entity.CommonEntity;
 import com.ruoyi.system.entity.DragTableCondition;
 
 import java.util.List;
@@ -12,51 +13,25 @@ import java.util.List;
  */
 public interface IDragTableConditionService 
 {
-    /**
-     * 查询动态格条件
-     * 
-     * @param tcId 动态格条件主键
-     * @return 动态格条件
-     */
-    public DragTableCondition selectDragTableConditionByTcId(Long tcId);
 
     /**
      * 查询动态格条件列表
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 动态格条件集合
      */
-    public List<DragTableCondition> selectDragTableConditionList(DragTableCondition dragTableCondition);
+    List<CommonEntity> selectDragTableConditionList(CommonEntity commonEntity);
 
     /**
      * 新增动态格条件
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 结果
      */
-    public int insertDragTableCondition(DragTableCondition dragTableCondition);
+    int insertDragTableCondition(CommonEntity commonEntity);
 
     /**
      * 修改动态格条件
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 结果
      */
-    public int updateDragTableCondition(DragTableCondition dragTableCondition);
+    int updateDragTableCondition(CommonEntity commonEntity);
 
     /**
      * 批量删除动态格条件
-     * 
-     * @param tcIds 需要删除的动态格条件主键集合
-     * @return 结果
      */
-    public int deleteDragTableConditionByTcIds(Long[] tcIds);
+    int deleteDragTableConditionByTcIds(CommonEntity commonEntity);
 
-    /**
-     * 删除动态格条件信息
-     * 
-     * @param tcId 动态格条件主键
-     * @return 结果
-     */
-    public int deleteDragTableConditionByTcId(Long tcId);
 }

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

@@ -1,7 +1,11 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
+import java.util.*;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.entity.CommonEntity;
 import com.ruoyi.system.entity.DragTableCondition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,77 +24,47 @@ public class DragTableConditionServiceImpl implements IDragTableConditionService
     @Autowired
     private DragTableConditionMapper dragTableConditionMapper;
 
-    /**
-     * 查询动态格条件
-     * 
-     * @param tcId 动态格条件主键
-     * @return 动态格条件
-     */
-    @Override
-    public DragTableCondition selectDragTableConditionByTcId(Long tcId)
-    {
-        return dragTableConditionMapper.selectDragTableConditionByTcId(tcId);
-    }
 
-    /**
-     * 查询动态格条件列表
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 动态格条件
-     */
     @Override
-    public List<DragTableCondition> selectDragTableConditionList(DragTableCondition dragTableCondition)
+    public List<CommonEntity> selectDragTableConditionList(CommonEntity commonEntity)
     {
-        return dragTableConditionMapper.selectDragTableConditionList(dragTableCondition);
+        Map<String, Object> conditions = JSONObject.parseObject(JSON.toJSONString(commonEntity.getQueryMap()));
+        return dragTableConditionMapper.selectDragTableConditionList(conditions);
     }
 
-    /**
-     * 新增动态格条件
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 结果
-     */
     @Override
-    public int insertDragTableCondition(DragTableCondition dragTableCondition)
+    public int insertDragTableCondition(CommonEntity commonEntity)
     {
-        dragTableCondition.setCreateTime(DateUtils.getNowDate());
-        return dragTableConditionMapper.insertDragTableCondition(dragTableCondition);
+        List<Object> list = (List<Object>) commonEntity.getCommMap();
+        List<Map<String, Object>> mapList = new ArrayList<>();
+        for (Object obj : list) {
+            System.out.println(obj);
+            Map<String, Object> map1 = (Map<String, Object>) obj;
+            mapList.add(map1);
+        }
+        Set<String> fieldNames = new LinkedHashSet<>();
+        mapList.stream().forEach(map1 -> {
+            map1.forEach((key, value) -> {
+                fieldNames.add(key);
+            });
+        });
+        return dragTableConditionMapper.insertDragTableCondition(fieldNames, mapList);
     }
 
-    /**
-     * 修改动态格条件
-     * 
-     * @param dragTableCondition 动态格条件
-     * @return 结果
-     */
     @Override
-    public int updateDragTableCondition(DragTableCondition dragTableCondition)
+    public int updateDragTableCondition(CommonEntity commonEntity)
     {
-        dragTableCondition.setUpdateTime(DateUtils.getNowDate());
-        return dragTableConditionMapper.updateDragTableCondition(dragTableCondition);
+        Map<String, Object> conditions = JSONObject.parseObject(JSON.toJSONString(commonEntity.getConditionMap()));
+        Map<String, Object> fields = JSONObject.parseObject(JSON.toJSONString(commonEntity.getCommMap()));
+        return dragTableConditionMapper.updateDragTableCondition(fields, conditions);
     }
 
-    /**
-     * 批量删除动态格条件
-     * 
-     * @param tcIds 需要删除的动态格条件主键
-     * @return 结果
-     */
     @Override
-    public int deleteDragTableConditionByTcIds(Long[] tcIds)
+    public int deleteDragTableConditionByTcIds(CommonEntity commonEntity)
     {
-        return dragTableConditionMapper.deleteDragTableConditionByTcIds(tcIds);
+        Map<String, Object> conditions = JSONObject.parseObject(JSON.toJSONString(commonEntity.getConditionMap()));
+        return dragTableConditionMapper.deleteDragTableConditionByTcIds(conditions);
     }
 
-    /**
-     * 删除动态格条件信息
-     * 
-     * @param tcId 动态格条件主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDragTableConditionByTcId(Long tcId)
-    {
-        return dragTableConditionMapper.deleteDragTableConditionByTcId(tcId);
-    }
+
 }

ruoyi-system/src/main/resources/mapper/dragmapper/DragTableConditionMapper.xml

@@ -21,92 +21,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap id="retMap" type="com.ruoyi.system.entity.CommonEntity" autoMapping="true">
+        <collection property="resultMap" ofType="map" autoMapping="true"
+                    javaType="map"></collection>
+    </resultMap>
+
     <sql id="selectDragTableConditionVo">
         select tc_id, t_id, condition_name, condition_field, condition_notes, condition_type, condition_default_value, sort, is_hidden, del_flag, create_by, create_time, update_by, update_time from drag_table_condition
     </sql>
 
-    <select id="selectDragTableConditionList" parameterType="com.ruoyi.system.entity.DragTableCondition" resultMap="DragTableConditionResult">
-        <include refid="selectDragTableConditionVo"/>
-        <where>  
-            <if test="tId != null "> and t_id = #{tId}</if>
-            <if test="conditionName != null  and conditionName != ''"> and condition_name like concat('%', #{conditionName}, '%')</if>
-            <if test="conditionField != null  and conditionField != ''"> and condition_field = #{conditionField}</if>
-            <if test="conditionNotes != null  and conditionNotes != ''"> and condition_notes = #{conditionNotes}</if>
-            <if test="conditionType != null  and conditionType != ''"> and condition_type = #{conditionType}</if>
-            <if test="conditionDefaultValue != null  and conditionDefaultValue != ''"> and condition_default_value = #{conditionDefaultValue}</if>
-            <if test="sort != null "> and sort = #{sort}</if>
-            <if test="isHidden != null  and isHidden != ''"> and is_hidden = #{isHidden}</if>
+    <select id="selectDragTableConditionList" resultMap="retMap">
+        select * from drag_table_condition
+        <where>
+            <if test="conditions != null">
+                <foreach collection="conditions" item="value" index="key" separator="and">
+                    ${key}=#{value}
+                </foreach>
+            </if>
         </where>
     </select>
-    
-    <select id="selectDragTableConditionByTcId" parameterType="Long" resultMap="DragTableConditionResult">
-        <include refid="selectDragTableConditionVo"/>
-        where tc_id = #{tcId}
-    </select>
         
-    <insert id="insertDragTableCondition" parameterType="com.ruoyi.system.entity.DragTableCondition" useGeneratedKeys="true" keyProperty="tcId">
+    <insert id="insertDragTableCondition">
         insert into drag_table_condition
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="tId != null">t_id,</if>
-            <if test="conditionName != null">condition_name,</if>
-            <if test="conditionField != null">condition_field,</if>
-            <if test="conditionNotes != null">condition_notes,</if>
-            <if test="conditionType != null">condition_type,</if>
-            <if test="conditionDefaultValue != null">condition_default_value,</if>
-            <if test="sort != null">sort,</if>
-            <if test="isHidden != null">is_hidden,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">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="tId != null">#{tId},</if>
-            <if test="conditionName != null">#{conditionName},</if>
-            <if test="conditionField != null">#{conditionField},</if>
-            <if test="conditionNotes != null">#{conditionNotes},</if>
-            <if test="conditionType != null">#{conditionType},</if>
-            <if test="conditionDefaultValue != null">#{conditionDefaultValue},</if>
-            <if test="sort != null">#{sort},</if>
-            <if test="isHidden != null">#{isHidden},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        <foreach collection="fieldNames" item="fieldName" open="(" close=")" separator=",">
+            ${fieldName}
+        </foreach>
+        values
+        <foreach collection="fieldValues" item="map" separator=",">
+            <foreach collection="map" item="value" index="key" separator="," open="(" close=")">
+                #{value}
+            </foreach>
+        </foreach>
     </insert>
 
-    <update id="updateDragTableCondition" parameterType="com.ruoyi.system.entity.DragTableCondition">
-        update drag_table_condition
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="tId != null">t_id = #{tId},</if>
-            <if test="conditionName != null">condition_name = #{conditionName},</if>
-            <if test="conditionField != null">condition_field = #{conditionField},</if>
-            <if test="conditionNotes != null">condition_notes = #{conditionNotes},</if>
-            <if test="conditionType != null">condition_type = #{conditionType},</if>
-            <if test="conditionDefaultValue != null">condition_default_value = #{conditionDefaultValue},</if>
-            <if test="sort != null">sort = #{sort},</if>
-            <if test="isHidden != null">is_hidden = #{isHidden},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">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>
+    <update id="updateDragTableCondition">
+        update drag_table_condition set
+        <foreach collection="fields" item="field" index="key" separator=",">
+            ${key}=#{field}
+        </foreach>
+        <where>
+            <if test="conditions != null">
+                <foreach collection="conditions" item="value" index="key" separator="and">
+                    ${key}=#{value}
+                </foreach>
+            </if>
+        </where>
         where tc_id = #{tcId}
     </update>
 
-    <delete id="deleteDragTableConditionByTcId" parameterType="Long">
-        delete from drag_table_condition where tc_id = #{tcId}
-    </delete>
-
-    <delete id="deleteDragTableConditionByTcIds" parameterType="String">
-        delete from drag_table_condition where tc_id in 
-        <foreach item="tcId" collection="array" open="(" separator="," close=")">
-            #{tcId}
-        </foreach>
+    <delete id="deleteDragTableConditionByTcIds">
+        delete from drag_table_condition
+        <where>
+            <if test="conditions != null">
+                <foreach collection="conditions" item="value" index="key" separator="and">
+                    ${key} in
+                    <foreach collection="value" item="v" open="(" close=")" separator=",">
+                        #{v}
+                    </foreach>
+                </foreach>
+            </if>
+        </where>
     </delete>
 
     <select id="selectDragTableConditionByTid" resultMap="DragTableConditionResult">