认证-bug 54807,54777

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -276,9 +277,10 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 	 @ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
 	 @PostMapping(value = "/copy")
 //	 @RequiresPermissions("params:manifest:copy")
-	 public Result<?> copy(ParamsManifestEO paramsManifestEO,
+	 public Result<?> copy(@RequestBody ParamsManifestVO paramsManifestVO) {
-						   @RequestParam(name="sourceManifestId",required=true) String sourceManifestId) {
+		 ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
-		 ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, sourceManifestId);
+		 BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO);
+		 ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, paramsManifestVO.getSourceManifestId());
 		 return Result.OK(manifestEO);
 	 }
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigDataEO.java

@@ -3,9 +3,8 @@ package com.jero.modules.cert.collect.entity;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
+
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -64,16 +63,19 @@ public class ParamsConfigDataEO implements Serializable {
 	/**文本类型数据*/
 	@Excel(name = "文本类型数据", width = 15)
     @ApiModelProperty(value = "文本类型数据")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String textData;
 
 	/**下拉类型数据*/
 	@Excel(name = "下拉类型数据", width = 15)
     @ApiModelProperty(value = "下拉类型数据")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String pullData;
 
 	/**附件类型数据*/
 	@Excel(name = "附件类型数据", width = 15)
     @ApiModelProperty(value = "附件类型数据")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String fileConnectId;
 
 	/**参数配置id*/

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java

@@ -101,4 +101,8 @@ public class ParamsManifestEO implements Serializable {
 
     @TableField(exist = false)
     private Boolean configFlag; // true-可添加配置；false-不可添加配置
+
+    @TableField(exist = false)
+    private String cut;
+
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1232,7 +1232,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		String targetConfigIds = paramsCollectManifestVO.getTargetConfigIds();
 
 		if (targetConfigIds.contains(sourceConfigId)) {
-			throw new JeroBootException("引用到的配置不能包含被引用配置！");
+			if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
+				throw new JeroBootException("References to the configuration does not contain the referenced configuration!");
+			} else {
+				throw new JeroBootException("引用到的配置不能包含被引用配置！");
+			}
 		}
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 		String[] targetConfigIdStr = targetConfigIds.split(",");
@@ -1262,7 +1266,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					}
 				}
 			} else {
-				return false;
+				// 清空引用到的配置的数据
+				for (int j = 0; j < targetConfigIdStr.length; j++) {
+					ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
+					if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
+						ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
+						updateConfigDataEO.setId(targetConfigDataEO.getId());
+						updateConfigDataEO.setTextData(null);
+						updateConfigDataEO.setPullData(null);
+						updateConfigDataEO.setFileConnectId(null);
+						updateConfigDataEOList.add(updateConfigDataEO);
+					}
+				}
 			}
 		}
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -95,7 +95,11 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 		queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
 		List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
 		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
-			throw new JeroBootException("标题已存在！");
+			if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) {
+				throw new JeroBootException("Title already exists!");
+			} else {
+				throw new JeroBootException("标题已存在！");
+			}
 		}
 
 		String paramsManifestId = UUID.randomUUID().toString().replace("-","");
@@ -153,7 +157,11 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 			queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId());
 			List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
 			if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
-				throw new JeroBootException("标题已存在！");
+				if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) {
+					throw new JeroBootException("Title already exists!");
+				} else {
+					throw new JeroBootException("标题已存在！");
+				}
 			}
 		}
 
@@ -453,6 +461,18 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 		String paramsTemplateId = paramsManifestEO.getParamsTemplateId();
 		int paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion();
 
+		LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
+		queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId());
+		List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			if (CutEnum.EN.getValue().equals(paramsManifestEO.getCut())) {
+				throw new JeroBootException("Title already exists!");
+			} else {
+				throw new JeroBootException("标题已存在！");
+			}
+		}
+
 		// 查询所有模板参数项
 		List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(paramsTemplateId, paramsTemplatePublishVersion);
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java

@@ -69,4 +69,6 @@ public class ParamsCollectManifestVO {
     private String sourceConfigId; // 引用参数专用
     @ApiModelProperty(value = "引用参数专用-到")
     private String targetConfigIds; // 引用参数专用
+
+    private String cut; // 引用参数专用
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java

@@ -21,4 +21,5 @@ public class ParamsManifestVO {
 
     private String ids;
     private String cut;
+    private String sourceManifestId;
 }