ZhuDeKang 4 месяцев назад
Родитель
Сommit
170bdcb75a

+ 28 - 47
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdDataFieldController.java

@@ -21,16 +21,15 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.interfaces.domain.MdDataField;
 import com.ruoyi.interfaces.service.IMdDataFieldService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 数据集字段Controller
  * 
- * @author ruoyi
- * @date 2025-07-30
+ * @author 朱得糠
+ * @date 2025-09-04
  */
 @RestController
-@RequestMapping("/data/field")
+@RequestMapping("/interfaces/field")
 public class MdDataFieldController extends BaseController
 {
     @Autowired
@@ -40,18 +39,13 @@ public class MdDataFieldController extends BaseController
      * 查询数据集字段列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(MdDataField mdDataField)
+    public AjaxResult list(MdDataField mdDataField)
     {
-        startPage();
+        if (StringUtils.isNull(mdDataField.getDcCode())) return error("数据集id不可为空");
         List<MdDataField> list = mdDataFieldService.selectMdDataFieldList(mdDataField);
-        return getDataTable(list);
-    }
-    @GetMapping("/allList")
-    public AjaxResult allList(MdDataField mdDataField)
-    {
-        List<MdDataField> list = mdDataFieldService.selectMdDataFieldList(mdDataField);
-        return AjaxResult.success(list);
+        return success(list);
     }
+
     /**
      * 导出数据集字段列表
      */
@@ -67,45 +61,43 @@ public class MdDataFieldController extends BaseController
     /**
      * 获取数据集字段详细信息
      */
-    @GetMapping(value = "/{dcCode}")
-    public AjaxResult getInfo(@PathVariable("dcCode") String dcCode)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(mdDataFieldService.selectMdDataFieldByDsCode(dcCode));
+        return success(mdDataFieldService.selectMdDataFieldById(id));
     }
 
     /**
      * 新增数据集字段
      */
-    @Log(title = "数据集字段", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MdDataField mdDataField)
     {
         return toAjax(mdDataFieldService.insertMdDataField(mdDataField));
     }
 
-    /**
-     * 批量新增数据集字段
-     */
-    @Log(title = "数据集字段", businessType = BusinessType.INSERT)
+
     @PostMapping("/addList")
