试验-规范管理-规范文件夹 参数对象名称问题

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/PrivateStandard.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
@@ -44,14 +45,14 @@ public class PrivateStandard {
      * 父级节点id
      * type = 2 必传
      */
-    @ApiModelProperty(value = "父级节点id", required = true)
+    @ApiModelProperty(value = "父级节点id")
     private Long parentId;
 
     /**
      * 项目试验节点id
      * type = 1 必传
      */
-    @ApiModelProperty(value = "项目试验节点id", required = true)
+    @ApiModelProperty(value = "项目试验节点id")
     private Long privateId;
 
     /**
@@ -63,35 +64,37 @@ public class PrivateStandard {
 
     /**
      * 下达日期（年月日）
+     * type = 2 必传
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "下达日期（年月日）", required = true)
+    @ApiModelProperty(value = "下达日期（年月日）")
     private Date issueDate;
 
     /**
      * 实施日期（年月日）
+     * type = 2 必传
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty(value = "实施日期（年月日）", required = true)
+    @ApiModelProperty(value = "实施日期（年月日）")
     private Date actualizeDate;
 
     /**
      * 规范文件路径
      */
-    @ApiModelProperty(value = "规范文件路径", required = true)
+    @ApiModelProperty(value = "规范文件路径")
     private String standardFileUrl;
 
     /**
      * 是否删除（0-正常，1-已删除）
      */
-    @ApiModelProperty(value = "是否删除（0-正常，1-已删除）", hidden = true)
+    @ApiModelProperty(value = "是否删除（0-正常，1-已删除）")
     private Integer isDeleted = 0;
     /**
      * 状态（1-正常，2-过期）
      */
-    @ApiModelProperty(value = "状态（1-正常，2-过期）", hidden = true)
+    @ApiModelProperty(value = "状态（1-正常，2-过期）")
     private Integer status;
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/controller/PrivateStandardController.java

@@ -41,15 +41,15 @@ public class PrivateStandardController {
      * 分页查询所有数据
      *
      * @param query               分页对象
-     * @param uWbsPrivateStandard 查询实体
+     * @param privateStandard 查询实体
      * @return 所有数据
      */
     @GetMapping("page")
     @ApiOperation(value = "分页查询所有数据", notes = "传入分页对象和高级查询对象")
-    public R<IPage<PrivateStandard>> selectAll(Query query, PrivateStandard uWbsPrivateStandard) {
+    public R<IPage<PrivateStandard>> selectAll(Query query, PrivateStandard privateStandard) {
         try {
             Page page = new Page(query.getCurrent(), query.getSize());
-            IPage<PrivateStandard> resultPage = this.privateStandardService.page(page, new QueryWrapper<>(uWbsPrivateStandard));
+            IPage<PrivateStandard> resultPage = this.privateStandardService.page(page, new QueryWrapper<>(privateStandard));
             return R.data(resultPage);
         } catch (Exception e) {
             // 可根据实际需求记录日志或返回特定错误信息
@@ -75,50 +75,50 @@ public class PrivateStandardController {
     /**
      * 新增数据
      *
-     * @param uWbsPrivateStandard 实体对象
+     * @param privateStandard 实体对象
      * @return 新增结果
      */
     @PostMapping("add")
-    @ApiOperation(value = "新增数据", notes = "传入新增对象")
+    @ApiOperation(value = "新增数据", notes = "privateStandard")
     @ApiImplicitParam(name = "uWbsPrivateStandard", value = "实体对象", required = true)
-    public R<Boolean> insert(@RequestBody @Validated PrivateStandard uWbsPrivateStandard) {
-        uWbsPrivateStandard.setId(SnowFlakeUtil.getId());
-        if (uWbsPrivateStandard.getType() != 1 && uWbsPrivateStandard.getType() != 2) {
+    public R<Boolean> insert(@RequestBody @Validated PrivateStandard privateStandard) {
+        privateStandard.setId(SnowFlakeUtil.getId());
+        if (privateStandard.getType() != 1 && privateStandard.getType() != 2) {
             return R.fail("类型错误");
         }
-        if (uWbsPrivateStandard.getType() == 1) {
-            uWbsPrivateStandard.setParentId(0L);
-            if (uWbsPrivateStandard.getPrivateId() == null) {
+        if (privateStandard.getType() == 1) {
+            privateStandard.setParentId(0L);
+            if (privateStandard.getPrivateId() == null) {
                 return R.fail("节点不能为空");
             }
         } else {
-            if (uWbsPrivateStandard.getParentId() == null) {
+            if (privateStandard.getParentId() == null) {
                 return R.fail("父级节点不能为空");
             }
-            if (uWbsPrivateStandard.getIssueDate() == null) {
+            if (privateStandard.getIssueDate() == null) {
                 return R.fail("下达日期不能为空");
             }
-            if (uWbsPrivateStandard.getActualizeDate() == null) {
+            if (privateStandard.getActualizeDate() == null) {
                 return R.fail("实施日期不能为空");
             }
         }
-        boolean save = this.privateStandardService.insert(uWbsPrivateStandard);
+        boolean save = this.privateStandardService.insert(privateStandard);
         return R.data(save);
     }
 
     /**
      * 修改数据
      *
-     * @param uWbsPrivateStandard 实体对象
+     * @param privateStandards 实体对象
      * @return 修改结果
      */
     @ApiOperation(value = "修改数据")
     @PostMapping("edit")
     @ApiImplicitParam(name = "uWbsPrivateStandard", value = "实体对象", required = true)
-    public R<Boolean> update(@RequestBody @Validated List<PrivateStandard> uWbsPrivateStandard) {
+    public R<Boolean> update(@RequestBody @Validated List<PrivateStandard> privateStandards) {
         BladeUser user = SecureUtil.getUser();
-        uWbsPrivateStandard.forEach(f -> f.setUpdateUser(user.getUserId()));
-        boolean b = this.privateStandardService.updateBatchById(uWbsPrivateStandard);
+        privateStandards.forEach(f -> f.setUpdateUser(user.getUserId()));
+        boolean b = this.privateStandardService.updateBatchById(privateStandards);
         return R.data(b);
     }