Ver código fonte

模型参数更新

ZhuDeKang 3 meses atrás
pai
commit
efa4c14059

+ 19 - 21
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/MdModelParamsController.java

@@ -26,14 +26,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 模型参数信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-07-15
  */
 @RestController
 @RequestMapping("/model/params")
-public class MdModelParamsController extends BaseController
-{
+public class MdModelParamsController extends BaseController {
     @Autowired
     private IMdModelParamsService mdModelParamsService;
 
@@ -42,8 +41,7 @@ public class MdModelParamsController extends BaseController
      */
     @ApiOperation("查询模型参数信息列表")
     @GetMapping("/list")
-    public TableDataInfo list(MdModelParams mdModelParams)
-    {
+    public TableDataInfo list(MdModelParams mdModelParams) {
         startPage();
         List<MdModelParams> list = mdModelParamsService.selectMdModelParamsList(mdModelParams);
         return getDataTable(list);
@@ -54,8 +52,7 @@ public class MdModelParamsController extends BaseController
      */
     @ApiOperation("查询模型参数信息列表")
     @GetMapping("/allList")
-    public AjaxResult allList(MdModelParams mdModelParams)
-    {
+    public AjaxResult allList(MdModelParams mdModelParams) {
         List<MdModelParams> list = mdModelParamsService.selectMdModelParamsList(mdModelParams);
         return AjaxResult.success(list);
     }
@@ -67,8 +64,7 @@ public class MdModelParamsController extends BaseController
     @ApiOperation("导出模型参数信息列表")
     @Log(title = "模型参数信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MdModelParams mdModelParams)
-    {
+    public void export(HttpServletResponse response, MdModelParams mdModelParams) {
         List<MdModelParams> list = mdModelParamsService.selectMdModelParamsList(mdModelParams);
         ExcelUtil<MdModelParams> util = new ExcelUtil<MdModelParams>(MdModelParams.class);
         util.exportExcel(response, list, "模型参数信息数据");
@@ -79,8 +75,7 @@ public class MdModelParamsController extends BaseController
      */
     @ApiOperation("获取模型参数信息详细信息")
     @GetMapping(value = "/{parId}")
-    public AjaxResult getInfo(@PathVariable("parId") String parId)
-    {
+    public AjaxResult getInfo(@PathVariable("parId") String parId) {
         return success(mdModelParamsService.selectMdModelParamsByParId(parId));
     }
 
@@ -90,8 +85,7 @@ public class MdModelParamsController extends BaseController
     @ApiOperation("新增模型参数信息")
     @Log(title = "模型参数信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MdModelParams mdModelParams)
-    {
+    public AjaxResult add(@RequestBody MdModelParams mdModelParams) {
         return toAjax(mdModelParamsService.insertMdModelParams(mdModelParams));
     }
 
@@ -101,10 +95,9 @@ public class MdModelParamsController extends BaseController
     @ApiOperation("新增模型参数信息")
     @Log(title = "模型参数信息", businessType = BusinessType.INSERT)
     @PostMapping("/addList")
-    public AjaxResult addList(@RequestBody List<MdModelParams> mdModelParams)
-    {
+    public AjaxResult addList(@RequestBody List<MdModelParams> mdModelParams) {
         if (StringUtils.isEmpty(mdModelParams)) return AjaxResult.error("数据为空");
-        mdModelParamsService.deleteMdModelParamsByMdid(mdModelParams.get(0).getMdid());
+        mdModelParamsService.deleteMdModelParamsByParGroup(mdModelParams.get(0).getParGroup());
         for (int i = 0; i < mdModelParams.size(); i++) {
             mdModelParams.get(i).setSort(i);
         }
@@ -112,6 +105,13 @@ public class MdModelParamsController extends BaseController
         return success("插入成功");
     }
 
+    @DeleteMapping("/removeAll")
+    public AjaxResult removeAll(MdModelParams mdModelParams) {
+        if (StringUtils.isEmpty(mdModelParams.getParGroup())) return AjaxResult.error("数据为空");
+        mdModelParamsService.deleteMdModelParamsByParGroup(mdModelParams.getParGroup());
+        return success("修改成功");
+    }
+
 
     /**
      * 修改模型参数信息
@@ -119,8 +119,7 @@ public class MdModelParamsController extends BaseController
     @ApiOperation("修改模型参数信息")
     @Log(title = "模型参数信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody MdModelParams mdModelParams)
-    {
+    public AjaxResult edit(@RequestBody MdModelParams mdModelParams) {
         return toAjax(mdModelParamsService.updateMdModelParams(mdModelParams));
     }
 
@@ -129,9 +128,8 @@ public class MdModelParamsController extends BaseController
      */
     @ApiOperation("删除模型参数信息")
     @Log(title = "模型参数信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{parIds}")
-    public AjaxResult remove(@PathVariable String[] parIds)
-    {
+    @DeleteMapping("/{parIds}")
+    public AjaxResult remove(@PathVariable String[] parIds) {
         return toAjax(mdModelParamsService.deleteMdModelParamsByParIds(parIds));
     }
 }

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

@@ -27,7 +27,7 @@ public class MdModelParams extends BaseEntity
     @Excel(name = "参数分类")
     private String parCate;
 
-    /** 参数分组 */
+    /** 参数分组id */
     @Excel(name = "参数分组")
     private String parGroup;
 

+ 2 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/MdModelParamsMapper.java

@@ -69,4 +69,6 @@ public interface MdModelParamsMapper
     int deleteMdModelParamsByMdid(String mdid);
 
     int updateMdModelParamsGroupCode(MdModelParams mdModelParams);
+
+    int deleteMdModelParamsByParGroup(String parGroup);
 }

+ 1 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/IMdModelParamsService.java

@@ -61,5 +61,6 @@ public interface IMdModelParamsService
     public int deleteMdModelParamsByParId(String parId);
 
     int deleteMdModelParamsByMdid(String mdid);
+    int deleteMdModelParamsByParGroup(String parGroup);
 
 }

+ 0 - 2
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdAppFlowServiceImpl.java

@@ -19,7 +19,6 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.websocket.WebSocketUsers;
 import com.ruoyi.interfaces.domain.vo.MdAppFlowVo;
 import com.ruoyi.interfaces.tinyflow.TinyflowUtil;
-import com.ruoyi.interfaces.tinyflow.parser.PrintNodeParser;
 import dev.tinyflow.core.Tinyflow;
 import dev.tinyflow.core.node.HttpNode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -159,7 +158,6 @@ public class MdAppFlowServiceImpl implements IMdAppFlowService {
             @Override
             public void onError(Throwable error, ChainNode node, Map<String, Object> nodeResult, Chain chain) {
 
-
                 if (StringUtils.isNotNull(session)) {
                     HashMap<String, Object> nodeMap = new HashMap<>();
                     nodeMap.put("id", node.getId());

+ 5 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdModelParamsServiceImpl.java

@@ -102,4 +102,9 @@ public class MdModelParamsServiceImpl implements IMdModelParamsService
 
         return mdModelParamsMapper.deleteMdModelParamsByMdid(mdid);
     }
+
+    @Override
+    public int deleteMdModelParamsByParGroup(String parGroup) {
+        return mdModelParamsMapper.deleteMdModelParamsByParGroup(parGroup);
+    }
 }

+ 72 - 42
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdModelParamsMapper.xml

@@ -5,53 +5,74 @@
 <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="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"    />
-        <result property="sort"    column="SORT"    />
+        <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"/>
+        <result property="sort" column="SORT"/>
     </resultMap>
 
     <sql id="selectMdModelParamsVo">
-        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,SORT 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,
+               SORT
+        from md_model_params
     </sql>
 
-    <select id="selectMdModelParamsList" parameterType="com.ruoyi.interfaces.domain.MdModelParams" resultMap="MdModelParamsResult">
+    <select id="selectMdModelParamsList" parameterType="com.ruoyi.interfaces.domain.MdModelParams"
+            resultMap="MdModelParamsResult">
         <include refid="selectMdModelParamsVo"/>
         <where>
-            <if test="mdid != null  and mdid != ''"> and MDID = #{mdid}</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>
+            <if test="mdid != null  and mdid != ''">and MDID = #{mdid}</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>
         order by SORT
     </select>
@@ -143,7 +164,9 @@
 
 
     <delete id="deleteMdModelParamsByParid" parameterType="String">
-        delete from md_model_params where PARID = #{parid}
+        delete
+        from md_model_params
+        where PARID = #{parid}
     </delete>
 
     <delete id="deleteMdModelParamsByParids" parameterType="String">
@@ -153,6 +176,13 @@
         </foreach>
     </delete>
     <delete id="deleteMdModelParamsByMdid">
-        delete from md_model_params where MDID = #{mdid}
+        delete
+        from md_model_params
+        where MDID = #{mdid}
+    </delete>
+    <delete id="deleteMdModelParamsByParGroup">
+        delete
+        from md_model_params
+        where PAR_GROUP = #{parGroup}
     </delete>
 </mapper>