-    public AjaxResult addList(@RequestBody List<MdDataField> mdDataFields)
-    {
-        List<MdDataField> collect = mdDataFields.stream()
-                .filter(item -> StringUtils.isNotNull(item.getDcCode()))
-                .filter(item -> StringUtils.isNotNull(item.getFieldCode())).collect(Collectors.toList());
-        if (StringUtils.isEmpty(collect)) {
-            return AjaxResult.error();
+    public AjaxResult addList(@RequestBody List<MdDataField> list) {
+        List<MdDataField> collect = list.stream().filter(p -> StringUtils.isNotNull(p.getId()))
+                .filter(p -> StringUtils.isNotNull(p.getParentId()))
+                .filter(p -> StringUtils.isNotNull(p.getDcCode()))
+                .filter(p -> StringUtils.isNotNull(p.getFieldType())).collect(Collectors.toList());
+        if (StringUtils.isEmpty(collect)) return error("数据为空");
+
+        mdDataFieldService.deleteMdDataFieldByDcCode(collect.get(0).getDcCode());
+
+        for (int i = 0; i < collect.size(); i++) {
+            collect.get(i).setFieldOrder(i);
         }
-        mdDataFieldService.deleteMdDataFieldByDsCode(collect.get(0).getDcCode());
-        collect.forEach(mdDataFieldService::insertMdDataField);
-        return AjaxResult.success();
-    }
 
+        collect.stream().forEach(mdDataFieldService::insertMdDataField);
+        return success();
+    }
 
     /**
      * 修改数据集字段
      */
-    @Log(title = "数据集字段", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody MdDataField mdDataField)
     {
@@ -115,20 +107,9 @@ public class MdDataFieldController extends BaseController
     /**
      * 删除数据集字段
      */
-    @Log(title = "数据集字段", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{dsCodes}")
-    public AjaxResult remove(@PathVariable String[] dsCodes)
-    {
-        return toAjax(mdDataFieldService.deleteMdDataFieldByDsCodes(dsCodes));
-    }
-
-    /**
-     * 删除数据集字段
-     */
-    @Log(title = "数据集字段", businessType = BusinessType.DELETE)
-    @DeleteMapping("/removeOne")
-    public AjaxResult removeOne(MdDataField mdDataField)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(mdDataFieldService.deleteMdDataFieldOne(mdDataField));
+        return toAjax(mdDataFieldService.deleteMdDataFieldByIds(ids));
     }
 }

+ 8 - 1
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/PtServiceController.java

@@ -3,6 +3,7 @@ package com.ruoyi.interfaces.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -55,6 +56,7 @@ public class PtServiceController extends BaseController {
         if (ptService.getViewNum() == null) {  //viewNum不能为空
             ptService.setViewNum(0);
         }
+        ptService.setAudit("0");
         boolean save = ptServiceService.save(ptService);
         if (save) {
             return AjaxResult.success(ptService);
@@ -189,8 +191,13 @@ public class PtServiceController extends BaseController {
         PtServiceLog ptServiceLog = new PtServiceLog(ptService);
         Date nowDate = DateUtils.getNowDate();
         ptServiceLog.setTm(nowDate);
+        String s = "";
+        try {
 
-        String s = ptServiceService.testRun(ptService);
+         s = ptServiceService.testRun(ptService);
+        } catch (Exception e){
+            return new  AjaxResult(HttpStatus.HTTP_ERROR,s);
+        }
 
         ptServiceLog.setExecTm(
                 DateUtils.getNowDate().getTime() - nowDate.getTime());

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

@@ -7,300 +7,340 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 数据集字段对象 md_data_field
- *
- * @author ruoyi
- * @date 2025-07-30
+ * 
+ * @author 朱得糠
+ * @date 2025-09-04
  */
-public class MdDataField extends BaseEntity {
+public class MdDataField extends BaseEntity
+{
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 数据集标识
-     */
-    private String dcCode;
+    /** ID */
+    @Excel(name = "ID")
+    private Long id;
+
+    /** 父id */
+    @Excel(name = "父id")
+    private Long parentId;
 
+    /** 数据集标识 */
+    @Excel(name = "数据集标识")
+    private String dcCode;
 
-    /**
-     * 字段编码
-     */
+    /** 字段编码 */
+    @Excel(name = "字段编码")
     private String fieldCode;
 
-    /**
-     * 字段中文名
-     */
+    /** 字段中文名 */
     @Excel(name = "字段中文名")
     private String fieldName;
 
-    /**
-     * 字段类型
-     */
+    /** 字段类型 */
     @Excel(name = "字段类型")
     private String fieldType;
 
-    /**
-     * 字段长度
-     */
+    /** 字段长度 */
     @Excel(name = "字段长度")
     private String fieldLength;
 
-    /**
-     * 字段精度
-     */
+    /** 字段精度 */
     @Excel(name = "字段精度")
     private String fieldPrecision;
 
-    /**
-     * 是否为主键
-     */
+    /** 是否为主键 */
     @Excel(name = "是否为主键")
     private String fieldIspri;
 
-    /**
-     * 是否允许为空
-     */
+    /** 是否允许为空 */
     @Excel(name = "是否允许为空")
     private String fieldIsnullable;
 
-    /**
-     * 默认值
-     */
+    /** 默认值 */
     @Excel(name = "默认值")
     private String fieldDefault;
 
-    /**
-     * 描述
-     */
+    /** 描述 */
     @Excel(name = "描述")
     private String fieldDesc;
 
-    /**
-     * 字段状态
-     */
+    /** 字段状态 */
     @Excel(name = "字段状态")
     private String fieldStatus;
 
-    /**
-     * 字段顺序
-     */
+    /** 字段顺序 */
     @Excel(name = "字段顺序")
-    private Long fieldOrder;
+    private Integer fieldOrder;
 
-    /**
-     * 字段扩展
-     */
+    /** 字段扩展 */
     @Excel(name = "字段扩展")
     private String fieldExtend;
 
-    /**
-     * 字段扩展表
-     */
+    /** 字段扩展表 */
     @Excel(name = "字段扩展表")
     private String fieldExtendTable;
 
-    /**
-     * 字段输入类型
-     */
+    /** 字段输入类型 */
     @Excel(name = "字段输入类型")
     private String fieldInputType;
 
-    /**
-     * 字段输入格式
-     */
+    /** 字段输入格式 */
     @Excel(name = "字段输入格式")
     private String fieldInputFormat;
 
-    /**
-     * 字段输入默认值
-     */
+    /** 字段输入默认值 */
     @Excel(name = "字段输入默认值")
     private String fieldInputDefault;
 
-    /**
-     * 字段显示类型
-     */
+    /** 字段显示类型 */
     @Excel(name = "字段显示类型")
     private String fieldViewType;
 
-    /**
-     * 字段字典
-     */
+    /** 字段字典 */
     @Excel(name = "字段字典")
     private String fieldDict;
 
-    public void setDcCode(String dcCode) {
+    /** 是否数组 */
+    @Excel(name = "是否数组")
+    private String isArray;
+
+    /** 数组坐标 */
+    @Excel(name = "数组坐标")
+    private String arrayIndex;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+    public void setDcCode(String dcCode) 
+    {
         this.dcCode = dcCode;
     }
 
-    public String getDcCode() {
+    public String getDcCode() 
+    {
         return dcCode;
     }
-
-    public void setFieldCode(String fieldCode) {
+    public void setFieldCode(String fieldCode) 
+    {
         this.fieldCode = fieldCode;
     }
 
-    public String getFieldCode() {
+    public String getFieldCode() 
+    {
         return fieldCode;
     }
-
-    public void setFieldName(String fieldName) {
+    public void setFieldName(String fieldName) 
+    {
         this.fieldName = fieldName;
     }
 
-    public String getFieldName() {
+    public String getFieldName() 
+    {
         return fieldName;
     }
-
-    public void setFieldType(String fieldType) {
+    public void setFieldType(String fieldType) 
+    {
         this.fieldType = fieldType;
     }
 
-    public String getFieldType() {
+    public String getFieldType() 
+    {
         return fieldType;
     }
-
-    public void setFieldLength(String fieldLength) {
+    public void setFieldLength(String fieldLength) 
+    {
         this.fieldLength = fieldLength;
     }
 
-    public String getFieldLength() {
+    public String getFieldLength() 
+    {
         return fieldLength;
     }
-
-    public void setFieldPrecision(String fieldPrecision) {
+    public void setFieldPrecision(String fieldPrecision) 
+    {
         this.fieldPrecision = fieldPrecision;
     }
 
-    public String getFieldPrecision() {
+    public String getFieldPrecision() 
+    {
         return fieldPrecision;
     }
-
-    public void setFieldIspri(String fieldIspri) {
+    public void setFieldIspri(String fieldIspri) 
+    {
         this.fieldIspri = fieldIspri;
     }
 
-    public String getFieldIspri() {
+    public String getFieldIspri() 
+    {
         return fieldIspri;
     }
-
-    public void setFieldIsnullable(String fieldIsnullable) {
+    public void setFieldIsnullable(String fieldIsnullable) 
+    {
         this.fieldIsnullable = fieldIsnullable;
     }
 
-    public String getFieldIsnullable() {
+    public String getFieldIsnullable() 
+    {
         return fieldIsnullable;
     }
-
-    public void setFieldDefault(String fieldDefault) {
+    public void setFieldDefault(String fieldDefault) 
+    {
         this.fieldDefault = fieldDefault;
     }
 
-    public String getFieldDefault() {
+    public String getFieldDefault() 
+    {
         return fieldDefault;
     }
-
-    public void setFieldDesc(String fieldDesc) {
+    public void setFieldDesc(String fieldDesc) 
+    {
         this.fieldDesc = fieldDesc;
     }
 
-    public String getFieldDesc() {
+    public String getFieldDesc() 
+    {
         return fieldDesc;
     }
-
-    public void setFieldStatus(String fieldStatus) {
+    public void setFieldStatus(String fieldStatus) 
+    {
         this.fieldStatus = fieldStatus;
     }
 
-    public String getFieldStatus() {
+    public String getFieldStatus() 
+    {
         return fieldStatus;
     }
-
-    public void setFieldOrder(Long fieldOrder) {
+    public void setFieldOrder(Integer fieldOrder)
+    {
         this.fieldOrder = fieldOrder;
     }
 
-    public Long getFieldOrder() {
+    public Integer getFieldOrder()
+    {
         return fieldOrder;
     }
-
-    public void setFieldExtend(String fieldExtend) {
+    public void setFieldExtend(String fieldExtend) 
+    {
         this.fieldExtend = fieldExtend;
     }
 
-    public String getFieldExtend() {
+    public String getFieldExtend() 
+    {
         return fieldExtend;
     }
-
-    public void setFieldExtendTable(String fieldExtendTable) {
+    public void setFieldExtendTable(String fieldExtendTable) 
+    {
         this.fieldExtendTable = fieldExtendTable;
     }
 
-    public String getFieldExtendTable() {
+    public String getFieldExtendTable() 
+    {
         return fieldExtendTable;
     }
-
-    public void setFieldInputType(String fieldInputType) {
+    public void setFieldInputType(String fieldInputType) 
+    {
         this.fieldInputType = fieldInputType;
     }
 
-    public String getFieldInputType() {
+    public String getFieldInputType() 
+    {
         return fieldInputType;
     }
-
-    public void setFieldInputFormat(String fieldInputFormat) {
+    public void setFieldInputFormat(String fieldInputFormat) 
+    {
         this.fieldInputFormat = fieldInputFormat;
     }
 
-    public String getFieldInputFormat() {
+    public String getFieldInputFormat() 
+    {
         return fieldInputFormat;
     }
-
-    public void setFieldInputDefault(String fieldInputDefault) {
+    public void setFieldInputDefault(String fieldInputDefault) 
+    {
         this.fieldInputDefault = fieldInputDefault;
     }
 
-    public String getFieldInputDefault() {
+    public String getFieldInputDefault() 
+    {
         return fieldInputDefault;
     }
-
-    public void setFieldViewType(String fieldViewType) {
+    public void setFieldViewType(String fieldViewType) 
+    {
         this.fieldViewType = fieldViewType;
     }
 
-    public String getFieldViewType() {
+    public String getFieldViewType() 
+    {
         return fieldViewType;
     }
-
-    public void setFieldDict(String fieldDict) {
+    public void setFieldDict(String fieldDict) 
+    {
         this.fieldDict = fieldDict;
     }
 
-    public String getFieldDict() {
+    public String getFieldDict() 
+    {
         return fieldDict;
     }
+    public void setIsArray(String isArray) 
+    {
+        this.isArray = isArray;
+    }
+
+    public String getIsArray() 
+    {
+        return isArray;
+    }
+    public void setArrayIndex(String arrayIndex) 
+    {
+        this.arrayIndex = arrayIndex;
+    }
+
+    public String getArrayIndex() 
+    {
+        return arrayIndex;
+    }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("dsCode", getDcCode())
-                .append("fieldCode", getFieldCode())
-                .append("fieldName", getFieldName())
-                .append("fieldType", getFieldType())
-                .append("fieldLength", getFieldLength())
-                .append("fieldPrecision", getFieldPrecision())
-                .append("fieldIspri", getFieldIspri())
-                .append("fieldIsnullable", getFieldIsnullable())
-                .append("fieldDefault", getFieldDefault())
-                .append("fieldDesc", getFieldDesc())
-                .append("fieldStatus", getFieldStatus())
-                .append("fieldOrder", getFieldOrder())
-                .append("fieldExtend", getFieldExtend())
-                .append("fieldExtendTable", getFieldExtendTable())
-                .append("fieldInputType", getFieldInputType())
-                .append("fieldInputFormat", getFieldInputFormat())
-                .append("fieldInputDefault", getFieldInputDefault())
-                .append("fieldViewType", getFieldViewType())
-                .append("fieldDict", getFieldDict())
-                .toString();
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("parentId", getParentId())
+            .append("dcCode", getDcCode())
+            .append("fieldCode", getFieldCode())
+            .append("fieldName", getFieldName())
+            .append("fieldType", getFieldType())
+            .append("fieldLength", getFieldLength())
+            .append("fieldPrecision", getFieldPrecision())
+            .append("fieldIspri", getFieldIspri())
+            .append("fieldIsnullable", getFieldIsnullable())
+            .append("fieldDefault", getFieldDefault())
+            .append("fieldDesc", getFieldDesc())
+            .append("fieldStatus", getFieldStatus())
+            .append("fieldOrder", getFieldOrder())
+            .append("fieldExtend", getFieldExtend())
+            .append("fieldExtendTable", getFieldExtendTable())
+            .append("fieldInputType", getFieldInputType())
+            .append("fieldInputFormat", getFieldInputFormat())
+            .append("fieldInputDefault", getFieldInputDefault())
+            .append("fieldViewType", getFieldViewType())
+            .append("fieldDict", getFieldDict())
+            .append("isArray", getIsArray())
+            .append("arrayIndex", getArrayIndex())
+            .toString();
     }
 }

+ 9 - 13
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdDataFieldMapper.java

@@ -1,27 +1,23 @@
 package com.ruoyi.interfaces.mapper;
 
 import java.util.List;
-
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.interfaces.domain.MdDataField;
 
 /**
  * 数据集字段Mapper接口
  * 
- * @author ruoyi
- * @date 2025-07-30
+ * @author 朱得糠
+ * @date 2025-09-04
  */
-@DataSource(DataSourceType.SLAVE)
 public interface MdDataFieldMapper 
 {
     /**
      * 查询数据集字段
      * 
-     * @param dsCode 数据集字段主键
+     * @param id 数据集字段主键
      * @return 数据集字段
      */
-    public List<MdDataField> selectMdDataFieldByDsCode(String dsCode);
+    public MdDataField selectMdDataFieldById(Long id);
 
     /**
      * 查询数据集字段列表
@@ -50,18 +46,18 @@ public interface MdDataFieldMapper
     /**
      * 删除数据集字段
      * 
-     * @param dsCode 数据集字段主键
+     * @param id 数据集字段主键
      * @return 结果
      */
-    public int deleteMdDataFieldByDsCode(String dsCode);
+    public int deleteMdDataFieldById(Long id);
 
     /**
      * 批量删除数据集字段
      * 
-     * @param dsCodes 需要删除的数据主键集合
+     * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteMdDataFieldByDsCodes(String[] dsCodes);
+    public int deleteMdDataFieldByIds(Long[] ids);
 
-    int deleteMdDataFieldOne(MdDataField mdDataField);
+    int deleteMdDataFieldByDcCode(String dcCode);
 }

+ 4 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdDataSetParamMapper.java

@@ -1,6 +1,9 @@
 package com.ruoyi.interfaces.mapper;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.interfaces.domain.MdDataSetParam;
 
 /**
@@ -9,6 +12,7 @@ import com.ruoyi.interfaces.domain.MdDataSetParam;
  * @author 朱得糠
  * @date 2025-09-03
  */
+@DataSource(DataSourceType.SLAVE)
 public interface MdDataSetParamMapper 
 {
     /**

+ 11 - 9
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdDataFieldService.java

@@ -6,18 +6,18 @@ import com.ruoyi.interfaces.domain.MdDataField;
 /**
  * 数据集字段Service接口
  * 
- * @author ruoyi
- * @date 2025-07-30
+ * @author 朱得糠
+ * @date 2025-09-04
  */
 public interface IMdDataFieldService 
 {
     /**
      * 查询数据集字段
      * 
-     * @param dsCode 数据集字段主键
+     * @param id 数据集字段主键
      * @return 数据集字段
      */
-    public List<MdDataField> selectMdDataFieldByDsCode(String dsCode);
+    public MdDataField selectMdDataFieldById(Long id);
 
     /**
      * 查询数据集字段列表
@@ -46,18 +46,20 @@ public interface IMdDataFieldService
     /**
      * 批量删除数据集字段
      * 
-     * @param dsCodes 需要删除的数据集字段主键集合
+     * @param ids 需要删除的数据集字段主键集合
      * @return 结果
      */
-    public int deleteMdDataFieldByDsCodes(String[] dsCodes);
+    public int deleteMdDataFieldByIds(Long[] ids);
 
     /**
      * 删除数据集字段信息
      * 
-     * @param dsCode 数据集字段主键
+     * @param id 数据集字段主键
      * @return 结果
      */
-    public int deleteMdDataFieldByDsCode(String dsCode);
+    public int deleteMdDataFieldById(Long id);
 
-    int deleteMdDataFieldOne(MdDataField mdDataField);
+    int deleteMdDataFieldByDcCode(String dcCode);
+
+    List<MdDataField> selectMdDataFieldByDsCode(String dcCode);
 }

+ 20 - 13
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdDataFieldServiceImpl.java

@@ -10,8 +10,8 @@ import com.ruoyi.interfaces.service.IMdDataFieldService;
 /**
  * 数据集字段Service业务层处理
  * 
- * @author ruoyi
- * @date 2025-07-30
+ * @author 朱得糠
+ * @date 2025-09-04
  */
 @Service
 public class MdDataFieldServiceImpl implements IMdDataFieldService 
@@ -22,13 +22,13 @@ public class MdDataFieldServiceImpl implements IMdDataFieldService
     /**
      * 查询数据集字段
      * 
-     * @param dsCode 数据集字段主键
+     * @param id 数据集字段主键
      * @return 数据集字段
      */
     @Override
-    public List<MdDataField> selectMdDataFieldByDsCode(String dsCode)
+    public MdDataField selectMdDataFieldById(Long id)
     {
-        return mdDataFieldMapper.selectMdDataFieldByDsCode(dsCode);
+        return mdDataFieldMapper.selectMdDataFieldById(id);
     }
 
     /**
@@ -70,29 +70,36 @@ public class MdDataFieldServiceImpl implements IMdDataFieldService
     /**
      * 批量删除数据集字段
      * 
-     * @param dsCodes 需要删除的数据集字段主键
+     * @param ids 需要删除的数据集字段主键
      * @return 结果
      */
     @Override
-    public int deleteMdDataFieldByDsCodes(String[] dsCodes)
+    public int deleteMdDataFieldByIds(Long[] ids)
     {
-        return mdDataFieldMapper.deleteMdDataFieldByDsCodes(dsCodes);
+        return mdDataFieldMapper.deleteMdDataFieldByIds(ids);
     }
 
     /**
      * 删除数据集字段信息
      * 
-     * @param dsCode 数据集字段主键
+     * @param id 数据集字段主键
      * @return 结果
      */
     @Override
-    public int deleteMdDataFieldByDsCode(String dsCode)
+    public int deleteMdDataFieldById(Long id)
     {
-        return mdDataFieldMapper.deleteMdDataFieldByDsCode(dsCode);
+        return mdDataFieldMapper.deleteMdDataFieldById(id);
     }
 
     @Override
-    public int deleteMdDataFieldOne(MdDataField mdDataField) {
-        return mdDataFieldMapper.deleteMdDataFieldOne(mdDataField);
+    public int deleteMdDataFieldByDcCode(String dcCode) {
+        return mdDataFieldMapper.deleteMdDataFieldByDcCode(dcCode);
+    }
+
+    @Override
+    public List<MdDataField> selectMdDataFieldByDsCode(String dcCode) {
+        MdDataField mdDataField = new MdDataField();
+        mdDataField.setDcCode(dcCode);
+        return mdDataFieldMapper.selectMdDataFieldList(mdDataField);
     }
 }

+ 6 - 1
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceServiceImpl.java

@@ -164,6 +164,7 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
         //List<PtServiceParam> ptServiceParams = ptServiceParamMapper.selectAll(ptService.getSrvId());
         //String paramString = ptServiceParams.stream().map(p -> p.getParamCode() + "=" + p.getParamValue()).collect(Collectors.joining());
         List<PtServiceParam> params = ptService.getParams();
+        String paramString = "";
         switch (ptService.getRqtype()) {
             case "POST":
                 HashMap<String, Object> parMap = new HashMap<>();
@@ -172,7 +173,11 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
                 }
                return HttpUtils.sendBodyPost(ptService.getUrl(),parMap,headers);
             case "GET":
-                return HttpUtils.sendGet(ptService.getUrl(),"",headers);
+
+                for (PtServiceParam param : params) {
+                    paramString+=(param.getParamCode()+"="+param.getParamValue())+"&";
+                }
+                return HttpUtils.sendGet(ptService.getUrl(),paramString,headers);
         }
         return null;
     }

+ 124 - 73
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdDataFieldMapper.xml

@@ -5,68 +5,108 @@
 <mapper namespace="com.ruoyi.interfaces.mapper.MdDataFieldMapper">
 
     <resultMap type="com.ruoyi.interfaces.domain.MdDataField" id="MdDataFieldResult">
-        <result property="dcCode"    column="DC_CODE"    />
-        <result property="fieldCode"    column="FIELD_CODE"    />
-        <result property="fieldName"    column="FIELD_NAME"    />
-        <result property="fieldType"    column="FIELD_TYPE"    />
-        <result property="fieldLength"    column="FIELD_LENGTH"    />
-        <result property="fieldPrecision"    column="FIELD_PRECISION"    />
-        <result property="fieldIspri"    column="FIELD_ISPRI"    />
-        <result property="fieldIsnullable"    column="FIELD_ISNULLABLE"    />
-        <result property="fieldDefault"    column="FIELD_DEFAULT"    />
-        <result property="fieldDesc"    column="FIELD_DESC"    />
-        <result property="fieldStatus"    column="FIELD_STATUS"    />
-        <result property="fieldOrder"    column="FIELD_ORDER"    />
-        <result property="fieldExtend"    column="FIELD_EXTEND"    />
-        <result property="fieldExtendTable"    column="FIELD_EXTEND_TABLE"    />
-        <result property="fieldInputType"    column="FIELD_INPUT_TYPE"    />
-        <result property="fieldInputFormat"    column="FIELD_INPUT_FORMAT"    />
-        <result property="fieldInputDefault"    column="FIELD_INPUT_DEFAULT"    />
-        <result property="fieldViewType"    column="FIELD_VIEW_TYPE"    />
-        <result property="fieldDict"    column="FIELD_DICT"    />
+        <result property="id" column="ID"/>
+        <result property="parentId" column="PARENT_ID"/>
+        <result property="dcCode" column="DC_CODE"/>
+        <result property="fieldCode" column="FIELD_CODE"/>
+        <result property="fieldName" column="FIELD_NAME"/>
+        <result property="fieldType" column="FIELD_TYPE"/>
+        <result property="fieldLength" column="FIELD_LENGTH"/>
+        <result property="fieldPrecision" column="FIELD_PRECISION"/>
+        <result property="fieldIspri" column="FIELD_ISPRI"/>
+        <result property="fieldIsnullable" column="FIELD_ISNULLABLE"/>
+        <result property="fieldDefault" column="FIELD_DEFAULT"/>
+        <result property="fieldDesc" column="FIELD_DESC"/>
+        <result property="fieldStatus" column="FIELD_STATUS"/>
+        <result property="fieldOrder" column="FIELD_ORDER"/>
+        <result property="fieldExtend" column="FIELD_EXTEND"/>
+        <result property="fieldExtendTable" column="FIELD_EXTEND_TABLE"/>
+        <result property="fieldInputType" column="FIELD_INPUT_TYPE"/>
+        <result property="fieldInputFormat" column="FIELD_INPUT_FORMAT"/>
+        <result property="fieldInputDefault" column="FIELD_INPUT_DEFAULT"/>
+        <result property="fieldViewType" column="FIELD_VIEW_TYPE"/>
+        <result property="fieldDict" column="FIELD_DICT"/>
+        <result property="isArray" column="IS_ARRAY"/>
+        <result property="arrayIndex" column="ARRAY_INDEX"/>
     </resultMap>
 
     <sql id="selectMdDataFieldVo">
-        select DC_CODE,  FIELD_CODE, FIELD_NAME, FIELD_TYPE, FIELD_LENGTH, FIELD_PRECISION, FIELD_ISPRI, FIELD_ISNULLABLE, FIELD_DEFAULT, FIELD_DESC, FIELD_STATUS, FIELD_ORDER, FIELD_EXTEND, FIELD_EXTEND_TABLE, FIELD_INPUT_TYPE, FIELD_INPUT_FORMAT, FIELD_INPUT_DEFAULT, FIELD_VIEW_TYPE, FIELD_DICT from md_data_field
+        select ID,
+               PARENT_ID,
+               DC_CODE,
+               FIELD_CODE,
+               FIELD_NAME,
+               FIELD_TYPE,
+               FIELD_LENGTH,
+               FIELD_PRECISION,
+               FIELD_ISPRI,
+               FIELD_ISNULLABLE,
+               FIELD_DEFAULT,
+               FIELD_DESC,
+               FIELD_STATUS,
+               FIELD_ORDER,
+               FIELD_EXTEND,
+               FIELD_EXTEND_TABLE,
+               FIELD_INPUT_TYPE,
+               FIELD_INPUT_FORMAT,
+               FIELD_INPUT_DEFAULT,
+               FIELD_VIEW_TYPE,
+               FIELD_DICT,
+               IS_ARRAY,
+               ARRAY_INDEX
+        from md_data_field
     </sql>
 
-    <select id="selectMdDataFieldList" parameterType="com.ruoyi.interfaces.domain.MdDataField" resultMap="MdDataFieldResult">
+    <select id="selectMdDataFieldList" parameterType="com.ruoyi.interfaces.domain.MdDataField"
+            resultMap="MdDataFieldResult">
         <include refid="selectMdDataFieldVo"/>
         <where>
-            <if test="dcCode != null  and dcCode != ''"> and DC_CODE = #{dcCode}</if>
-            <if test="fieldName != null  and fieldName != ''"> and FIELD_NAME like concat('%', #{fieldName}, '%')</if>
-            <if test="fieldType != null  and fieldType != ''"> and FIELD_TYPE = #{fieldType}</if>
-            <if test="fieldLength != null  and fieldLength != ''"> and FIELD_LENGTH = #{fieldLength}</if>
-            <if test="fieldPrecision != null  and fieldPrecision != ''"> and FIELD_PRECISION = #{fieldPrecision}</if>
-            <if test="fieldIspri != null  and fieldIspri != ''"> and FIELD_ISPRI = #{fieldIspri}</if>
-            <if test="fieldIsnullable != null  and fieldIsnullable != ''"> and FIELD_ISNULLABLE = #{fieldIsnullable}</if>
-            <if test="fieldDefault != null  and fieldDefault != ''"> and FIELD_DEFAULT = #{fieldDefault}</if>
-            <if test="fieldDesc != null  and fieldDesc != ''"> and FIELD_DESC = #{fieldDesc}</if>
-            <if test="fieldStatus != null  and fieldStatus != ''"> and FIELD_STATUS = #{fieldStatus}</if>
-            <if test="fieldOrder != null "> and FIELD_ORDER = #{fieldOrder}</if>
-            <if test="fieldExtend != null  and fieldExtend != ''"> and FIELD_EXTEND = #{fieldExtend}</if>
-            <if test="fieldExtendTable != null  and fieldExtendTable != ''"> and FIELD_EXTEND_TABLE = #{fieldExtendTable}</if>
-            <if test="fieldInputType != null  and fieldInputType != ''"> and FIELD_INPUT_TYPE = #{fieldInputType}</if>
-            <if test="fieldInputFormat != null  and fieldInputFormat != ''"> and FIELD_INPUT_FORMAT = #{fieldInputFormat}</if>
-            <if test="fieldInputDefault != null  and fieldInputDefault != ''"> and FIELD_INPUT_DEFAULT = #{fieldInputDefault}</if>
-            <if test="fieldViewType != null  and fieldViewType != ''"> and FIELD_VIEW_TYPE = #{fieldViewType}</if>
-            <if test="fieldDict != null  and fieldDict != ''"> and FIELD_DICT = #{fieldDict}</if>
+            <if test="id != null ">and ID = #{id}</if>
+            <if test="parentId != null ">and PARENT_ID = #{parentId}</if>
+            <if test="dcCode != null  and dcCode != ''">and DC_CODE = #{dcCode}</if>
+            <if test="fieldCode != null  and fieldCode != ''">and FIELD_CODE = #{fieldCode}</if>
+            <if test="fieldName != null  and fieldName != ''">and FIELD_NAME like concat('%', #{fieldName}, '%')</if>
+            <if test="fieldType != null  and fieldType != ''">and FIELD_TYPE = #{fieldType}</if>
+            <if test="fieldLength != null  and fieldLength != ''">and FIELD_LENGTH = #{fieldLength}</if>
+            <if test="fieldPrecision != null  and fieldPrecision != ''">and FIELD_PRECISION = #{fieldPrecision}</if>
+            <if test="fieldIspri != null  and fieldIspri != ''">and FIELD_ISPRI = #{fieldIspri}</if>
+            <if test="fieldIsnullable != null  and fieldIsnullable != ''">and FIELD_ISNULLABLE = #{fieldIsnullable}</if>
+            <if test="fieldDefault != null  and fieldDefault != ''">and FIELD_DEFAULT = #{fieldDefault}</if>
+            <if test="fieldDesc != null  and fieldDesc != ''">and FIELD_DESC = #{fieldDesc}</if>
+            <if test="fieldStatus != null  and fieldStatus != ''">and FIELD_STATUS = #{fieldStatus}</if>
+            <if test="fieldOrder != null ">and FIELD_ORDER = #{fieldOrder}</if>
+            <if test="fieldExtend != null  and fieldExtend != ''">and FIELD_EXTEND = #{fieldExtend}</if>
+            <if test="fieldExtendTable != null  and fieldExtendTable != ''">and FIELD_EXTEND_TABLE =
+                #{fieldExtendTable}
+            </if>
+            <if test="fieldInputType != null  and fieldInputType != ''">and FIELD_INPUT_TYPE = #{fieldInputType}</if>
+            <if test="fieldInputFormat != null  and fieldInputFormat != ''">and FIELD_INPUT_FORMAT =
+                #{fieldInputFormat}
+            </if>
+            <if test="fieldInputDefault != null  and fieldInputDefault != ''">and FIELD_INPUT_DEFAULT =
+                #{fieldInputDefault}
+            </if>
+            <if test="fieldViewType != null  and fieldViewType != ''">and FIELD_VIEW_TYPE = #{fieldViewType}</if>
+            <if test="fieldDict != null  and fieldDict != ''">and FIELD_DICT = #{fieldDict}</if>
+            <if test="isArray != null  and isArray != ''">and IS_ARRAY = #{isArray}</if>
+            <if test="arrayIndex != null  and arrayIndex != ''">and ARRAY_INDEX = #{arrayIndex}</if>
         </where>
-        order by FIELD_ORDER
     </select>
 
-    <select id="selectMdDataFieldByDsCode" parameterType="String" resultMap="MdDataFieldResult">
+    <select id="selectMdDataFieldById" parameterType="Long" resultMap="MdDataFieldResult">
         <include refid="selectMdDataFieldVo"/>
-        where DC_CODE = #{dcCode}
+        where ID = #{id}
     </select>
 
     <insert id="insertMdDataField" parameterType="com.ruoyi.interfaces.domain.MdDataField">
         insert into md_data_field
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">ID,</if>
+            <if test="parentId != null">PARENT_ID,</if>
             <if test="dcCode != null">DC_CODE,</if>
-            <if test="fieldCode != null">FIELD_CODE,</if>
+            <if test="fieldCode != null and fieldCode != ''">FIELD_CODE,</if>
             <if test="fieldName != null">FIELD_NAME,</if>
-            <if test="fieldType != null">FIELD_TYPE,</if>
+            <if test="fieldType != null and fieldType != ''">FIELD_TYPE,</if>
             <if test="fieldLength != null">FIELD_LENGTH,</if>
             <if test="fieldPrecision != null">FIELD_PRECISION,</if>
             <if test="fieldIspri != null">FIELD_ISPRI,</if>
@@ -82,12 +122,16 @@
             <if test="fieldInputDefault != null">FIELD_INPUT_DEFAULT,</if>
             <if test="fieldViewType != null">FIELD_VIEW_TYPE,</if>
             <if test="fieldDict != null">FIELD_DICT,</if>
+            <if test="isArray != null">IS_ARRAY,</if>
+            <if test="arrayIndex != null">ARRAY_INDEX,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="parentId != null">#{parentId},</if>
             <if test="dcCode != null">#{dcCode},</if>
-            <if test="fieldCode != null">#{fieldCode},</if>
+            <if test="fieldCode != null and fieldCode != ''">#{fieldCode},</if>
             <if test="fieldName != null">#{fieldName},</if>
-            <if test="fieldType != null">#{fieldType},</if>
+            <if test="fieldType != null and fieldType != ''">#{fieldType},</if>
             <if test="fieldLength != null">#{fieldLength},</if>
             <if test="fieldPrecision != null">#{fieldPrecision},</if>
             <if test="fieldIspri != null">#{fieldIspri},</if>
@@ -103,48 +147,55 @@
             <if test="fieldInputDefault != null">#{fieldInputDefault},</if>
             <if test="fieldViewType != null">#{fieldViewType},</if>
             <if test="fieldDict != null">#{fieldDict},</if>
+            <if test="isArray != null">#{isArray},</if>
+            <if test="arrayIndex != null">#{arrayIndex},</if>
         </trim>
     </insert>
 
     <update id="updateMdDataField" parameterType="com.ruoyi.interfaces.domain.MdDataField">
         update md_data_field
         <trim prefix="SET" suffixOverrides=",">
-            FIELD_NAME = #{fieldName,jdbcType=VARCHAR},
-            FIELD_TYPE = #{fieldType,jdbcType=VARCHAR},
-            FIELD_LENGTH = #{fieldLength,jdbcType=VARCHAR},
-            FIELD_PRECISION = #{fieldPrecision,jdbcType=VARCHAR},
-            FIELD_ISPRI = #{fieldIspri,jdbcType=VARCHAR},
-            FIELD_ISNULLABLE = #{fieldIsnullable,jdbcType=VARCHAR},
-            FIELD_DEFAULT = #{fieldDefault,jdbcType=VARCHAR},
-            FIELD_DESC = #{fieldDesc,jdbcType=VARCHAR},
-            FIELD_STATUS = #{fieldStatus,jdbcType=VARCHAR},
-            FIELD_ORDER = #{fieldOrder,jdbcType=INTEGER},
-            FIELD_EXTEND = #{fieldExtend,jdbcType=VARCHAR},
-            FIELD_EXTEND_TABLE = #{fieldExtendTable,jdbcType=VARCHAR},
-            FIELD_INPUT_TYPE = #{fieldInputType,jdbcType=VARCHAR},
-            FIELD_INPUT_FORMAT = #{fieldInputFormat,jdbcType=VARCHAR},
-            FIELD_INPUT_DEFAULT = #{fieldInputDefault,jdbcType=VARCHAR},
-            FIELD_VIEW_TYPE = #{fieldViewType,jdbcType=VARCHAR},
-            FIELD_DICT = #{fieldDict,jdbcType=VARCHAR},
+            <if test="parentId != null">PARENT_ID = #{parentId},</if>
+            <if test="dcCode != null">DC_CODE = #{dcCode},</if>
+            <if test="fieldCode != null and fieldCode != ''">FIELD_CODE = #{fieldCode},</if>
+            <if test="fieldName != null">FIELD_NAME = #{fieldName},</if>
+            <if test="fieldType != null and fieldType != ''">FIELD_TYPE = #{fieldType},</if>
+            <if test="fieldLength != null">FIELD_LENGTH = #{fieldLength},</if>
+            <if test="fieldPrecision != null">FIELD_PRECISION = #{fieldPrecision},</if>
+            <if test="fieldIspri != null">FIELD_ISPRI = #{fieldIspri},</if>
+            <if test="fieldIsnullable != null">FIELD_ISNULLABLE = #{fieldIsnullable},</if>
+            <if test="fieldDefault != null">FIELD_DEFAULT = #{fieldDefault},</if>
+            <if test="fieldDesc != null">FIELD_DESC = #{fieldDesc},</if>
+            <if test="fieldStatus != null">FIELD_STATUS = #{fieldStatus},</if>
+            <if test="fieldOrder != null">FIELD_ORDER = #{fieldOrder},</if>
+            <if test="fieldExtend != null">FIELD_EXTEND = #{fieldExtend},</if>
+            <if test="fieldExtendTable != null">FIELD_EXTEND_TABLE = #{fieldExtendTable},</if>
+            <if test="fieldInputType != null">FIELD_INPUT_TYPE = #{fieldInputType},</if>
+            <if test="fieldInputFormat != null">FIELD_INPUT_FORMAT = #{fieldInputFormat},</if>
+            <if test="fieldInputDefault != null">FIELD_INPUT_DEFAULT = #{fieldInputDefault},</if>
+            <if test="fieldViewType != null">FIELD_VIEW_TYPE = #{fieldViewType},</if>
+            <if test="fieldDict != null">FIELD_DICT = #{fieldDict},</if>
+            <if test="isArray != null">IS_ARRAY = #{isArray},</if>
+            <if test="arrayIndex != null">ARRAY_INDEX = #{arrayIndex},</if>
         </trim>
-        where DC_CODE = #{dcCode} and
-        FIELD_CODE = #{fieldCode}
+        where ID = #{id}
     </update>
 
-    <delete id="deleteMdDataFieldByDsCode" parameterType="String">
-        delete from md_data_field where DC_CODE = #{dcCode}
+    <delete id="deleteMdDataFieldById" parameterType="Long">
+        delete
+        from md_data_field
+        where ID = #{id}
     </delete>
 
-    <delete id="deleteMdDataFieldByDsCodes" parameterType="String">
-        delete from md_data_field where DC_CODE in
-        <foreach item="dcCode" collection="array" open="(" separator="," close=")">
-            #{dcCode}
+    <delete id="deleteMdDataFieldByIds" parameterType="String">
+        delete from md_data_field where ID in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </delete>
-    <delete id="deleteMdDataFieldOne">
+    <delete id="deleteMdDataFieldByDcCode">
         delete
         from md_data_field
         where DC_CODE = #{dcCode}
-          and field_Code = #{fieldCode}
     </delete>
 </mapper>

+ 85 - 0
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdDataSetParamMapper.xml

@@ -0,0 +1,85 @@
+<?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.ruoyi.interfaces.mapper.MdDataSetParamMapper">
+
+    <resultMap type="com.ruoyi.interfaces.domain.MdDataSetParam" id="MdDataSetParamResult">
+        <result property="dcCode"    column="DC_CODE"    />
+        <result property="paramCode"    column="PARAM_CODE"    />
+        <result property="paramName"    column="PARAM_NAME"    />
+        <result property="paramType"    column="PARAM_TYPE"    />
+        <result property="paramValue"    column="PARAM_VALUE"    />
+        <result property="paramNote"    column="PARAM_NOTE"    />
+        <result property="sort"    column="SORT"    />
+    </resultMap>
+
+    <sql id="selectMdDataSetParamVo">
+        select DC_CODE, PARAM_CODE, PARAM_NAME, PARAM_TYPE, PARAM_VALUE, PARAM_NOTE, SORT from md_data_set_param
+    </sql>
+
+    <select id="selectMdDataSetParamList" parameterType="com.ruoyi.interfaces.domain.MdDataSetParam" resultMap="MdDataSetParamResult">
+        <include refid="selectMdDataSetParamVo"/>
+        <where>
+            <if test="dcCode != null  and dcCode != ''"> and DC_CODE = #{dcCode}</if>
+            <if test="paramCode != null  and paramCode != ''"> and PARAM_CODE = #{paramCode}</if>
+            <if test="paramName != null  and paramName != ''"> and PARAM_NAME like concat('%', #{paramName}, '%')</if>
+            <if test="paramType != null  and paramType != ''"> and PARAM_TYPE = #{paramType}</if>
+            <if test="paramValue != null  and paramValue != ''"> and PARAM_VALUE = #{paramValue}</if>
+            <if test="paramNote != null  and paramNote != ''"> and PARAM_NOTE = #{paramNote}</if>
+            <if test="sort != null "> and SORT = #{sort}</if>
+        </where>
+        order by SORT
+    </select>
+
+    <select id="selectMdDataSetParamByDcCode" parameterType="String" resultMap="MdDataSetParamResult">
+        <include refid="selectMdDataSetParamVo"/>
+        where DC_CODE = #{dcCode}
+    </select>
+
+    <insert id="insertMdDataSetParam" parameterType="com.ruoyi.interfaces.domain.MdDataSetParam">
+        insert into md_data_set_param
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dcCode != null">DC_CODE,</if>
+            <if test="paramCode != null">PARAM_CODE,</if>
+            <if test="paramName != null">PARAM_NAME,</if>
+            <if test="paramType != null">PARAM_TYPE,</if>
+            <if test="paramValue != null">PARAM_VALUE,</if>
+            <if test="paramNote != null">PARAM_NOTE,</if>
+            <if test="sort != null">SORT,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dcCode != null">#{dcCode},</if>
+            <if test="paramCode != null">#{paramCode},</if>
+            <if test="paramName != null">#{paramName},</if>
+            <if test="paramType != null">#{paramType},</if>
+            <if test="paramValue != null">#{paramValue},</if>
+            <if test="paramNote != null">#{paramNote},</if>
+            <if test="sort != null">#{sort},</if>
+        </trim>
+    </insert>
+
+    <update id="updateMdDataSetParam" parameterType="com.ruoyi.interfaces.domain.MdDataSetParam">
+        update md_data_set_param
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="paramCode != null">PARAM_CODE = #{paramCode},</if>
+            <if test="paramName != null">PARAM_NAME = #{paramName},</if>
+            <if test="paramType != null">PARAM_TYPE = #{paramType},</if>
+            <if test="paramValue != null">PARAM_VALUE = #{paramValue},</if>
+            <if test="paramNote != null">PARAM_NOTE = #{paramNote},</if>
+            <if test="sort != null">SORT = #{sort},</if>
+        </trim>
+        where DC_CODE = #{dcCode}
+    </update>
+
+    <delete id="deleteMdDataSetParamByDcCode" parameterType="String">
+        delete from md_data_set_param where DC_CODE = #{dcCode}
+    </delete>
+
+    <delete id="deleteMdDataSetParamByDcCodes" parameterType="String">
+        delete from md_data_set_param where DC_CODE in
+        <foreach item="dcCode" collection="array" open="(" separator="," close=")">
+            #{dcCode}
+        </foreach>
+    </delete>
+</mapper>

+ 1 - 1
ruoyi-api-patform/src/main/resources/mapper/interfaces/PtServiceMapper.xml

@@ -180,7 +180,7 @@
         #{maintainUnit,jdbcType=VARCHAR},
         #{maintainContacer,jdbcType=VARCHAR},
         #{viewNum, jdbcType=INTEGER},
-        #{sort, jdbcType=INTEGER}
+        #{sort, jdbcType=INTEGER},
         #{audit, jdbcType=VARCHAR}
     </sql>
     <sql id="page_where">

+ 5 - 0
ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java

@@ -91,4 +91,9 @@ public class HttpStatus
      * 系统警告消息
      */
     public static final int WARN = 601;
+    /**
+     * HTTP工具类请求错误
+     */
+    public static final int HTTP_ERROR = 444;
+
 }