ZhuDeKang пре 6 месеци
родитељ
комит
33f75dff7d

+ 37 - 44
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -4,14 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.aspectj.weaver.loadtime.Aj;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
@@ -23,13 +22,12 @@ import com.ruoyi.framework.config.ServerConfig;
 
 /**
  * 通用请求处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/common")
-public class CommonController
-{
+public class CommonController {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
     @Autowired
@@ -39,17 +37,14 @@ public class CommonController
 
     /**
      * 通用下载请求
-     * 
+     *
      * @param fileName 文件名称
-     * @param delete 是否删除
+     * @param delete   是否删除
      */
     @GetMapping("/download")
-    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(fileName))
-            {
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+        try {
+            if (!FileUtils.checkAllowDownload(fileName)) {
                 throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
@@ -58,14 +53,26 @@ public class CommonController
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
             FileUtils.writeBytes(filePath, response.getOutputStream());
-            if (delete)
-            {
+            if (delete) {
                 FileUtils.deleteFile(filePath);
             }
+        } catch (Exception e) {
+            log.error("下载文件失败", e);
         }
-        catch (Exception e)
-        {
+    }
+
+    @DeleteMapping("/deleteFile")
+    public AjaxResult deleteFile(String filePath) {
+        try {
+            if (!FileUtils.checkAllowDownload(filePath)) {
+                throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", filePath));
+            }
+            filePath = RuoYiConfig.getProfile()+ filePath.replace("/profile","");
+            System.out.println(filePath);
+            return AjaxResult.success(FileUtils.deleteFile(filePath));
+        } catch (Exception e) {
             log.error("下载文件失败", e);
+            return AjaxResult.error();
         }
     }
 
@@ -73,10 +80,8 @@ public class CommonController
      * 通用上传请求(单个)
      */
     @PostMapping("/upload")
-    public AjaxResult uploadFile(MultipartFile file) throws Exception
-    {
-        try
-        {
+    public AjaxResult uploadFile(MultipartFile file) throws Exception {
+        try {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
@@ -88,9 +93,7 @@ public class CommonController
             ajax.put("newFileName", FileUtils.getName(fileName));
             ajax.put("originalFilename", file.getOriginalFilename());
             return ajax;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
     }
@@ -99,18 +102,15 @@ public class CommonController
      * 通用上传请求(多个)
      */
     @PostMapping("/uploads")
-    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
-    {
-        try
-        {
+    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception {
+        try {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             List<String> urls = new ArrayList<String>();
             List<String> fileNames = new ArrayList<String>();
             List<String> newFileNames = new ArrayList<String>();
             List<String> originalFilenames = new ArrayList<String>();
-            for (MultipartFile file : files)
-            {
+            for (MultipartFile file : files) {
                 // 上传并返回新文件名称
                 String fileName = FileUploadUtils.upload(filePath, file);
                 String url = serverConfig.getUrl() + fileName;
@@ -125,9 +125,7 @@ public class CommonController
             ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
             ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
             return ajax;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
     }
@@ -137,12 +135,9 @@ public class CommonController
      */
     @GetMapping("/download/resource")
     public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
-            throws Exception
-    {
-        try
-        {
-            if (!FileUtils.checkAllowDownload(resource))
-            {
+            throws Exception {
+        try {
+            if (!FileUtils.checkAllowDownload(resource)) {
                 throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource));
             }
             // 本地资源路径
@@ -154,9 +149,7 @@ public class CommonController
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, downloadName);
             FileUtils.writeBytes(downloadPath, response.getOutputStream());
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             log.error("下载文件失败", e);
         }
     }

+ 12 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelParamsController.java

@@ -48,6 +48,18 @@ public class MdModelParamsController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询模型参数信息列表
+     */
+    @ApiOperation("查询模型参数信息列表")
+    @GetMapping("/allList")
+    public AjaxResult allList(MdModelParams mdModelParams)
+    {
+        List<MdModelParams> list = mdModelParamsService.selectMdModelParamsList(mdModelParams);
+        return AjaxResult.success(list);
+    }
+
+
     /**
      * 导出模型参数信息列表
      */

+ 98 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelPargroupController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.interfaces.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.interfaces.domain.MdModelPargroup;
+import com.ruoyi.interfaces.service.IMdModelPargroupService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 模型参数分组Controller
+ * 
+ * @author 朱得糠
+ * @date 2025-08-01
+ */
+@RestController
+@RequestMapping("/model/pargroup")
+public class MdModelPargroupController extends BaseController
+{
+    @Autowired
+    private IMdModelPargroupService mdModelPargroupService;
+
+    /**
+     * 查询模型参数分组列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(MdModelPargroup mdModelPargroup)
+    {
+        startPage();
+        List<MdModelPargroup> list = mdModelPargroupService.selectMdModelPargroupList(mdModelPargroup);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出模型参数分组列表
+     */
+    @Log(title = "模型参数分组", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MdModelPargroup mdModelPargroup)
+    {
+        List<MdModelPargroup> list = mdModelPargroupService.selectMdModelPargroupList(mdModelPargroup);
+        ExcelUtil<MdModelPargroup> util = new ExcelUtil<MdModelPargroup>(MdModelPargroup.class);
+        util.exportExcel(response, list, "模型参数分组数据");
+    }
+
+    /**
+     * 获取模型参数分组详细信息
+     */
+    @GetMapping(value = "/{mgid}")
+    public AjaxResult getInfo(@PathVariable("mgid") Integer mgid)
+    {
+        return success(mdModelPargroupService.selectMdModelPargroupByMgid(mgid));
+    }
+
+    /**
+     * 新增模型参数分组
+     */
+    @Log(title = "模型参数分组", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MdModelPargroup mdModelPargroup)
+    {
+        return toAjax(mdModelPargroupService.insertMdModelPargroup(mdModelPargroup));
+    }
+
+    /**
+     * 修改模型参数分组
+     */
+    @Log(title = "模型参数分组", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MdModelPargroup mdModelPargroup)
+    {
+        return toAjax(mdModelPargroupService.updateMdModelPargroup(mdModelPargroup));
+    }
+
+    /**
+     * 删除模型参数分组
+     */
+    @Log(title = "模型参数分组", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{mgids}")
+    public AjaxResult remove(@PathVariable Integer[] mgids)
+    {
+        return toAjax(mdModelPargroupService.deleteMdModelPargroupByMgids(mgids));
+    }
+}

+ 179 - 86
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdModelParams.java

@@ -2,89 +2,112 @@ package com.ruoyi.interfaces.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 模型参数信息对象 md_model_params
+ * 模型参数对象 md_model_params
  * 
- * @author ruoyi
- * @date 2025-07-15
+ * @author 朱得糠
+ * @date 2025-08-01
  */
 public class MdModelParams extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 模型参数标识 */
-    @ApiModelProperty("模型参数标识")
-    private String parId;
+    private String parid;
 
     /** 模型标识ID */
-    @ApiModelProperty("模型标识ID")
     private String mdid;
 
+    /** 参数分类 */
+    @Excel(name = "参数分类")
+    private String parCate;
+
+    /** 参数分组 */
+    @Excel(name = "参数分组")
+    private String parGroup;
+
     /** 参数名称 */
-    @ApiModelProperty("参数名称")
     @Excel(name = "参数名称")
     private String parName;
 
+    /** 英文名称 */
+    @Excel(name = "英文名称")
+    private String parEnname;
+
+    /** 参数描述 */
+    @Excel(name = "参数描述")
+    private String parNote;
+
     /** 参数类型 */
-    @ApiModelProperty("参数类型")
     @Excel(name = "参数类型")
     private String parType;
 
-    /** 参数数据类型 */
-    @ApiModelProperty("参数数据类型")
-    @Excel(name = "参数数据类型")
-    private String parDataType;
+    /** 行号 */
+    @Excel(name = "行号")
+    private Integer parLine;
+
+    /** 维度 */
+    @Excel(name = "维度")
+    private String parDimen;
+
+    /** 维度排序 */
+    @Excel(name = "维度排序")
+    private String parDidenSort;
 
-    /** 参数数据范围 */
-    @ApiModelProperty("参数数据范围")
-    @Excel(name = "参数数据范围")
-    private String parDataRange;
+    /** 参数表达式 */
+    @Excel(name = "参数表达式")
+    private String parExpr;
 
-    /** 模型参数单位 */
-    @ApiModelProperty("模型参数单位")
-    @Excel(name = "模型参数单位")
-    private String parDataUnit;
+    /** 参数默认值 */
+    @Excel(name = "参数默认值")
+    private String parDefVal;
 
-    /** 模型参数权重 */
-    @ApiModelProperty("模型参数权重")
-    @Excel(name = "模型参数权重")
-    private String parDataWeight;
+    /** 参数单位 */
+    @Excel(name = "参数单位")
+    private String parUnit;
 
-    /** 参数文件路径 */
-    @ApiModelProperty("参数文件路径")
-    @Excel(name = "参数文件路径")
-    private String parFilePath;
+    /** 参数范围 */
+    @Excel(name = "参数范围")
+    private String parRange;
 
-    /** 参数文件名称 */
-    @ApiModelProperty("参数文件名称")
-    @Excel(name = "参数文件名称")
-    private String parFileName;
+    /** 参数版本号 */
+    @Excel(name = "参数版本号")
+    private String parVersion;
 
     /** 参数状态 */
-    @ApiModelProperty("参数状态")
     @Excel(name = "参数状态")
     private String parStatus;
 
     /** 编辑时间 */
-    @ApiModelProperty("编辑时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "编辑时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date modifyBy;
+    private Date modifyby;
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createby;
+
+    public Date getCreateby() {
+        return createby;
+    }
+
+    public void setCreateby(Date createby) {
+        this.createby = createby;
+    }
 
-    public void setParId(String parId) 
+    public void setParid(String parid)
     {
-        this.parId = parId;
+        this.parid = parid;
     }
 
-    public String getParId() 
+    public String getParid() 
     {
-        return parId;
+        return parid;
     }
     public void setMdid(String mdid) 
     {
@@ -95,6 +118,24 @@ public class MdModelParams extends BaseEntity
     {
         return mdid;
     }
+    public void setParCate(String parCate) 
+    {
+        this.parCate = parCate;
+    }
+
+    public String getParCate() 
+    {
+        return parCate;
+    }
+    public void setParGroup(String parGroup) 
+    {
+        this.parGroup = parGroup;
+    }
+
+    public String getParGroup() 
+    {
+        return parGroup;
+    }
     public void setParName(String parName) 
     {
         this.parName = parName;
@@ -104,6 +145,24 @@ public class MdModelParams extends BaseEntity
     {
         return parName;
     }
+    public void setParEnname(String parEnname) 
+    {
+        this.parEnname = parEnname;
+    }
+
+    public String getParEnname() 
+    {
+        return parEnname;
+    }
+    public void setParNote(String parNote) 
+    {
+        this.parNote = parNote;
+    }
+
+    public String getParNote() 
+    {
+        return parNote;
+    }
     public void setParType(String parType) 
     {
         this.parType = parType;
@@ -113,59 +172,77 @@ public class MdModelParams extends BaseEntity
     {
         return parType;
     }
-    public void setParDataType(String parDataType) 
+    public void setParLine(Integer parLine) 
+    {
+        this.parLine = parLine;
+    }
+
+    public Integer getParLine() 
+    {
+        return parLine;
+    }
+    public void setParDimen(String parDimen) 
     {
-        this.parDataType = parDataType;
+        this.parDimen = parDimen;
     }
 
-    public String getParDataType() 
+    public String getParDimen() 
     {
-        return parDataType;
+        return parDimen;
     }
-    public void setParDataRange(String parDataRange) 
+    public void setParDidenSort(String parDidenSort) 
     {
-        this.parDataRange = parDataRange;
+        this.parDidenSort = parDidenSort;
     }
 
-    public String getParDataRange() 
+    public String getParDidenSort() 
     {
-        return parDataRange;
+        return parDidenSort;
     }
-    public void setParDataUnit(String parDataUnit) 
+    public void setParExpr(String parExpr) 
     {
-        this.parDataUnit = parDataUnit;
+        this.parExpr = parExpr;
     }
 
-    public String getParDataUnit() 
+    public String getParExpr() 
     {
-        return parDataUnit;
+        return parExpr;
     }
-    public void setParDataWeight(String parDataWeight) 
+    public void setParDefVal(String parDefVal) 
     {
-        this.parDataWeight = parDataWeight;
+        this.parDefVal = parDefVal;
     }
 
-    public String getParDataWeight() 
+    public String getParDefVal() 
     {
-        return parDataWeight;
+        return parDefVal;
     }
-    public void setParFilePath(String parFilePath) 
+    public void setParUnit(String parUnit) 
     {
-        this.parFilePath = parFilePath;
+        this.parUnit = parUnit;
     }
 
-    public String getParFilePath() 
+    public String getParUnit() 
     {
-        return parFilePath;
+        return parUnit;
     }
-    public void setParFileName(String parFileName) 
+    public void setParRange(String parRange) 
     {
-        this.parFileName = parFileName;
+        this.parRange = parRange;
     }
 
-    public String getParFileName() 
+    public String getParRange() 
     {
-        return parFileName;
+        return parRange;
+    }
+    public void setParVersion(String parVersion) 
+    {
+        this.parVersion = parVersion;
+    }
+
+    public String getParVersion() 
+    {
+        return parVersion;
     }
     public void setParStatus(String parStatus) 
     {
@@ -176,50 +253,66 @@ public class MdModelParams extends BaseEntity
     {
         return parStatus;
     }
-    public void setModifyBy(Date modifyBy) 
+    public void setModifyby(Date modifyby) 
     {
-        this.modifyBy = modifyBy;
+        this.modifyby = modifyby;
     }
 
-    public Date getModifyBy() 
+    public Date getModifyby() 
     {
-        return modifyBy;
+        return modifyby;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("parId", getParId())
+            .append("parid", getParid())
             .append("mdid", getMdid())
+            .append("parCate", getParCate())
+            .append("parGroup", getParGroup())
             .append("parName", getParName())
+            .append("parEnname", getParEnname())
+            .append("parNote", getParNote())
             .append("parType", getParType())
-            .append("parDataType", getParDataType())
-            .append("parDataRange", getParDataRange())
-            .append("parDataUnit", getParDataUnit())
-            .append("parDataWeight", getParDataWeight())
-            .append("parFilePath", getParFilePath())
-            .append("parFileName", getParFileName())
+            .append("parLine", getParLine())
+            .append("parDimen", getParDimen())
+            .append("parDidenSort", getParDidenSort())
+            .append("parExpr", getParExpr())
+            .append("parDefVal", getParDefVal())
+            .append("parUnit", getParUnit())
+            .append("parRange", getParRange())
+            .append("parVersion", getParVersion())
             .append("parStatus", getParStatus())
-            .append("createBy", getCreateBy())
-            .append("modifyBy", getModifyBy())
+            .append("createby", getCreateby())
+            .append("modifyby", getModifyby())
             .toString();
     }
 
-    public MdModelParams(String parId, String mdid, String parName, String parType, String parDataType, String parDataRange, String parDataUnit, String parDataWeight, String parFilePath, String parFileName, String parStatus, Date modifyBy) {
-        this.parId = parId;
+    public MdModelParams(String parid, String mdid, String parCate, String parGroup, String parName, String parEnname, String parNote, String parType, Integer parLine, String parDimen, String parDidenSort, String parExpr, String parDefVal, String parUnit, String parRange, String parVersion, String parStatus, Date modifyby, Date createby) {
+        this.parid = parid;
         this.mdid = mdid;
+        this.parCate = parCate;
+        this.parGroup = parGroup;
         this.parName = parName;
+        this.parEnname = parEnname;
+        this.parNote = parNote;
         this.parType = parType;
-        this.parDataType = parDataType;
-        this.parDataRange = parDataRange;
-        this.parDataUnit = parDataUnit;
-        this.parDataWeight = parDataWeight;
-        this.parFilePath = parFilePath;
-        this.parFileName = parFileName;
+        this.parLine = parLine;
+        this.parDimen = parDimen;
+        this.parDidenSort = parDidenSort;
+        this.parExpr = parExpr;
+        this.parDefVal = parDefVal;
+        this.parUnit = parUnit;
+        this.parRange = parRange;
+        this.parVersion = parVersion;
         this.parStatus = parStatus;
-        this.modifyBy = modifyBy;
+        this.modifyby = modifyby;
+        this.createby = createby;
     }
 
     public MdModelParams() {
     }
 }
+
+
+

+ 150 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdModelPargroup.java

@@ -0,0 +1,150 @@
+package com.ruoyi.interfaces.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 模型参数分组对象 md_model_pargroup
+ * 
+ * @author 朱得糠
+ * @date 2025-08-01
+ */
+public class MdModelPargroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参数组ID */
+    private Integer mgid;
+
+    /** 模型ID */
+    private String mdid;
+
+    /** 组编码 */
+    @Excel(name = "组编码")
+    private String parGroupCode;
+
+    /** 组名称 */
+    private String parGroupName;
+
+    /** 组排序 */
+    private Integer parGroupSort;
+
+    /** 组描述 */
+    @Excel(name = "组描述")
+    private String parGroupNote;
+
+    /** 编辑时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "编辑时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date modifyby;
+
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createby;
+
+    public Date getCreateby() {
+        return createby;
+    }
+
+    public void setCreateby(Date createby) {
+        this.createby = createby;
+    }
+
+    public void setMgid(Integer mgid)
+    {
+        this.mgid = mgid;
+    }
+
+    public Integer getMgid() 
+    {
+        return mgid;
+    }
+    public void setMdid(String mdid) 
+    {
+        this.mdid = mdid;
+    }
+
+    public String getMdid() 
+    {
+        return mdid;
+    }
+    public void setParGroupCode(String parGroupCode) 
+    {
+        this.parGroupCode = parGroupCode;
+    }
+
+    public String getParGroupCode() 
+    {
+        return parGroupCode;
+    }
+    public void setParGroupName(String parGroupName) 
+    {
+        this.parGroupName = parGroupName;
+    }
+
+    public String getParGroupName() 
+    {
+        return parGroupName;
+    }
+    public void setParGroupSort(Integer parGroupSort) 
+    {
+        this.parGroupSort = parGroupSort;
+    }
+
+    public Integer getParGroupSort() 
+    {
+        return parGroupSort;
+    }
+    public void setParGroupNote(String parGroupNote) 
+    {
+        this.parGroupNote = parGroupNote;
+    }
+
+    public String getParGroupNote() 
+    {
+        return parGroupNote;
+    }
+    public void setModifyby(Date modifyby) 
+    {
+        this.modifyby = modifyby;
+    }
+
+    public Date getModifyby() 
+    {
+        return modifyby;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("mgid", getMgid())
+            .append("mdid", getMdid())
+            .append("parGroupCode", getParGroupCode())
+            .append("parGroupName", getParGroupName())
+            .append("parGroupSort", getParGroupSort())
+            .append("parGroupNote", getParGroupNote())
+            .append("createby", getCreateby())
+            .append("modifyby", getModifyby())
+            .toString();
+    }
+
+    public MdModelPargroup(Integer mgid, String mdid, String parGroupCode, String parGroupName, Integer parGroupSort, String parGroupNote, Date modifyby, Date createby) {
+        this.mgid = mgid;
+        this.mdid = mdid;
+        this.parGroupCode = parGroupCode;
+        this.parGroupName = parGroupName;
+        this.parGroupSort = parGroupSort;
+        this.parGroupNote = parGroupNote;
+        this.modifyby = modifyby;
+        this.createby = createby;
+    }
+
+    public MdModelPargroup() {
+    }
+}

+ 4 - 3
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdModelParamsMapper.java

@@ -23,7 +23,7 @@ public interface MdModelParamsMapper
      * @param parId 模型参数信息主键
      * @return 模型参数信息
      */
-    public MdModelParams selectMdModelParamsByParId(String parId);
+    public MdModelParams selectMdModelParamsByParid(String parId);
 
     /**
      * 查询模型参数信息列表
@@ -55,7 +55,8 @@ public interface MdModelParamsMapper
      * @param parId 模型参数信息主键
      * @return 结果
      */
-    public int deleteMdModelParamsByParId(String parId);
+    public int deleteMdModelParamsByParid(String parId);
+
 
     /**
      * 批量删除模型参数信息
@@ -63,5 +64,5 @@ public interface MdModelParamsMapper
      * @param parIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteMdModelParamsByParIds(String[] parIds);
+    public int deleteMdModelParamsByParids(String[] parIds);
 }

+ 61 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdModelPargroupMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.interfaces.mapper;
+
+import java.util.List;
+import com.ruoyi.interfaces.domain.MdModelPargroup;
+
+/**
+ * 模型参数分组Mapper接口
+ * 
+ * @author 朱得糠
+ * @date 2025-08-01
+ */
+public interface MdModelPargroupMapper 
+{
+    /**
+     * 查询模型参数分组
+     * 
+     * @param mgid 模型参数分组主键
+     * @return 模型参数分组
+     */
+    public MdModelPargroup selectMdModelPargroupByMgid(Integer mgid);
+
+    /**
+     * 查询模型参数分组列表
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 模型参数分组集合
+     */
+    public List<MdModelPargroup> selectMdModelPargroupList(MdModelPargroup mdModelPargroup);
+
+    /**
+     * 新增模型参数分组
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 结果
+     */
+    public int insertMdModelPargroup(MdModelPargroup mdModelPargroup);
+
+    /**
+     * 修改模型参数分组
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 结果
+     */
+    public int updateMdModelPargroup(MdModelPargroup mdModelPargroup);
+
+    /**
+     * 删除模型参数分组
+     * 
+     * @param mgid 模型参数分组主键
+     * @return 结果
+     */
+    public int deleteMdModelPargroupByMgid(Integer mgid);
+
+    /**
+     * 批量删除模型参数分组
+     * 
+     * @param mgids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteMdModelPargroupByMgids(Integer[] mgids);
+}

+ 61 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdModelPargroupService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.interfaces.service;
+
+import java.util.List;
+import com.ruoyi.interfaces.domain.MdModelPargroup;
+
+/**
+ * 模型参数分组Service接口
+ * 
+ * @author 朱得糠
+ * @date 2025-08-01
+ */
+public interface IMdModelPargroupService 
+{
+    /**
+     * 查询模型参数分组
+     * 
+     * @param mgid 模型参数分组主键
+     * @return 模型参数分组
+     */
+    public MdModelPargroup selectMdModelPargroupByMgid(Integer mgid);
+
+    /**
+     * 查询模型参数分组列表
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 模型参数分组集合
+     */
+    public List<MdModelPargroup> selectMdModelPargroupList(MdModelPargroup mdModelPargroup);
+
+    /**
+     * 新增模型参数分组
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 结果
+     */
+    public int insertMdModelPargroup(MdModelPargroup mdModelPargroup);
+
+    /**
+     * 修改模型参数分组
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 结果
+     */
+    public int updateMdModelPargroup(MdModelPargroup mdModelPargroup);
+
+    /**
+     * 批量删除模型参数分组
+     * 
+     * @param mgids 需要删除的模型参数分组主键集合
+     * @return 结果
+     */
+    public int deleteMdModelPargroupByMgids(Integer[] mgids);
+
+    /**
+     * 删除模型参数分组信息
+     * 
+     * @param mgid 模型参数分组主键
+     * @return 结果
+     */
+    public int deleteMdModelPargroupByMgid(Integer mgid);
+}

+ 7 - 4
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelParamsServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.interfaces.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.interfaces.domain.MdModelParams;
 import com.ruoyi.interfaces.mapper.MdModelParamsMapper;
@@ -30,7 +31,7 @@ public class MdModelParamsServiceImpl implements IMdModelParamsService
     @Override
     public MdModelParams selectMdModelParamsByParId(String parId)
     {
-        return mdModelParamsMapper.selectMdModelParamsByParId(parId);
+        return mdModelParamsMapper.selectMdModelParamsByParid(parId);
     }
 
     /**
@@ -54,7 +55,8 @@ public class MdModelParamsServiceImpl implements IMdModelParamsService
     @Override
     public int insertMdModelParams(MdModelParams mdModelParams)
     {
-        mdModelParams.setParId(IdUtils.fastUUID());
+        mdModelParams.setParid(IdUtils.fastUUID());
+        mdModelParams.setCreateby(DateUtils.getNowDate());
         return mdModelParamsMapper.insertMdModelParams(mdModelParams);
     }
 
@@ -67,6 +69,7 @@ public class MdModelParamsServiceImpl implements IMdModelParamsService
     @Override
     public int updateMdModelParams(MdModelParams mdModelParams)
     {
+        mdModelParams.setModifyby(DateUtils.getNowDate());
         return mdModelParamsMapper.updateMdModelParams(mdModelParams);
     }
 
@@ -79,7 +82,7 @@ public class MdModelParamsServiceImpl implements IMdModelParamsService
     @Override
     public int deleteMdModelParamsByParIds(String[] parIds)
     {
-        return mdModelParamsMapper.deleteMdModelParamsByParIds(parIds);
+        return mdModelParamsMapper.deleteMdModelParamsByParids(parIds);
     }
 
     /**
@@ -91,6 +94,6 @@ public class MdModelParamsServiceImpl implements IMdModelParamsService
     @Override
     public int deleteMdModelParamsByParId(String parId)
     {
-        return mdModelParamsMapper.deleteMdModelParamsByParId(parId);
+        return mdModelParamsMapper.deleteMdModelParamsByParid(parId);
     }
 }

+ 93 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelPargroupServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.interfaces.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.interfaces.mapper.MdModelPargroupMapper;
+import com.ruoyi.interfaces.domain.MdModelPargroup;
+import com.ruoyi.interfaces.service.IMdModelPargroupService;
+
+/**
+ * 模型参数分组Service业务层处理
+ * 
+ * @author 朱得糠
+ * @date 2025-08-01
+ */
+@Service
+public class MdModelPargroupServiceImpl implements IMdModelPargroupService 
+{
+    @Autowired
+    private MdModelPargroupMapper mdModelPargroupMapper;
+
+    /**
+     * 查询模型参数分组
+     * 
+     * @param mgid 模型参数分组主键
+     * @return 模型参数分组
+     */
+    @Override
+    public MdModelPargroup selectMdModelPargroupByMgid(Integer mgid)
+    {
+        return mdModelPargroupMapper.selectMdModelPargroupByMgid(mgid);
+    }
+
+    /**
+     * 查询模型参数分组列表
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 模型参数分组
+     */
+    @Override
+    public List<MdModelPargroup> selectMdModelPargroupList(MdModelPargroup mdModelPargroup)
+    {
+        return mdModelPargroupMapper.selectMdModelPargroupList(mdModelPargroup);
+    }
+
+    /**
+     * 新增模型参数分组
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 结果
+     */
+    @Override
+    public int insertMdModelPargroup(MdModelPargroup mdModelPargroup)
+    {
+        return mdModelPargroupMapper.insertMdModelPargroup(mdModelPargroup);
+    }
+
+    /**
+     * 修改模型参数分组
+     * 
+     * @param mdModelPargroup 模型参数分组
+     * @return 结果
+     */
+    @Override
+    public int updateMdModelPargroup(MdModelPargroup mdModelPargroup)
+    {
+        return mdModelPargroupMapper.updateMdModelPargroup(mdModelPargroup);
+    }
+
+    /**
+     * 批量删除模型参数分组
+     * 
+     * @param mgids 需要删除的模型参数分组主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMdModelPargroupByMgids(Integer[] mgids)
+    {
+        return mdModelPargroupMapper.deleteMdModelPargroupByMgids(mgids);
+    }
+
+    /**
+     * 删除模型参数分组信息
+     * 
+     * @param mgid 模型参数分组主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMdModelPargroupByMgid(Integer mgid)
+    {
+        return mdModelPargroupMapper.deleteMdModelPargroupByMgid(mgid);
+    }
+}

+ 99 - 69
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdModelParamsMapper.xml

@@ -5,108 +5,138 @@
 <mapper namespace="com.ruoyi.interfaces.mapper.MdModelParamsMapper">
 
     <resultMap type="com.ruoyi.interfaces.domain.MdModelParams" id="MdModelParamsResult">
-        <result property="parId"    column="parId"    />
-        <result property="mdid"    column="mdid"    />
-        <result property="parName"    column="parName"    />
-        <result property="parType"    column="parType"    />
-        <result property="parDataType"    column="parDataType"    />
-        <result property="parDataRange"    column="parDataRange"    />
-        <result property="parDataUnit"    column="parDataUnit"    />
-        <result property="parDataWeight"    column="parDataWeight"    />
-        <result property="parFilePath"    column="parFilePath"    />
-        <result property="parFileName"    column="parFileName"    />
-        <result property="parStatus"    column="parStatus"    />
-        <result property="createBy"    column="createBy"    />
-        <result property="modifyBy"    column="modifyBy"    />
+        <result property="parid"    column="PARID"    />
+        <result property="mdid"    column="MDID"    />
+        <result property="parCate"    column="PAR_CATE"    />
+        <result property="parGroup"    column="PAR_GROUP"    />
+        <result property="parName"    column="PAR_NAME"    />
+        <result property="parEnname"    column="PAR_ENNAME"    />
+        <result property="parNote"    column="PAR_NOTE"    />
+        <result property="parType"    column="PAR_TYPE"    />
+        <result property="parLine"    column="PAR_LINE"    />
+        <result property="parDimen"    column="PAR_DIMEN"    />
+        <result property="parDidenSort"    column="PAR_DIDEN_SORT"    />
+        <result property="parExpr"    column="PAR_EXPR"    />
+        <result property="parDefVal"    column="PAR_DEF_VAL"    />
+        <result property="parUnit"    column="PAR_UNIT"    />
+        <result property="parRange"    column="PAR_RANGE"    />
+        <result property="parVersion"    column="PAR_VERSION"    />
+        <result property="parStatus"    column="PAR_STATUS"    />
+        <result property="createby"    column="CREATEBY"    />
+        <result property="modifyby"    column="MODIFYBY"    />
     </resultMap>
 
     <sql id="selectMdModelParamsVo">
-        select parId, mdid, parName, parType, parDataType, parDataRange, parDataUnit, parDataWeight, parFilePath, parFileName, parStatus, createBy, modifyBy from md_model_params
+        select PARID, MDID, PAR_CATE, PAR_GROUP, PAR_NAME, PAR_ENNAME, PAR_NOTE, PAR_TYPE, PAR_LINE, PAR_DIMEN, PAR_DIDEN_SORT, PAR_EXPR, PAR_DEF_VAL, PAR_UNIT, PAR_RANGE, PAR_VERSION, PAR_STATUS, CREATEBY, MODIFYBY from md_model_params
     </sql>
 
     <select id="selectMdModelParamsList" parameterType="com.ruoyi.interfaces.domain.MdModelParams" resultMap="MdModelParamsResult">
         <include refid="selectMdModelParamsVo"/>
         <where>
-            <if test="parName != null  and parName != ''"> and parName like concat('%', #{parName}, '%')</if>
-            <if test="parType != null  and parType != ''"> and parType = #{parType}</if>
-            <if test="parDataType != null  and parDataType != ''"> and parDataType = #{parDataType}</if>
-            <if test="parDataRange != null  and parDataRange != ''"> and parDataRange = #{parDataRange}</if>
-            <if test="parDataUnit != null  and parDataUnit != ''"> and parDataUnit = #{parDataUnit}</if>
-            <if test="parDataWeight != null  and parDataWeight != ''"> and parDataWeight = #{parDataWeight}</if>
-            <if test="parFilePath != null  and parFilePath != ''"> and parFilePath = #{parFilePath}</if>
-            <if test="parFileName != null  and parFileName != ''"> and parFileName like concat('%', #{parFileName}, '%')</if>
-            <if test="parStatus != null  and parStatus != ''"> and parStatus = #{parStatus}</if>
-            <if test="createBy != null "> and createBy = #{createBy}</if>
-            <if test="modifyBy != null "> and modifyBy = #{modifyBy}</if>
+            <if test="parCate != null  and parCate != ''"> and PAR_CATE = #{parCate}</if>
+            <if test="parGroup != null  and parGroup != ''"> and PAR_GROUP = #{parGroup}</if>
+            <if test="parName != null  and parName != ''"> and PAR_NAME like concat('%', #{parName}, '%')</if>
+            <if test="parEnname != null  and parEnname != ''"> and PAR_ENNAME like concat('%', #{parEnname}, '%')</if>
+            <if test="parNote != null  and parNote != ''"> and PAR_NOTE = #{parNote}</if>
+            <if test="parType != null  and parType != ''"> and PAR_TYPE = #{parType}</if>
+            <if test="parLine != null "> and PAR_LINE = #{parLine}</if>
+            <if test="parDimen != null  and parDimen != ''"> and PAR_DIMEN = #{parDimen}</if>
+            <if test="parDidenSort != null  and parDidenSort != ''"> and PAR_DIDEN_SORT = #{parDidenSort}</if>
+            <if test="parExpr != null  and parExpr != ''"> and PAR_EXPR = #{parExpr}</if>
+            <if test="parDefVal != null  and parDefVal != ''"> and PAR_DEF_VAL = #{parDefVal}</if>
+            <if test="parUnit != null  and parUnit != ''"> and PAR_UNIT = #{parUnit}</if>
+            <if test="parRange != null  and parRange != ''"> and PAR_RANGE = #{parRange}</if>
+            <if test="parVersion != null  and parVersion != ''"> and PAR_VERSION = #{parVersion}</if>
+            <if test="parStatus != null  and parStatus != ''"> and PAR_STATUS = #{parStatus}</if>
+            <if test="createby != null "> and CREATEBY = #{createby}</if>
+            <if test="modifyby != null "> and MODIFYBY = #{modifyby}</if>
         </where>
     </select>
 
-    <select id="selectMdModelParamsByParId" parameterType="String" resultMap="MdModelParamsResult">
+    <select id="selectMdModelParamsByParid" parameterType="String" resultMap="MdModelParamsResult">
         <include refid="selectMdModelParamsVo"/>
-        where parId = #{parId}
+        where PARID = #{parid}
     </select>
 
     <insert id="insertMdModelParams" parameterType="com.ruoyi.interfaces.domain.MdModelParams">
         insert into md_model_params
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="parId != null">parId,</if>
-            <if test="mdid != null">mdid,</if>
-            <if test="parName != null">parName,</if>
-            <if test="parType != null">parType,</if>
-            <if test="parDataType != null">parDataType,</if>
-            <if test="parDataRange != null">parDataRange,</if>
-            <if test="parDataUnit != null">parDataUnit,</if>
-            <if test="parDataWeight != null">parDataWeight,</if>
-            <if test="parFilePath != null">parFilePath,</if>
-            <if test="parFileName != null">parFileName,</if>
-            <if test="parStatus != null">parStatus,</if>
-            <if test="createBy != null">createBy,</if>
-            <if test="modifyBy != null">modifyBy,</if>
+            <if test="parid != null">PARID,</if>
+            <if test="mdid != null">MDID,</if>
+            <if test="parCate != null and parCate != ''">PAR_CATE,</if>
+            <if test="parGroup != null and parGroup != ''">PAR_GROUP,</if>
+            <if test="parName != null and parName != ''">PAR_NAME,</if>
+            <if test="parEnname != null and parEnname != ''">PAR_ENNAME,</if>
+            <if test="parNote != null">PAR_NOTE,</if>
+            <if test="parType != null">PAR_TYPE,</if>
+            <if test="parLine != null">PAR_LINE,</if>
+            <if test="parDimen != null">PAR_DIMEN,</if>
+            <if test="parDidenSort != null">PAR_DIDEN_SORT,</if>
+            <if test="parExpr != null">PAR_EXPR,</if>
+            <if test="parDefVal != null">PAR_DEF_VAL,</if>
+            <if test="parUnit != null">PAR_UNIT,</if>
+            <if test="parRange != null">PAR_RANGE,</if>
+            <if test="parVersion != null">PAR_VERSION,</if>
+            <if test="parStatus != null">PAR_STATUS,</if>
+            <if test="createby != null">CREATEBY,</if>
+            <if test="modifyby != null">MODIFYBY,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="parId != null">#{parId},</if>
+            <if test="parid != null">#{parid},</if>
             <if test="mdid != null">#{mdid},</if>
-            <if test="parName != null">#{parName},</if>
+            <if test="parCate != null and parCate != ''">#{parCate},</if>
+            <if test="parGroup != null and parGroup != ''">#{parGroup},</if>
+            <if test="parName != null and parName != ''">#{parName},</if>
+            <if test="parEnname != null and parEnname != ''">#{parEnname},</if>
+            <if test="parNote != null">#{parNote},</if>
             <if test="parType != null">#{parType},</if>
-            <if test="parDataType != null">#{parDataType},</if>
-            <if test="parDataRange != null">#{parDataRange},</if>
-            <if test="parDataUnit != null">#{parDataUnit},</if>
-            <if test="parDataWeight != null">#{parDataWeight},</if>
-            <if test="parFilePath != null">#{parFilePath},</if>
-            <if test="parFileName != null">#{parFileName},</if>
+            <if test="parLine != null">#{parLine},</if>
+            <if test="parDimen != null">#{parDimen},</if>
+            <if test="parDidenSort != null">#{parDidenSort},</if>
+            <if test="parExpr != null">#{parExpr},</if>
+            <if test="parDefVal != null">#{parDefVal},</if>
+            <if test="parUnit != null">#{parUnit},</if>
+            <if test="parRange != null">#{parRange},</if>
+            <if test="parVersion != null">#{parVersion},</if>
             <if test="parStatus != null">#{parStatus},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="modifyBy != null">#{modifyBy},</if>
+            <if test="createby != null">#{createby},</if>
+            <if test="modifyby != null">#{modifyby},</if>
         </trim>
     </insert>
 
     <update id="updateMdModelParams" parameterType="com.ruoyi.interfaces.domain.MdModelParams">
         update md_model_params
         <trim prefix="SET" suffixOverrides=",">
-            <if test="mdid != null">mdid = #{mdid},</if>
-            <if test="parName != null">parName = #{parName},</if>
-            <if test="parType != null">parType = #{parType},</if>
-            <if test="parDataType != null">parDataType = #{parDataType},</if>
-            <if test="parDataRange != null">parDataRange = #{parDataRange},</if>
-            <if test="parDataUnit != null">parDataUnit = #{parDataUnit},</if>
-            <if test="parDataWeight != null">parDataWeight = #{parDataWeight},</if>
-            <if test="parFilePath != null">parFilePath = #{parFilePath},</if>
-            <if test="parFileName != null">parFileName = #{parFileName},</if>
-            <if test="parStatus != null">parStatus = #{parStatus},</if>
-            <if test="createBy != null">createBy = #{createBy},</if>
-            <if test="modifyBy != null">modifyBy = #{modifyBy},</if>
+            <if test="mdid != null">MDID = #{mdid},</if>
+            <if test="parCate != null and parCate != ''">PAR_CATE = #{parCate},</if>
+            <if test="parGroup != null and parGroup != ''">PAR_GROUP = #{parGroup},</if>
+            <if test="parName != null and parName != ''">PAR_NAME = #{parName},</if>
+            <if test="parEnname != null and parEnname != ''">PAR_ENNAME = #{parEnname},</if>
+            <if test="parNote != null">PAR_NOTE = #{parNote},</if>
+            <if test="parType != null">PAR_TYPE = #{parType},</if>
+            <if test="parLine != null">PAR_LINE = #{parLine},</if>
+            <if test="parDimen != null">PAR_DIMEN = #{parDimen},</if>
+            <if test="parDidenSort != null">PAR_DIDEN_SORT = #{parDidenSort},</if>
+            <if test="parExpr != null">PAR_EXPR = #{parExpr},</if>
+            <if test="parDefVal != null">PAR_DEF_VAL = #{parDefVal},</if>
+            <if test="parUnit != null">PAR_UNIT = #{parUnit},</if>
+            <if test="parRange != null">PAR_RANGE = #{parRange},</if>
+            <if test="parVersion != null">PAR_VERSION = #{parVersion},</if>
+            <if test="parStatus != null">PAR_STATUS = #{parStatus},</if>
+            <if test="createby != null">CREATEBY = #{createby},</if>
+            <if test="modifyby != null">MODIFYBY = #{modifyby},</if>
         </trim>
-        where parId = #{parId}
+        where PARID = #{parid}
     </update>
 
-    <delete id="deleteMdModelParamsByParId" parameterType="String">
-        delete from md_model_params where parId = #{parId}
+    <delete id="deleteMdModelParamsByParid" parameterType="String">
+        delete from md_model_params where PARID = #{parid}
     </delete>
 
-    <delete id="deleteMdModelParamsByParIds" parameterType="String">
-        delete from md_model_params where parId in
-        <foreach item="parId" collection="array" open="(" separator="," close=")">
-            #{parId}
+    <delete id="deleteMdModelParamsByParids" parameterType="String">
+        delete from md_model_params where PARID in
+        <foreach item="parid" collection="array" open="(" separator="," close=")">
+            #{parid}
         </foreach>
     </delete>
 </mapper>

+ 83 - 0
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdModelPargroupMapper.xml

@@ -0,0 +1,83 @@
+<?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.MdModelPargroupMapper">
+
+    <resultMap type="com.ruoyi.interfaces.domain.MdModelPargroup" id="MdModelPargroupResult">
+        <result property="mgid"    column="MGID"    />
+        <result property="mdid"    column="MDID"    />
+        <result property="parGroupCode"    column="PAR_GROUP_CODE"    />
+        <result property="parGroupName"    column="PAR_GROUP_NAME"    />
+        <result property="parGroupSort"    column="PAR_GROUP_SORT"    />
+        <result property="parGroupNote"    column="PAR_GROUP_NOTE"    />
+        <result property="createby"    column="CREATEBY"    />
+        <result property="modifyby"    column="MODIFYBY"    />
+    </resultMap>
+
+    <sql id="selectMdModelPargroupVo">
+        select MGID, MDID, PAR_GROUP_CODE, PAR_GROUP_NAME, PAR_GROUP_SORT, PAR_GROUP_NOTE, CREATEBY, MODIFYBY from md_model_pargroup
+    </sql>
+
+    <select id="selectMdModelPargroupList" parameterType="com.ruoyi.interfaces.domain.MdModelPargroup" resultMap="MdModelPargroupResult">
+        <include refid="selectMdModelPargroupVo"/>
+        <where>
+            <if test="parGroupCode != null  and parGroupCode != ''"> and PAR_GROUP_CODE = #{parGroupCode}</if>
+            <if test="parGroupNote != null  and parGroupNote != ''"> and PAR_GROUP_NOTE = #{parGroupNote}</if>
+            <if test="createby != null "> and CREATEBY = #{createby}</if>
+            <if test="modifyby != null "> and MODIFYBY = #{modifyby}</if>
+        </where>
+    </select>
+
+    <select id="selectMdModelPargroupByMgid" parameterType="Integer" resultMap="MdModelPargroupResult">
+        <include refid="selectMdModelPargroupVo"/>
+        where MGID = #{mgid}
+    </select>
+
+    <insert id="insertMdModelPargroup" parameterType="com.ruoyi.interfaces.domain.MdModelPargroup" useGeneratedKeys="true" keyProperty="mgid">
+        insert into md_model_pargroup
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="mdid != null">MDID,</if>
+            <if test="parGroupCode != null">PAR_GROUP_CODE,</if>
+            <if test="parGroupName != null">PAR_GROUP_NAME,</if>
+            <if test="parGroupSort != null">PAR_GROUP_SORT,</if>
+            <if test="parGroupNote != null">PAR_GROUP_NOTE,</if>
+            <if test="createby != null">CREATEBY,</if>
+            <if test="modifyby != null">MODIFYBY,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="mdid != null">#{mdid},</if>
+            <if test="parGroupCode != null">#{parGroupCode},</if>
+            <if test="parGroupName != null">#{parGroupName},</if>
+            <if test="parGroupSort != null">#{parGroupSort},</if>
+            <if test="parGroupNote != null">#{parGroupNote},</if>
+            <if test="createby != null">#{createby},</if>
+            <if test="modifyby != null">#{modifyby},</if>
+        </trim>
+    </insert>
+
+    <update id="updateMdModelPargroup" parameterType="com.ruoyi.interfaces.domain.MdModelPargroup">
+        update md_model_pargroup
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="mdid != null">MDID = #{mdid},</if>
+            <if test="parGroupCode != null">PAR_GROUP_CODE = #{parGroupCode},</if>
+            <if test="parGroupName != null">PAR_GROUP_NAME = #{parGroupName},</if>
+            <if test="parGroupSort != null">PAR_GROUP_SORT = #{parGroupSort},</if>
+            <if test="parGroupNote != null">PAR_GROUP_NOTE = #{parGroupNote},</if>
+            <if test="createby != null">CREATEBY = #{createby},</if>
+            <if test="modifyby != null">MODIFYBY = #{modifyby},</if>
+        </trim>
+        where MGID = #{mgid}
+    </update>
+
+    <delete id="deleteMdModelPargroupByMgid" parameterType="Integer">
+        delete from md_model_pargroup where MGID = #{mgid}
+    </delete>
+
+    <delete id="deleteMdModelPargroupByMgids" parameterType="String">
+        delete from md_model_pargroup where MGID in
+        <foreach item="mgid" collection="array" open="(" separator="," close=")">
+            #{mgid}
+        </foreach>
+    </delete>
+</mapper>