模型管理优化

taphole-iron/src/main/java/com/sckj/iron/controller/TIronModelController.java

@@ -39,7 +39,7 @@ public class TIronModelController {
 
     @GetMapping("/detail")
     @ApiOperation(value = "出铁相关模型详情")
-    public AjaxResult<TIronModelDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
+    public AjaxResult<TIronModelDetailVo> detail(Long id) {
         TIronModelDetailVo detail = iTIronModelService.detail(id);
         return AjaxResult.success(detail);
     }

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronModelServiceImpl.java

@@ -80,7 +80,7 @@ public class TIronModelServiceImpl extends ServiceImpl<TIronModelMapper, TIronMo
      * @param id 主键参数
      * @return TIronModel
      */
-    public TIronModelDetailVo detail(Integer id) {
+    public TIronModelDetailVo detail(Long id) {
         TIronModel model = tIronModelMapper.selectOne(
                 new QueryWrapper<TIronModel>()
                         .eq("id", id)
@@ -104,13 +104,8 @@ public class TIronModelServiceImpl extends ServiceImpl<TIronModelMapper, TIronMo
         model.setModelName(createValidate.getModelName());
         model.setModelExpression(createValidate.getModelExpression());
         model.setModelDesc(createValidate.getModelDesc());
-        model.setModelPath(createValidate.getModelPath());
         model.setStatus(createValidate.getStatus());
         model.setSort(createValidate.getSort());
-        model.setCreateBy(createValidate.getCreateBy());
-        model.setUpdateBy(createValidate.getUpdateBy());
-        model.setTapholeId(createValidate.getTapholeId());
-        model.setBoilerId(createValidate.getBoilerId());
         tIronModelMapper.insert(model);
     }
 
@@ -135,10 +130,6 @@ public class TIronModelServiceImpl extends ServiceImpl<TIronModelMapper, TIronMo
         model.setModelPath(updateValidate.getModelPath());
         model.setStatus(updateValidate.getStatus());
         model.setSort(updateValidate.getSort());
-        model.setCreateBy(updateValidate.getCreateBy());
-        model.setUpdateBy(updateValidate.getUpdateBy());
-        model.setTapholeId(updateValidate.getTapholeId());
-        model.setBoilerId(updateValidate.getBoilerId());
         tIronModelMapper.updateById(model);
     }
 

taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronStepServiceImpl.java

@@ -144,7 +144,7 @@ public class TIronStepServiceImpl extends ServiceImpl<TIronStepMapper, TIronStep
             queryWrapper.lambda().like(TIronStep::getPointName, searchValidate.getPointName());
         }
 
-        queryWrapper.orderByDesc(Arrays.asList("sort", "step_id"));
+        queryWrapper.orderByAsc(Arrays.asList("sort"));
 
 //        tIronStepMapper.setSearch(queryWrapper, searchValidate, new String[]{
 //                "=:stepId@step_id:str",

taphole-iron/src/main/java/com/sckj/iron/validate/TIronModelCreateValidate.java

@@ -18,40 +18,22 @@ public class TIronModelCreateValidate implements Serializable {
     @ApiModelProperty(value = "模型名称")
     private String modelName;
 
-    @NotNull(message = "modelExpression参数缺失")
     @ApiModelProperty(value = "模型公式")
     private String modelExpression;
 
-    @NotNull(message = "modelDesc参数缺失")
     @ApiModelProperty(value = "描述")
     private String modelDesc;
 
-    @NotNull(message = "modelPath参数缺失")
     @ApiModelProperty(value = "模型存储位置")
     private String modelPath;
 
     @NotNull(message = "status参数缺失")
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @NotNull(message = "sort参数缺失")
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
-    @NotNull(message = "createBy参数缺失")
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @NotNull(message = "updateBy参数缺失")
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @NotNull(message = "tapholeId参数缺失")
-    @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
-
-    @NotNull(message = "boilerId参数缺失")
-    @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
 
 }

taphole-iron/src/main/java/com/sckj/iron/validate/TIronModelSearchValidate.java

@@ -25,7 +25,7 @@ public class TIronModelSearchValidate implements Serializable {
     @ApiModelProperty(value = "模型存储位置")
     private String modelPath;
 
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @ApiModelProperty(value = "排序")

taphole-iron/src/main/java/com/sckj/iron/validate/TIronModelUpdateValidate.java

@@ -17,7 +17,6 @@ public class TIronModelUpdateValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @IDMust(message = "id参数必传且需大于0")
     @ApiModelProperty(value = "模型ID")
     private Long id;
 
@@ -25,40 +24,23 @@ public class TIronModelUpdateValidate implements Serializable {
     @ApiModelProperty(value = "模型名称")
     private String modelName;
 
-    @NotNull(message = "modelExpression参数缺失")
     @ApiModelProperty(value = "模型公式")
     private String modelExpression;
 
-    @NotNull(message = "modelDesc参数缺失")
     @ApiModelProperty(value = "描述")
     private String modelDesc;
 
-    @NotNull(message = "modelPath参数缺失")
     @ApiModelProperty(value = "模型存储位置")
     private String modelPath;
 
     @NotNull(message = "status参数缺失")
-    @ApiModelProperty(value = "状态（1正常 0停用）")
+    @ApiModelProperty(value = "状态")
     private String status;
 
     @NotNull(message = "sort参数缺失")
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
-    @NotNull(message = "createBy参数缺失")
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
 
-    @NotNull(message = "updateBy参数缺失")
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @NotNull(message = "tapholeId参数缺失")
-    @ApiModelProperty(value = "铁口区域编号")
-    private Long tapholeId;
-
-    @NotNull(message = "boilerId参数缺失")
-    @ApiModelProperty(value = "锅炉编号")
-    private Long boilerId;
 
 }