更改删除的接口

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableColumn.java

@@ -1,11 +1,10 @@
 package com.boman.gen.domain;
 
-import javax.validation.constraints.NotBlank;
-
+import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.domain.BaseEntity;
-import com.boman.system.domain.SysDictData;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -84,7 +83,7 @@ public class GenTableColumn extends BaseEntity
     private Integer sort;
 
     /** 如果是下拉框，单选，复选框 对应的子节点的值 */
-    private List<SysDictData> sysDictData;
+    private List<JSONObject> sysDictData;
 
     public String getForeignKey() {
         return foreignKey;
@@ -397,11 +396,11 @@ public class GenTableColumn extends BaseEntity
         }
     }
 
-    public List<SysDictData> getSysDictData() {
+    public List<JSONObject> getSysDictData() {
         return sysDictData;
     }
 
-    public void setSysDictData(List<SysDictData> sysDictData) {
+    public void setSysDictData(List<JSONObject> sysDictData) {
         this.sysDictData = sysDictData;
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/common/DictConstant.java

@@ -0,0 +1,11 @@
+package com.boman.system.common;
+
+/**
+ * @author shiqian
+ * @date 2021年04月02日 14:52
+ **/
+public class DictConstant {
+
+    public static final String DICT_LABEL = "dictLabel";
+    public static final String DICT_VALUE = "dictValue";
+}

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -121,9 +121,16 @@ public class TableServiceCmdService {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
         String pkName = IdUtils.getPkName(genTable.getColumns());
 
-        RowResult rowResult = deleteService.objectDelete(idArr, dto.getTable(), requireNonNull(pkName, "主键名称为空"));
-        LOGGER.info(rowResult.getMessage() + ", id: {}", Arrays.toString(idArr));
-        return AjaxResult.success(rowResult);
+        List<RowResult> result = Lists.newArrayListWithCapacity(idArr.length);
+        for (Long id : idArr) {
+            RowResult rowResult = deleteService.deleteById(dto.getTable(), pkName, id);
+            result.add(rowResult);
+            LOGGER.info(rowResult.getMessage() + ", id: {}", Arrays.toString(idArr));
+        }
+
+        // RowResult rowResult = deleteService.objectDelete(idArr, dto.getTable(), requireNonNull(pkName, "主键名称为空"));
+
+        return AjaxResult.success(result);
     }
 
 
@@ -447,12 +454,27 @@ public class TableServiceCmdService {
         for (GenTableColumn column : columns) {
             String dictType = column.getDictType();
             if (ObjectUtils.isNotEmpty(dictType)) {
-                List<SysDictData> sysDictData = dictTypeService.selectDictDataByType(dictType);
-                column.setSysDictData(sysDictData);
+                List<SysDictData> sysDictData1 = dictTypeService.selectDictDataByType(dictType);
+                column.setSysDictData(coverSysDictDataToJSONObject(sysDictData1));
             }
         }
 
         return AjaxResult.success(genTable);
     }
+
+    public List<JSONObject> coverSysDictDataToJSONObject(List<SysDictData> sysDictData) {
+        List<JSONObject> result = Lists.newArrayListWithCapacity(sysDictData.size());
+        for (SysDictData data : sysDictData) {
+            JSONObject jsonObject = new JSONObject();
+            String dictLabel = data.getDictLabel();
+            String dictValue = data.getDictValue();
+            jsonObject.put(DictConstant.DICT_LABEL, dictLabel);
+            jsonObject.put(DictConstant.DICT_VALUE, dictValue);
+            result.add(jsonObject);
+        }
+
+        return result;
+
+    }
 }
 

boman-modules/boman-system/src/main/java/com/boman/system/mapper/StandardlyMapper.java

@@ -50,7 +50,7 @@ public interface StandardlyMapper {
     int deleteByIds(@Param("tableName") String var1, @Param("ids") Long[] var2, @Param("pkName") String pkName);
 
     @Delete({"DELETE FROM ${tableName} where ID = #{id}"})
-    int deleteById(@Param("tableName") String var1, @Param("id") long var2);
+    int deleteById(@Param("tableName") String tableName, @Param("pkName") String pkName, @Param("id") long var2);
 
     @Select({"select * FROM ${tableName} where ID = #{id}"})
     JSONObject getById(@Param("tableName") String var1, @Param("id") long var2);

boman-modules/boman-system/src/main/java/com/boman/system/service/IBaseDeleteService.java

@@ -20,6 +20,17 @@ public interface IBaseDeleteService {
      */
     RowResult objectDelete(Long[] idArr, String tableName, String pkName);
 
+
+    /**
+     * 功能描述: 在此不对入参进行校验，所以在调用此方法之前一定要对参数进行校验，以免报错
+     *
+     * @param id        需要删除的iD
+     * @param tableName 业务主表
+     * @param pkName    业务表的主键名
+     * @return com.boman.system.common.RowResult
+     */
+    RowResult deleteById(String tableName, String pkName, Long id);
+
     /**
      * 功能描述: 在此不对入参进行校验，所以在调用此方法之前一定要对参数进行校验，以免报错
      *

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/BaseDeleteServiceImpl.java

@@ -35,6 +35,20 @@ public class BaseDeleteServiceImpl implements IBaseDeleteService {
         return RowResult.ok("共删除了 " + delete + " 条记录");
     }
 
+    /**
+     * 功能描述: 在此不对入参进行校验，所以在调用此方法之前一定要对参数进行校验，以免报错
+     *
+     * @param id        需要删除的iD
+     * @param tableName 业务主表
+     * @param pkName    业务表的主键名
+     * @return com.boman.system.common.RowResult
+     */
+    @Override
+    public RowResult deleteById(String tableName, String pkName, Long id) {
+        int delete = mapper.deleteById(tableName, pkName, id);
+        return RowResult.ok("共删除了 " + delete + " 条记录");
+    }
+
     /**
      * 功能描述: 在此不对入参进行校验，所以在调用此方法之前一定要对参数进行校验，以免报错
      *