Merge branch 'feature-lihb-20250610' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/StandardInfoDTO.java

@@ -0,0 +1,25 @@
+package org.springblade.business.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.business.entity.StandardInfo;
+
+import java.util.List;
+
+/**
+ * 试验规范信息DTO
+ *
+ * @author LHB
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(description = "试验规范信息DTO")
+public class StandardInfoDTO extends StandardInfo {
+    /**
+     * 基础信息
+     */
+    @ApiModelProperty(value = "基础信息", required = true)
+    private List<StandardInfo> info;
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/StandardInfoJoinDTO.java

@@ -1,5 +1,7 @@
 package org.springblade.business.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -8,19 +10,23 @@ import java.util.List;
 
 /**
  * 条件设置
+ *
  * @author LHB
  */
 @Data
+@ApiModel(description = "新增对象")
 public class StandardInfoJoinDTO {
     /**
      * 主关联id
      */
+    @ApiModelProperty(value = "主关联id", required = true)
     @NotNull(message = "主关联id不能为空")
     private Long leftId;
 
     /**
      * 副连接id
      */
+    @ApiModelProperty(value = "副连接id集合", required = true)
     @NotEmpty(message = "副连接id不能为空")
     private List<Long> rightIds;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/StandardInfoPrivateJoinDTO.java

@@ -1,7 +1,9 @@
 package org.springblade.business.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springblade.business.entity.UStandardInfoPrivateJoin;
+import org.springblade.business.entity.StandardInfoPrivateJoin;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -12,15 +14,18 @@ import java.util.List;
  * @author LHB
  */
 @Data
+@ApiModel(description = "新增对象")
 public class StandardInfoPrivateJoinDTO {
     /**
      * 主关联id
      */
     @NotNull(message = "主关联id不能为空")
+    @ApiModelProperty(value = "主关联id")
     private Long leftId;
     /**
      * 副连接id
      */
     @NotEmpty(message = "副连接信息不能为空")
-    private List<UStandardInfoPrivateJoin> rightIds;
+    @ApiModelProperty(value = "副连接信息集合")
+    private List<StandardInfoPrivateJoin> rightIds;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/UStandardInfoDTO.java

@@ -1,20 +0,0 @@
-package org.springblade.business.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.business.entity.UStandardInfo;
-
-import java.util.List;
-
-/**
- * 试验规范信息DTO
- * @author LHB
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class UStandardInfoDTO extends UStandardInfo {
-    /**
-     * 基础信息
-     */
-    private List<UStandardInfo> info;
-}

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

@@ -8,7 +8,10 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 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;
@@ -22,75 +25,90 @@ import javax.validation.constraints.NotNull;
  */
 @TableName(value = "u_wbs_private_standard")
 @Data
+@ApiModel(description = "规范文件夹及规范文件对象")
 public class PrivateStandard {
     /**
      *
      */
     @TableId
+    @ApiModelProperty(value = "主键", required = true)
     private Long id;
 
     /**
      * 名称（规范文件夹名称及规范名称）
      */
     @NotBlank(message = "名称不能为空")
+    @ApiModelProperty(value = "名称", required = true)
     private String name;
 
     /**
      * 父级节点id
      * type = 2 必传
      */
+    @ApiModelProperty(value = "父级节点id(type = 2 必传)")
     private Long parentId;
 
     /**
      * 项目试验节点id
      * type = 1 必传
      */
+    @ApiModelProperty(value = "项目试验节点id(type = 1 必传)")
     private Long privateId;
 
     /**
      * 类型（1-规范文件夹，2-规范文件）
      */
+    @ApiModelProperty(value = "类型（1-规范文件夹，2-规范文件）", required = true)
     @NotNull(message = "类型不能为空")
     private Integer type;
 
     /**
      * 下达日期（年月日）
+     * type = 2 必传
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "下达日期（年月日）(type = 2 必传)")
     private Date issueDate;
 
     /**
      * 实施日期（年月日）
+     * type = 2 必传
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "实施日期（年月日）(type = 2 必传)")
     private Date actualizeDate;
 
     /**
      * 规范文件路径
      */
+    @ApiModelProperty(value = "规范文件路径")
     private String standardFileUrl;
 
     /**
      * 是否删除（0-正常，1-已删除）
      */
+    @ApiModelProperty(value = "是否删除（0-正常，1-已删除）")
     private Integer isDeleted = 0;
     /**
      * 状态（1-正常，2-过期）
      */
-    private Integer status = 1;
+    @ApiModelProperty(value = "状态（1-正常，2-过期）")
+    private Integer status;
 
     /**
      * 创建时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private LocalDateTime createTime;
 
     /**
      * 创建人
      */
+    @ApiModelProperty(value = "创建人", hidden = true)
     private Long createUser;
 
     /**
@@ -98,10 +116,12 @@ public class PrivateStandard {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间", hidden = true)
     private LocalDateTime updateTime;
 
     /**
      * 修改人
      */
+    @ApiModelProperty(value = "修改人", hidden = true)
     private Long updateUser;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/UStandardInfo.java → blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/StandardInfo.java

@@ -2,7 +2,11 @@ package org.springblade.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
@@ -11,63 +15,75 @@ import javax.validation.constraints.NotNull;
 
 /**
  * 规范参数管理-基础信息
+ *
  * @author LHB
  * @TableName u_standard_info
  */
-@TableName(value ="u_standard_info")
+@TableName(value = "u_standard_info")
 @Data
-public class UStandardInfo {
+@ApiModel(description = "规范参数管理-基础信息")
+public class StandardInfo {
     /**
-     * 
+     *
      */
     @TableId
+    @ApiModelProperty(value = "主键")
     private Long id;
 
     /**
      * 名称（样品信息名称）
      */
     @NotBlank(message = "名称不能为空")
+    @ApiModelProperty(value = "名称（样品信息名称）")
     private String name;
 
     /**
      * 父级节点id
      */
+    @ApiModelProperty(value = "父级节点id")
     private Long parentId;
 
     /**
      * 规范文件id
      */
+    @ApiModelProperty(value = "规范文件id")
     private Long standardId;
 
     /**
-     *  类型（1-样品信息，2-技术指标）
+     * 类型（1-样品信息，2-技术指标）
      */
+    @ApiModelProperty(value = "类型（1-样品信息，2-技术指标）")
     @NotNull(message = "类型不能为空")
     @Range(min = 1, max = 2, message = "类型只能为1或2")
     private Integer type;
 
     /**
-     *  是否删除（0-正常，1-已删除）
+     * 是否删除（0-正常，1-已删除）
      */
+    @ApiModelProperty(value = "是否删除（0-正常，1-已删除）")
     private Integer isDeleted;
 
     /**
-     *  创建时间
+     * 创建时间
      */
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
 
     /**
-     *  创建人
+     * 创建人
      */
+    @ApiModelProperty(value = "创建人", hidden = true)
     private Long createUser;
 
     /**
-     *  修改时间
+     * 修改时间
      */
+    @ApiModelProperty(value = "修改时间", hidden = true)
     private Date updateTime;
 
     /**
-     *  修改人
+     * 修改人
      */
+    @ApiModelProperty(value = "修改人", hidden = true)
     private Long updateUser;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/UStandardInfoJoin.java → blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/StandardInfoJoin.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @TableName(value ="u_standard_info_join")
 @Data
-public class UStandardInfoJoin {
+public class StandardInfoJoin {
     /**
      * 
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/UStandardInfoPrivateJoin.java → blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/StandardInfoPrivateJoin.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -16,66 +19,79 @@ import javax.validation.constraints.NotNull;
  */
 @TableName(value ="u_standard_info_private_join")
 @Data
-public class UStandardInfoPrivateJoin {
+
+@ApiModel(description = "副连接信息集合")
+public class StandardInfoPrivateJoin {
     /**
      * 
      */
     @TableId
+    @ApiModelProperty(value = "主键", required = true)
     private Long id;
 
     /**
      * 规范基础信息关联主id
      */
     @NotNull(message = "规范基础信息关联主id不能为空")
+    @ApiModelProperty(value = "规范基础信息关联主id", hidden = true)
     private Long standardInfoId;
 
     /**
      * 试验wbs表单id
      */
     @NotNull(message = "试验wbs表单id不能为空")
+    @ApiModelProperty(value = "试验wbs表单id", required = true)
     private Long privateId;
 
     /**
      * 元素key
      */
     @NotBlank(message = "元素key不能为空")
+    @ApiModelProperty(value = "元素key", required = true)
     private String colKey;
 
     /**
      * 元素名称
      */
     @NotBlank(message = "元素名称不能为空")
+    @ApiModelProperty(value = "元素名称", required = true)
     private String colName;
 
     /**
      *  是否删除（0-正常，1-已删除）
      */
+    @ApiModelProperty(value = "是否删除（0-正常，1-已删除）")
     private Integer isDeleted;
 
     /**
      *  创建时间
      */
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
 
     /**
      *  创建人
      */
+    @ApiModelProperty(value = "创建人", hidden = true)
     private Long createUser;
 
     /**
      *  修改时间
      */
+    @ApiModelProperty(value = "修改时间", hidden = true)
     private Date updateTime;
 
     /**
      *  修改人
      */
+    @ApiModelProperty(value = "修改人", hidden = true)
     private Long updateUser;
 
 
     /**
      * 表单名称（展示用）
      */
+    @ApiModelProperty(value = "表单名称（展示用）")
     @TableField(exist = false)
     private String privateName;
 

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/StandardInfoPrivateJoinVO.java

@@ -0,0 +1,22 @@
+package org.springblade.business.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.business.entity.StandardInfo;
+import org.springblade.business.entity.StandardInfoPrivateJoin;
+
+import java.util.List;
+
+/**
+ * @author LHB
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(description = "关联元素对象-视图")
+public class StandardInfoPrivateJoinVO extends StandardInfo {
+
+    @ApiModelProperty(value = "关联元素副元素集合")
+    private List<StandardInfoPrivateJoin> privateJoins;
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/StandardInfoVO.java

@@ -0,0 +1,23 @@
+package org.springblade.business.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.business.entity.StandardInfo;
+
+import java.util.List;
+
+/**
+ * @author LHB
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(description = "条件设置对象")
+public class StandardInfoVO extends StandardInfo {
+    /**
+     * 副连接对象
+     */
+    @ApiModelProperty(value = "副连接对象集合")
+    private List<StandardInfo> standardInfos;
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/UStandardInfoPrivateJoinVO.java

@@ -1,17 +0,0 @@
-package org.springblade.business.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.business.entity.UStandardInfo;
-import org.springblade.business.entity.UStandardInfoPrivateJoin;
-
-import java.util.List;
-
-/**
- * @author LHB
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class UStandardInfoPrivateJoinVO extends UStandardInfo {
-    private List<UStandardInfoPrivateJoin> privateJoins;
-}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/UStandardInfoVO.java

@@ -1,19 +0,0 @@
-package org.springblade.business.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.business.entity.UStandardInfo;
-
-import java.util.List;
-
-/**
- * @author LHB
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class UStandardInfoVO extends UStandardInfo {
-    /**
-     * 副连接对象
-     */
-    private List<UStandardInfo> standardInfos;
-}

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

@@ -4,6 +4,10 @@ package org.springblade.business.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springblade.business.entity.PrivateStandard;
 import org.springblade.business.service.PrivateStandardService;
 import org.springblade.common.utils.SnowFlakeUtil;
@@ -15,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 规范文件夹及规范文件表(UWbsPrivateStandard)表控制层
@@ -24,6 +29,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("PrivateStandard")
+@Api(tags = "试验-规范管理-规范文件夹及规范文件接口")
 public class PrivateStandardController {
     /**
      * 服务对象
@@ -35,14 +41,15 @@ public class PrivateStandardController {
      * 分页查询所有数据
      *
      * @param query               分页对象
-     * @param uWbsPrivateStandard 查询实体
+     * @param privateStandard 查询实体
      * @return 所有数据
      */
     @GetMapping("page")
-    public R<IPage<PrivateStandard>> selectAll(Query query, PrivateStandard uWbsPrivateStandard) {
+    @ApiOperation(value = "分页查询所有数据", notes = "传入分页对象和高级查询对象")
+    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) {
             // 可根据实际需求记录日志或返回特定错误信息
@@ -57,6 +64,8 @@ public class PrivateStandardController {
      * @param id 主键
      * @return 单条数据
      */
+    @ApiOperation(value = "通过主键查询单条数据", notes = "传入主键Id")
+    @ApiImplicitParam(name = "id", value = "主键id", required = true)
     @GetMapping("/getById")
     public R<PrivateStandard> selectOne(Long id) {
         PrivateStandard byId = this.privateStandardService.getById(id);
@@ -66,46 +75,50 @@ public class PrivateStandardController {
     /**
      * 新增数据
      *
-     * @param uWbsPrivateStandard 实体对象
+     * @param privateStandard 实体对象
      * @return 新增结果
      */
     @PostMapping("add")
-    public R<Boolean> insert(@RequestBody @Validated PrivateStandard uWbsPrivateStandard) {
-        uWbsPrivateStandard.setId(SnowFlakeUtil.getId());
-        if (uWbsPrivateStandard.getType() != 1 && uWbsPrivateStandard.getType() != 2) {
+    @ApiOperation(value = "新增数据", notes = "privateStandard")
+    @ApiImplicitParam(name = "privateStandard", value = "实体对象", required = true)
+    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")
-    public R<Boolean> update(@RequestBody @Validated PrivateStandard uWbsPrivateStandard) {
+    @ApiImplicitParam(name = "privateStandards", value = "实体对象", required = true)
+    public R<Boolean> update(@RequestBody @Validated List<PrivateStandard> privateStandards) {
         BladeUser user = SecureUtil.getUser();
-        uWbsPrivateStandard.setUpdateUser(user.getUserId());
-        boolean b = this.privateStandardService.updateById(uWbsPrivateStandard);
+        privateStandards.forEach(f -> f.setUpdateUser(user.getUserId()));
+        boolean b = this.privateStandardService.updateBatchById(privateStandards);
         return R.data(b);
     }
 
@@ -115,7 +128,9 @@ public class PrivateStandardController {
      * @param id 主键
      * @return 删除结果
      */
+    @ApiOperation(value = "删除数据")
     @GetMapping("/delete")
+    @ApiImplicitParam(name = "id", value = "主键id", required = true)
     public R<Boolean> delete(Long id) {
         boolean b = this.privateStandardService.delete(id);
         return R.data(b);

blade-service/blade-business/src/main/java/org/springblade/business/controller/UStandardInfoController.java → blade-service/blade-business/src/main/java/org/springblade/business/controller/StandardInfoController.java

@@ -2,13 +2,16 @@ package org.springblade.business.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import org.springblade.business.dto.StandardInfoJoinDTO;
 import org.springblade.business.dto.StandardInfoPrivateJoinDTO;
-import org.springblade.business.dto.UStandardInfoDTO;
-import org.springblade.business.entity.UStandardInfo;
+import org.springblade.business.dto.StandardInfoDTO;
+import org.springblade.business.entity.StandardInfo;
 import org.springblade.business.service.StandardInfoService;
-import org.springblade.business.vo.UStandardInfoPrivateJoinVO;
-import org.springblade.business.vo.UStandardInfoVO;
+import org.springblade.business.vo.StandardInfoPrivateJoinVO;
+import org.springblade.business.vo.StandardInfoVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.validation.annotation.Validated;
@@ -25,7 +28,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("uStandardInfo")
-public class UStandardInfoController {
+@Api(tags = "试验-规范管理-基础信息接口")
+public class StandardInfoController {
     /**
      * 服务对象
      */
@@ -36,12 +40,13 @@ public class UStandardInfoController {
      * 分页查询所有数据
      *
      * @param query         分页对象
-     * @param uStandardInfo 查询实体
+     * @param standardInfo 查询实体
      * @return 所有数据
      */
     @GetMapping("page")
-    public R<IPage<UStandardInfoDTO>> selectAll(Query query, UStandardInfo uStandardInfo) {
-        IPage<UStandardInfoDTO> page = this.uStandardInfoService.selectMyPage(query, uStandardInfo);
+    @ApiOperation(value = "分页查询所有数据", notes = "传入分页对象和高级查询对象")
+    public R<IPage<StandardInfoDTO>> selectAll(Query query, StandardInfo standardInfo) {
+        IPage<StandardInfoDTO> page = this.uStandardInfoService.selectMyPage(query, standardInfo);
         return R.data(page);
     }
 
@@ -52,32 +57,36 @@ public class UStandardInfoController {
      * @return 单条数据
      */
     @GetMapping("/getById")
-    public R<UStandardInfoDTO> selectOne(Long id) {
-        UStandardInfoDTO dto = this.uStandardInfoService.selectOne(id);
+    @ApiOperation(value = "通过主键查询单条数据", notes = "传入主键Id")
+    @ApiImplicitParam(name = "id", value = "主键", required = true)
+    public R<StandardInfoDTO> selectOne(Long id) {
+        StandardInfoDTO dto = this.uStandardInfoService.selectOne(id);
         return R.data(dto);
     }
 
     /**
      * 新增数据
      *
-     * @param uStandardInfo 实体对象
+     * @param standardInfo 实体对象
      * @return 新增结果
      */
     @PostMapping("add")
-    public R<Boolean> insert(@RequestBody @Validated UStandardInfoDTO uStandardInfo) {
-        Boolean b = this.uStandardInfoService.insert(uStandardInfo);
+    @ApiOperation(value = "新增数据")
+    public R<Boolean> insert(@RequestBody @Validated StandardInfoDTO standardInfo) {
+        Boolean b = this.uStandardInfoService.insert(standardInfo);
         return R.data(b);
     }
 
     /**
      * 修改数据
      *
-     * @param uStandardInfo 实体对象
+     * @param standardInfo 实体对象
      * @return 修改结果
      */
     @PostMapping("edit")
-    public R<Boolean> update(@RequestBody @Validated UStandardInfoDTO uStandardInfo) {
-        Boolean b = this.uStandardInfoService.edit(uStandardInfo);
+    @ApiOperation(value = "修改数据")
+    public R<Boolean> update(@RequestBody @Validated StandardInfoDTO standardInfo) {
+        Boolean b = this.uStandardInfoService.edit(standardInfo);
         return R.data(b);
     }
 
@@ -87,6 +96,8 @@ public class UStandardInfoController {
      * @param id 主键
      * @return 删除结果
      */
+    @ApiOperation(value = "删除数据")
+    @ApiImplicitParam(name = "id", value = "主键", required = true)
     @GetMapping("/delete")
     public R<Boolean> delete(Long id) {
         Boolean b = this.uStandardInfoService.delete(id);
@@ -100,6 +111,7 @@ public class UStandardInfoController {
      * @param standardInfoJoins 条件设置对象
      * @return 结果
      */
+    @ApiOperation(value = "条件设置")
     @PostMapping("saveConditionSet")
     public R<Boolean> setCondition(@RequestBody @Validated List<StandardInfoJoinDTO> standardInfoJoins) {
         Boolean b = this.uStandardInfoService.setCondition(standardInfoJoins);
@@ -112,6 +124,7 @@ public class UStandardInfoController {
      * @param standardInfoPrivateJoins 关联元素对象
      * @return 结果
      */
+    @ApiOperation(value = "关联元素")
     @PostMapping("saveElementJoin")
     public R<Boolean> setElementJoin(@RequestBody @Validated List<StandardInfoPrivateJoinDTO> standardInfoPrivateJoins) {
         Boolean b = this.uStandardInfoService.setElementJoin(standardInfoPrivateJoins);
@@ -123,6 +136,8 @@ public class UStandardInfoController {
      * @param leftId 主关联id
      * @return 删除结果
      */
+    @ApiOperation(value = "删除条件设置")
+    @ApiImplicitParam(name = "leftId", value = "主关联id", required = true)
     @GetMapping("deleteConditionSet")
     public R<Boolean> deleteConditionSet(Long leftId) {
         Boolean b = this.uStandardInfoService.deleteConditionSet(leftId);
@@ -134,6 +149,8 @@ public class UStandardInfoController {
      * @param leftId 主关联id
      * @return 删除结果
      */
+    @ApiOperation(value = "删除关联元素")
+    @ApiImplicitParam(name = "leftId", value = "主关联id", required = true)
     @GetMapping("deleteElementJoin")
     public R<Boolean> deleteElementJoin(Long leftId) {
         Boolean b = this.uStandardInfoService.deleteElementJoin(leftId);
@@ -144,9 +161,11 @@ public class UStandardInfoController {
      * 查询条件设置
      * @param id 规范文件id
      */
+    @ApiOperation(value = "查询条件设置")
+    @ApiImplicitParam(name = "id", value = "规范文件id", required = true)
     @GetMapping("getConditionSet")
-    public R<List<UStandardInfoVO>> getConditionSet(Long id) {
-        List<UStandardInfoVO> list = this.uStandardInfoService.getConditionSet(id);
+    public R<List<StandardInfoVO>> getConditionSet(Long id) {
+        List<StandardInfoVO> list = this.uStandardInfoService.getConditionSet(id);
         return R.data(list);
     }
 
@@ -154,12 +173,25 @@ public class UStandardInfoController {
      * 查询关联元素
      * @param id 规范文件id
      */
+    @ApiOperation(value = "查询关联元素")
+    @ApiImplicitParam(name = "id", value = "规范文件id", required = true)
     @GetMapping("getElementJoin")
-    public R<List<UStandardInfoPrivateJoinVO>> getElementJoin(Long id) {
-        List<UStandardInfoPrivateJoinVO> list = this.uStandardInfoService.getElementJoin(id);
+    public R<List<StandardInfoPrivateJoinVO>> getElementJoin(Long id) {
+        List<StandardInfoPrivateJoinVO> list = this.uStandardInfoService.getElementJoin(id);
         return R.data(list);
     }
 
+    /**
+     * 效果预览
+     * @param ids standardInfo type=1的子级id集合
+     */
+    @ApiOperation(value = "效果预览")
+    @ApiImplicitParam(name = "ids", value = "standardInfo type=2的id集合", required = true)
+    @GetMapping("effectPreview")
+    public R<List<StandardInfoPrivateJoinVO>> effectPreview(String ids) {
+        List<StandardInfoPrivateJoinVO> list = this.uStandardInfoService.effectPreview(ids);
+        return R.data(list);
+    }
 
 }
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoJoinMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.business.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.springblade.business.entity.UStandardInfoJoin;
+import org.springblade.business.entity.StandardInfoJoin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-06-11 09:57:39
 * @Entity org.springblade.business.entity.UStandardInfoJoin
 */
-public interface StandardInfoJoinMapper extends BaseMapper<UStandardInfoJoin> {
+public interface StandardInfoJoinMapper extends BaseMapper<StandardInfoJoin> {
 
     /**
      * 软删除

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoJoinMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.business.mapper.StandardInfoJoinMapper">
 
-    <resultMap id="BaseResultMap" type="org.springblade.business.entity.UStandardInfoJoin">
+    <resultMap id="BaseResultMap" type="org.springblade.business.entity.StandardInfoJoin">
             <id property="id" column="id" />
             <result property="standardInfoLeftId" column="standard_info_left_id" />
             <result property="standardInfoRightId" column="standard_info_right_id" />

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.java

@@ -3,11 +3,11 @@ package org.springblade.business.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.business.dto.UStandardInfoDTO;
-import org.springblade.business.entity.UStandardInfo;
+import org.springblade.business.dto.StandardInfoDTO;
+import org.springblade.business.entity.StandardInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.business.vo.UStandardInfoPrivateJoinVO;
-import org.springblade.business.vo.UStandardInfoVO;
+import org.springblade.business.vo.StandardInfoPrivateJoinVO;
+import org.springblade.business.vo.StandardInfoVO;
 
 import java.util.List;
 
@@ -17,15 +17,17 @@ import java.util.List;
 * @createDate 2025-06-11 09:57:39
 * @Entity org.springblade.business.entity.UStandardInfo
 */
-public interface StandardInfoMapper extends BaseMapper<UStandardInfo> {
+public interface StandardInfoMapper extends BaseMapper<StandardInfo> {
 
-    IPage<UStandardInfoDTO> selectMyPage(Page<UStandardInfoDTO> page, @Param("query") UStandardInfo uStandardInfo);
+    IPage<StandardInfoDTO> selectMyPage(Page<StandardInfoDTO> page, @Param("query") StandardInfo standardInfo);
 
-    UStandardInfoDTO selectMyOne(@Param("id") Long id);
+    StandardInfoDTO selectMyOne(@Param("id") Long id);
 
-    List<UStandardInfoVO> getConditionSet(@Param("id") Long id);
+    List<StandardInfoVO> getConditionSet(@Param("id") Long id);
 
-    List<UStandardInfoPrivateJoinVO> getElementJoin(@Param("id") Long id);
+    List<StandardInfoPrivateJoinVO> getElementJoin(@Param("id") Long id);
+
+    List<StandardInfoPrivateJoinVO> effectPreview(@Param("rightIds") List<Long> rightIds);
 }
 
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.business.mapper.StandardInfoMapper">
 
-    <resultMap id="BaseResultMap" type="org.springblade.business.entity.UStandardInfo">
+    <resultMap id="BaseResultMap" type="org.springblade.business.entity.StandardInfo">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="parentId" column="parent_id"/>
@@ -15,7 +15,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateUser" column="update_user"/>
     </resultMap>
-    <resultMap id="BaseResultPageMap" type="org.springblade.business.dto.UStandardInfoDTO">
+    <resultMap id="BaseResultPageMap" type="org.springblade.business.dto.StandardInfoDTO">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="parentId" column="parent_id"/>
@@ -26,7 +26,7 @@
         <result property="createUser" column="create_user"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateUser" column="update_user"/>
-        <collection property="info" ofType="org.springblade.business.entity.UStandardInfo" select="findByParentId" column="{parentId=id}">
+        <collection property="info" ofType="org.springblade.business.entity.StandardInfo" select="findByParentId" column="{parentId=id}">
         </collection>
     </resultMap>
 
@@ -67,7 +67,7 @@
             is_deleted = 0 AND
             id = #{id}
     </select>
-    <select id="findByParentId" resultType="org.springblade.business.entity.UStandardInfo">
+    <select id="findByParentId" resultType="org.springblade.business.entity.StandardInfo">
         select
             <include refid="Base_Column_List"/>
         FROM
@@ -82,12 +82,12 @@
 
     <!-- ``````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````` -->
 
-    <resultMap id="BaseResultConditionSet" type="org.springblade.business.vo.UStandardInfoVO">
+    <resultMap id="BaseResultConditionSet" type="org.springblade.business.vo.StandardInfoVO">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="parentId" column="parent_id"/>
         <result property="type" column="type"/>
-        <collection property="standardInfos" ofType="org.springblade.business.entity.UStandardInfo" select="findByJoinLeftId" column="{leftId=id}">
+        <collection property="standardInfos" ofType="org.springblade.business.entity.StandardInfo" select="findByJoinLeftId" column="{leftId=id}">
         </collection>
     </resultMap>
     <sql id="Base_Column_Join_List">
@@ -114,7 +114,7 @@
         GROUP BY
             b.standard_info_left_id
     </select>
-    <select id="findByJoinLeftId" resultType="org.springblade.business.entity.UStandardInfo">
+    <select id="findByJoinLeftId" resultType="org.springblade.business.entity.StandardInfo">
         SELECT
             <include refid="Base_Column_Join_List"/>
         FROM
@@ -126,12 +126,12 @@
 
     <!-- ``````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````` -->
 
-    <resultMap id="BaseResultElementJoin" type="org.springblade.business.vo.UStandardInfoPrivateJoinVO">
+    <resultMap id="BaseResultElementJoin" type="org.springblade.business.vo.StandardInfoPrivateJoinVO">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="parentId" column="parent_id"/>
         <result property="type" column="type"/>
-        <collection property="privateJoins" ofType="org.springblade.business.entity.UStandardInfoPrivateJoin" select="findByPrivateJoinLeftId" column="{leftId=id}">
+        <collection property="privateJoins" ofType="org.springblade.business.entity.StandardInfoPrivateJoin" select="findByPrivateJoinLeftId" column="{leftId=id}">
         </collection>
     </resultMap>
 
@@ -159,10 +159,10 @@
             b.standard_info_id
     </select>
 
-    <select id="findByPrivateJoinLeftId" resultType="org.springblade.business.entity.UStandardInfoPrivateJoin">
+    <select id="findByPrivateJoinLeftId" resultType="org.springblade.business.entity.StandardInfoPrivateJoin">
         SELECT
             <include refid="Base_Private_Column_List"/>,
-            b.node_name
+            b.node_name privateName
         FROM
             u_standard_info_private_join a
             INNER JOIN m_wbs_tree_private b ON a.private_id = b.p_key_id AND a.is_deleted = b.is_deleted
@@ -170,4 +170,20 @@
             a.standard_info_id = #{leftId}
           AND a.is_deleted = 0
     </select>
+    <select id="effectPreview" resultMap="BaseResultElementJoin">
+        SELECT
+            a.*
+        FROM
+            u_standard_info a
+                INNER JOIN u_standard_info_join b ON a.id = b.standard_info_left_id
+                AND a.is_deleted = b.is_deleted
+        WHERE
+            a.is_deleted = 0
+            AND b.standard_info_right_id in
+            <foreach item="item" collection="rightIds" separator="," open="(" close=")" index="index">
+                #{item}
+            </foreach>
+        GROUP BY
+            b.standard_info_left_id
+    </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoPrivateJoinMapper.java

@@ -1,7 +1,7 @@
 package org.springblade.business.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.springblade.business.entity.UStandardInfoPrivateJoin;
+import org.springblade.business.entity.StandardInfoPrivateJoin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-06-11 09:57:39
 * @Entity org.springblade.business.entity.UStandardInfoPrivateJoin
 */
-public interface StandardInfoPrivateJoinMapper extends BaseMapper<UStandardInfoPrivateJoin> {
+public interface StandardInfoPrivateJoinMapper extends BaseMapper<StandardInfoPrivateJoin> {
 
     /**
      * 软删除

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoPrivateJoinMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.business.mapper.StandardInfoPrivateJoinMapper">
 
-    <resultMap id="BaseResultMap" type="org.springblade.business.entity.UStandardInfoPrivateJoin">
+    <resultMap id="BaseResultMap" type="org.springblade.business.entity.StandardInfoPrivateJoin">
             <id property="id" column="id" />
             <result property="standardInfoId" column="standard_info_id" />
             <result property="privateId" column="private_id" />

blade-service/blade-business/src/main/java/org/springblade/business/service/StandardInfoJoinService.java

@@ -1,10 +1,10 @@
 package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.business.entity.UStandardInfoJoin;
+import org.springblade.business.entity.StandardInfoJoin;
 
 /**
  * @author LHB
  */
-public interface StandardInfoJoinService extends IService<UStandardInfoJoin> {
+public interface StandardInfoJoinService extends IService<StandardInfoJoin> {
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/StandardInfoPrivateJoinService.java

@@ -1,10 +1,10 @@
 package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.business.entity.UStandardInfoPrivateJoin;
+import org.springblade.business.entity.StandardInfoPrivateJoin;
 
 /**
  * @author LHB
  */
-public interface StandardInfoPrivateJoinService extends IService<UStandardInfoPrivateJoin> {
+public interface StandardInfoPrivateJoinService extends IService<StandardInfoPrivateJoin> {
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/StandardInfoService.java

@@ -3,11 +3,11 @@ package org.springblade.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.business.dto.StandardInfoJoinDTO;
 import org.springblade.business.dto.StandardInfoPrivateJoinDTO;
-import org.springblade.business.dto.UStandardInfoDTO;
-import org.springblade.business.entity.UStandardInfo;
+import org.springblade.business.dto.StandardInfoDTO;
+import org.springblade.business.entity.StandardInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.business.vo.UStandardInfoPrivateJoinVO;
-import org.springblade.business.vo.UStandardInfoVO;
+import org.springblade.business.vo.StandardInfoPrivateJoinVO;
+import org.springblade.business.vo.StandardInfoVO;
 import org.springblade.core.mp.support.Query;
 
 import java.util.List;
@@ -17,15 +17,15 @@ import java.util.List;
 * @description 针对表【u_standard_info(规范参数管理-基础信息)】的数据库操作Service
 * @createDate 2025-06-11 09:57:39
 */
-public interface StandardInfoService extends IService<UStandardInfo> {
+public interface StandardInfoService extends IService<StandardInfo> {
 
-    IPage<UStandardInfoDTO> selectMyPage(Query query, UStandardInfo uStandardInfo);
+    IPage<StandardInfoDTO> selectMyPage(Query query, StandardInfo standardInfo);
 
-    UStandardInfoDTO selectOne(Long id);
+    StandardInfoDTO selectOne(Long id);
 
-    Boolean insert(UStandardInfoDTO uStandardInfo);
+    Boolean insert(StandardInfoDTO uStandardInfo);
 
-    Boolean edit(UStandardInfoDTO uStandardInfo);
+    Boolean edit(StandardInfoDTO uStandardInfo);
 
     Boolean delete(Long id);
 
@@ -37,7 +37,9 @@ public interface StandardInfoService extends IService<UStandardInfo> {
 
     Boolean deleteElementJoin(Long leftId);
 
-    List<UStandardInfoVO> getConditionSet(Long id);
+    List<StandardInfoVO> getConditionSet(Long id);
 
-    List<UStandardInfoPrivateJoinVO> getElementJoin(Long id);
+    List<StandardInfoPrivateJoinVO> getElementJoin(Long id);
+
+    List<StandardInfoPrivateJoinVO> effectPreview(String ids);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/PrivateStandardServiceImpl.java

@@ -3,7 +3,7 @@ package org.springblade.business.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.business.entity.PrivateStandard;
-import org.springblade.business.entity.UStandardInfo;
+import org.springblade.business.entity.StandardInfo;
 import org.springblade.business.mapper.StandardInfoJoinMapper;
 import org.springblade.business.mapper.StandardInfoMapper;
 import org.springblade.business.mapper.StandardInfoPrivateJoinMapper;
@@ -12,7 +12,6 @@ import org.springblade.business.mapper.PrivateStandardMapper;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.SecureUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -64,10 +63,10 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
 
 
 
-            int update1 = standardInfoMapper.update(null, Wrappers.<UStandardInfo>lambdaUpdate()
-                    .set(UStandardInfo::getIsDeleted, 1)
-                    .set(UStandardInfo::getUpdateUser, user.getUserId())
-                    .eq(UStandardInfo::getStandardId, id));
+            int update1 = standardInfoMapper.update(null, Wrappers.<StandardInfo>lambdaUpdate()
+                    .set(StandardInfo::getIsDeleted, 1)
+                    .set(StandardInfo::getUpdateUser, user.getUserId())
+                    .eq(StandardInfo::getStandardId, id));
             //TODO 还要删除关联信息
             standardInfoJoinMapper.updateJoin(user.getUserId(),1,id);
             //TODo 还要删除与表单的关联信息

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/StandardInfoJoinServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.business.entity.UStandardInfoJoin;
+import org.springblade.business.entity.StandardInfoJoin;
 import org.springblade.business.mapper.StandardInfoJoinMapper;
 import org.springblade.business.service.StandardInfoJoinService;
 import org.springframework.stereotype.Service;
@@ -10,5 +10,5 @@ import org.springframework.stereotype.Service;
  * @author LHB
  */
 @Service
-public class StandardInfoJoinServiceImpl extends ServiceImpl<StandardInfoJoinMapper,UStandardInfoJoin> implements StandardInfoJoinService {
+public class StandardInfoJoinServiceImpl extends ServiceImpl<StandardInfoJoinMapper, StandardInfoJoin> implements StandardInfoJoinService {
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UStandardInfoPrivateJoinServiceImpl.java

@@ -1,7 +1,7 @@
 package org.springblade.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.business.entity.UStandardInfoPrivateJoin;
+import org.springblade.business.entity.StandardInfoPrivateJoin;
 import org.springblade.business.mapper.StandardInfoPrivateJoinMapper;
 import org.springblade.business.service.StandardInfoPrivateJoinService;
 import org.springframework.stereotype.Service;
@@ -10,5 +10,5 @@ import org.springframework.stereotype.Service;
  * @author LHB
  */
 @Service
-public class UStandardInfoPrivateJoinServiceImpl extends ServiceImpl<StandardInfoPrivateJoinMapper, UStandardInfoPrivateJoin> implements StandardInfoPrivateJoinService {
+public class UStandardInfoPrivateJoinServiceImpl extends ServiceImpl<StandardInfoPrivateJoinMapper, StandardInfoPrivateJoin> implements StandardInfoPrivateJoinService {
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UStandardInfoServiceImpl.java

@@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.business.dto.StandardInfoJoinDTO;
 import org.springblade.business.dto.StandardInfoPrivateJoinDTO;
-import org.springblade.business.dto.UStandardInfoDTO;
-import org.springblade.business.entity.UStandardInfo;
-import org.springblade.business.entity.UStandardInfoJoin;
-import org.springblade.business.entity.UStandardInfoPrivateJoin;
+import org.springblade.business.dto.StandardInfoDTO;
+import org.springblade.business.entity.StandardInfo;
+import org.springblade.business.entity.StandardInfoJoin;
+import org.springblade.business.entity.StandardInfoPrivateJoin;
 import org.springblade.business.mapper.StandardInfoMapper;
 import org.springblade.business.service.StandardInfoJoinService;
 import org.springblade.business.service.StandardInfoPrivateJoinService;
 import org.springblade.business.service.StandardInfoService;
-import org.springblade.business.vo.UStandardInfoPrivateJoinVO;
-import org.springblade.business.vo.UStandardInfoVO;
+import org.springblade.business.vo.StandardInfoPrivateJoinVO;
+import org.springblade.business.vo.StandardInfoVO;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
@@ -28,8 +28,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author LHB
@@ -37,7 +38,7 @@ import java.util.List;
  * @createDate 2025-06-11 09:57:39
  */
 @Service
-public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, UStandardInfo>
+public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, StandardInfo>
         implements StandardInfoService {
 
     /**
@@ -54,25 +55,25 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
 
 
     @Override
-    public IPage<UStandardInfoDTO> selectMyPage(Query query, UStandardInfo uStandardInfo) {
-        return baseMapper.selectMyPage(new Page<UStandardInfoDTO>(query.getCurrent(), query.getSize()), uStandardInfo);
+    public IPage<StandardInfoDTO> selectMyPage(Query query, StandardInfo standardInfo) {
+        return baseMapper.selectMyPage(new Page<StandardInfoDTO>(query.getCurrent(), query.getSize()), standardInfo);
     }
 
     @Override
-    public UStandardInfoDTO selectOne(Long id) {
+    public StandardInfoDTO selectOne(Long id) {
         return baseMapper.selectMyOne(id);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean insert(UStandardInfoDTO uStandardInfo) {
+    public Boolean insert(StandardInfoDTO uStandardInfo) {
         try {
             //获取当前用户
             BladeUser user = SecureUtil.getUser();
             uStandardInfo.setId(SnowFlakeUtil.getId());
             uStandardInfo.setCreateUser(user.getUserId());
 
-            List<UStandardInfo> info = uStandardInfo.getInfo();
+            List<StandardInfo> info = uStandardInfo.getInfo();
 
             //给集合设置id、父级id、创建人
             info.forEach(item -> {
@@ -83,7 +84,7 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
             });
 
             //把父级对象转出来单独保存
-            UStandardInfo parent = BeanUtil.copyProperties(uStandardInfo, UStandardInfo.class);
+            StandardInfo parent = BeanUtil.copyProperties(uStandardInfo, StandardInfo.class);
             baseMapper.insert(parent);
             //通过mybatis-plus 批量新增
             this.saveBatch(info);
@@ -97,13 +98,13 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean edit(UStandardInfoDTO uStandardInfo) {
+    public Boolean edit(StandardInfoDTO uStandardInfo) {
         try {
             //获取当前用户
             BladeUser user = SecureUtil.getUser();
             uStandardInfo.setUpdateUser(user.getUserId());
 
-            List<UStandardInfo> info = uStandardInfo.getInfo();
+            List<StandardInfo> info = uStandardInfo.getInfo();
             info.forEach(item -> {
                 if (item.getId() == null) {
                     //新增的子集合设置id、父级id、创建人
@@ -117,7 +118,7 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
                 }
             });
             //更新父级对象
-            UStandardInfo parent = BeanUtil.copyProperties(uStandardInfo, UStandardInfo.class);
+            StandardInfo parent = BeanUtil.copyProperties(uStandardInfo, StandardInfo.class);
             baseMapper.updateById(parent);
             //批量更新
             this.saveOrUpdateBatch(info);
@@ -133,25 +134,25 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
     public Boolean delete(Long id) {
         try {
             //查询关联表 如果有关联关系不允许删除
-            long joinCount = standardInfoJoinService.count(Wrappers.<UStandardInfoJoin>lambdaQuery()
-                    .eq(UStandardInfoJoin::getStandardInfoRightId, id)
+            long joinCount = standardInfoJoinService.count(Wrappers.<StandardInfoJoin>lambdaQuery()
+                    .eq(StandardInfoJoin::getStandardInfoRightId, id)
                     .or()
-                    .eq(UStandardInfoJoin::getStandardInfoLeftId, id));
+                    .eq(StandardInfoJoin::getStandardInfoLeftId, id));
             if (joinCount > 0) {
                 throw new ServiceException("当前数据正在【条件设置】中使用，无法删除");
             }
             //查询与表单的关联表
-            long privateJoinCount = standardInfoPrivateJoinService.count(Wrappers.<UStandardInfoPrivateJoin>lambdaQuery()
-                    .eq(UStandardInfoPrivateJoin::getStandardInfoId, id));
+            long privateJoinCount = standardInfoPrivateJoinService.count(Wrappers.<StandardInfoPrivateJoin>lambdaQuery()
+                    .eq(StandardInfoPrivateJoin::getStandardInfoId, id));
             if (privateJoinCount > 0) {
                 throw new ServiceException("当前数据正在【关联元素】中使用，无法删除");
             }
 
-            int update = baseMapper.update(null, Wrappers.<UStandardInfo>lambdaUpdate()
-                    .set(UStandardInfo::getIsDeleted, 1)
-                    .eq(UStandardInfo::getId, id)
+            int update = baseMapper.update(null, Wrappers.<StandardInfo>lambdaUpdate()
+                    .set(StandardInfo::getIsDeleted, 1)
+                    .eq(StandardInfo::getId, id)
                     .or()
-                    .eq(UStandardInfo::getParentId, id));
+                    .eq(StandardInfo::getParentId, id));
             return update > 0;
         } catch (ServiceException e) {
             e.printStackTrace();
@@ -163,13 +164,13 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
     @Transactional(rollbackFor = Exception.class)
     public Boolean setCondition(List<StandardInfoJoinDTO> standardInfoJoins) {
         BladeUser user = SecureUtil.getUser();
-        List<UStandardInfoJoin> saveData = new ArrayList<>();
+        List<StandardInfoJoin> saveData = new ArrayList<>();
         try {
             for (StandardInfoJoinDTO standardInfoJoin : standardInfoJoins) {
                 Long leftId = standardInfoJoin.getLeftId();
                 List<Long> rightIds = standardInfoJoin.getRightIds();
                 for (Long rightId : rightIds) {
-                    UStandardInfoJoin uStandardInfoJoin = new UStandardInfoJoin();
+                    StandardInfoJoin uStandardInfoJoin = new StandardInfoJoin();
                     uStandardInfoJoin.setId(SnowFlakeUtil.getId());
                     uStandardInfoJoin.setStandardInfoLeftId(leftId);
                     uStandardInfoJoin.setStandardInfoRightId(rightId);
@@ -188,16 +189,16 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
     @Transactional(rollbackFor = Exception.class)
     public Boolean setElementJoin(List<StandardInfoPrivateJoinDTO> standardInfoPrivateJoins) {
         BladeUser user = SecureUtil.getUser();
-        List<UStandardInfoPrivateJoin> saveData = new ArrayList<>();
+        List<StandardInfoPrivateJoin> saveData = new ArrayList<>();
 
         try {
             for (StandardInfoPrivateJoinDTO standardInfoPrivateJoin : standardInfoPrivateJoins) {
                 Long leftId = standardInfoPrivateJoin.getLeftId();
-                List<UStandardInfoPrivateJoin> rightIds = standardInfoPrivateJoin.getRightIds();
+                List<StandardInfoPrivateJoin> rightIds = standardInfoPrivateJoin.getRightIds();
                 rightIds.forEach(f -> {
                     f.setId(SnowFlakeUtil.getId());
                     f.setStandardInfoId(leftId);
-                    f.setUpdateUser(user.getUserId());
+                    f.setCreateUser(user.getUserId());
                 });
                 saveData.addAll(rightIds);
             }
@@ -213,10 +214,10 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
     public Boolean deleteConditionSet(Long leftId) {
         BladeUser user = SecureUtil.getUser();
         try {
-            return standardInfoJoinService.update(Wrappers.<UStandardInfoJoin>lambdaUpdate()
-                    .set(UStandardInfoJoin::getIsDeleted, 1)
-                    .set(UStandardInfoJoin::getUpdateUser, user.getUserId())
-                    .eq(UStandardInfoJoin::getStandardInfoLeftId, leftId));
+            return standardInfoJoinService.update(Wrappers.<StandardInfoJoin>lambdaUpdate()
+                    .set(StandardInfoJoin::getIsDeleted, 1)
+                    .set(StandardInfoJoin::getUpdateUser, user.getUserId())
+                    .eq(StandardInfoJoin::getStandardInfoLeftId, leftId));
         } catch (Exception e) {
             e.printStackTrace();
             throw new ServiceException("删除失败");
@@ -228,10 +229,10 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
     public Boolean deleteElementJoin(Long leftId) {
         BladeUser user = SecureUtil.getUser();
         try {
-            return standardInfoPrivateJoinService.update(Wrappers.<UStandardInfoPrivateJoin>lambdaUpdate()
-                    .set(UStandardInfoPrivateJoin::getIsDeleted, 1)
-                    .set(UStandardInfoPrivateJoin::getUpdateUser, user.getUserId())
-                    .eq(UStandardInfoPrivateJoin::getStandardInfoId, leftId));
+            return standardInfoPrivateJoinService.update(Wrappers.<StandardInfoPrivateJoin>lambdaUpdate()
+                    .set(StandardInfoPrivateJoin::getIsDeleted, 1)
+                    .set(StandardInfoPrivateJoin::getUpdateUser, user.getUserId())
+                    .eq(StandardInfoPrivateJoin::getStandardInfoId, leftId));
         } catch (Exception e) {
             e.printStackTrace();
             throw new ServiceException("删除失败");
@@ -239,15 +240,21 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, US
     }
 
     @Override
-    public List<UStandardInfoVO> getConditionSet(Long id) {
+    public List<StandardInfoVO> getConditionSet(Long id) {
         return baseMapper.getConditionSet(id);
     }
 
     @Override
-    public List<UStandardInfoPrivateJoinVO> getElementJoin(Long id) {
+    public List<StandardInfoPrivateJoinVO> getElementJoin(Long id) {
         return baseMapper.getElementJoin(id);
 
     }
+
+    @Override
+    public List<StandardInfoPrivateJoinVO> effectPreview(String ids) {
+        List<Long> collect = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
+        return baseMapper.effectPreview(collect);
+    }
 }