ZhuDeKang 6 tháng trước cách đây
mục cha
commit
b8b279a32f

+ 5 - 7
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdDataFieldController.java

@@ -5,8 +5,6 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.StringUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -69,10 +67,10 @@ public class MdDataFieldController extends BaseController
     /**
      * 获取数据集字段详细信息
      */
-    @GetMapping(value = "/{dsCode}")
-    public AjaxResult getInfo(@PathVariable("dsCode") String dsCode)
+    @GetMapping(value = "/{dcCode}")
+    public AjaxResult getInfo(@PathVariable("dcCode") String dcCode)
     {
-        return success(mdDataFieldService.selectMdDataFieldByDsCode(dsCode));
+        return success(mdDataFieldService.selectMdDataFieldByDsCode(dcCode));
     }
 
     /**
@@ -93,13 +91,13 @@ public class MdDataFieldController extends BaseController
     public AjaxResult addList(@RequestBody List<MdDataField> mdDataFields)
     {
         List<MdDataField> collect = mdDataFields.stream()
-                .filter(item -> StringUtils.isNotNull(item.getDsCode()))
+                .filter(item -> StringUtils.isNotNull(item.getDcCode()))
                 .filter(item -> StringUtils.isNotNull(item.getMetaTable()))
                 .filter(item -> StringUtils.isNotNull(item.getFieldCode())).collect(Collectors.toList());
         if (StringUtils.isEmpty(collect)) {
             return AjaxResult.error();
         }
-        mdDataFieldService.deleteMdDataFieldByDsCode(collect.get(0).getDsCode());
+        mdDataFieldService.deleteMdDataFieldByDsCode(collect.get(0).getDcCode());
         collect.forEach(mdDataFieldService::insertMdDataField);
         return AjaxResult.success();
     }

+ 27 - 17
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/SysMetaFieldController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.interfaces.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,14 +26,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 元数据字段Controller
- * 
+ *
  * @author 朱得糠
  * @date 2025-08-02
  */
 @RestController
 @RequestMapping("/meta/field")
-public class SysMetaFieldController extends BaseController
-{
+public class SysMetaFieldController extends BaseController {
     @Autowired
     private ISysMetaFieldService sysMetaFieldService;
 
@@ -38,8 +40,7 @@ public class SysMetaFieldController extends BaseController
      * 查询元数据字段列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SysMetaField sysMetaField)
-    {
+    public TableDataInfo list(SysMetaField sysMetaField) {
         startPage();
         List<SysMetaField> list = sysMetaFieldService.selectSysMetaFieldList(sysMetaField);
         return getDataTable(list);
@@ -50,8 +51,7 @@ public class SysMetaFieldController extends BaseController
      */
     @Log(title = "元数据字段", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysMetaField sysMetaField)
-    {
+    public void export(HttpServletResponse response, SysMetaField sysMetaField) {
         List<SysMetaField> list = sysMetaFieldService.selectSysMetaFieldList(sysMetaField);
         ExcelUtil<SysMetaField> util = new ExcelUtil<SysMetaField>(SysMetaField.class);
         util.exportExcel(response, list, "元数据字段数据");
@@ -61,8 +61,7 @@ public class SysMetaFieldController extends BaseController
      * 获取元数据字段列表
      */
     @GetMapping("/allList")
-    public AjaxResult getInfo(SysMetaField sysMetaField)
-    {
+    public AjaxResult getInfo(SysMetaField sysMetaField) {
         return success(sysMetaFieldService.selectSysMetaFieldList(sysMetaField));
     }
 
@@ -71,18 +70,31 @@ public class SysMetaFieldController extends BaseController
      */
     @Log(title = "元数据字段", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SysMetaField sysMetaField)
-    {
+    public AjaxResult add(@RequestBody SysMetaField sysMetaField) {
         return toAjax(sysMetaFieldService.insertSysMetaField(sysMetaField));
     }
 
+    /**
+     * 新增元数据字段
+     */
+    @Log(title = "元数据字段", businessType = BusinessType.INSERT)
+    @PostMapping("/addList")
+    public AjaxResult addList(@RequestBody List<SysMetaField> sysMetaFields) {
+        sysMetaFields = sysMetaFields.stream()
+                .filter(item -> StringUtils.isNotNull(item.getDsCode()))
+                .filter(item -> StringUtils.isNotNull(item.getMetaTable()))
+                .filter(item -> StringUtils.isNotNull(item.getFieldCode())).collect(Collectors.toList());
+        if (StringUtils.isEmpty(sysMetaFields)) return error("数据为空");
+        sysMetaFields.forEach(sysMetaFieldService::insertSysMetaField);
+        return success("插入成功");
+    }
+
     /**
      * 修改元数据字段
      */
     @Log(title = "元数据字段", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysMetaField sysMetaField)
-    {
+    public AjaxResult edit(@RequestBody SysMetaField sysMetaField) {
         return toAjax(sysMetaFieldService.updateSysMetaField(sysMetaField));
     }
 
@@ -90,10 +102,8 @@ public class SysMetaFieldController extends BaseController
      * 删除元数据字段
      */
     @Log(title = "元数据字段", businessType = BusinessType.DELETE)
-	@DeleteMapping
-    public AjaxResult remove(SysMetaField sysMetaField)
-    {
+    @DeleteMapping
+    public AjaxResult remove(SysMetaField sysMetaField) {
         return toAjax(sysMetaFieldService.deleteSysMetaField(sysMetaField));
     }
 }
-

+ 6 - 6
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdDataField.java

@@ -16,7 +16,7 @@ public class MdDataField extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 数据集标识 */
-    private String dsCode;
+    private String dcCode;
 
     /** 表编码 */
     private String metaTable;
@@ -92,14 +92,14 @@ public class MdDataField extends BaseEntity
     @Excel(name = "字段字典")
     private String fieldDict;
 
-    public void setDsCode(String dsCode) 
+    public void setDcCode(String dcCode)
     {
-        this.dsCode = dsCode;
+        this.dcCode = dcCode;
     }
 
-    public String getDsCode() 
+    public String getDcCode()
     {
-        return dsCode;
+        return dcCode;
     }
     public void setMetaTable(String metaTable) 
     {
@@ -276,7 +276,7 @@ public class MdDataField extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dsCode", getDsCode())
+            .append("dsCode", getDcCode())
             .append("metaTable", getMetaTable())
             .append("fieldCode", getFieldCode())
             .append("fieldName", getFieldName())