德飞试验对接

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

@@ -30,6 +30,8 @@ import lombok.EqualsAndHashCode;
 public class TrialClassificationTreeDTO {
 	private static final long serialVersionUID = 1L;
 
+	private Long dfId;
+
 	private Long projectId;
 	/**
 	 * 父级ID

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

@@ -39,6 +39,8 @@ public class TrialClassificationTree extends BaseEntity {
 	*/
 	private Long id;
 
+	private Long dfId;
+
 	private Long projectId;
 	/**
 	* 父级ID
@@ -53,6 +55,11 @@ public class TrialClassificationTree extends BaseEntity {
 	*/
 		private String classificationName;
 
+		/**
+		 * 分组类型 1是德飞厂商
+		 */
+		private Integer groupType;
+
 	/**
 	 * 是否删除
  	 */

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

@@ -41,6 +41,7 @@ import org.springblade.business.vo.TrialClassificationTreeVO;
 import org.springblade.business.service.ITrialClassificationTreeService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -99,25 +100,32 @@ public class TrialClassificationTreeController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入trialClassificationTree")
-	public R save(@Valid @RequestBody TrialClassificationTreeDTO trialClassificationTreeDto) {
-		TrialClassificationTree trialClassificationTree = new TrialClassificationTree();
-		BeanUtil.copy(trialClassificationTreeDto, trialClassificationTree);
-		trialClassificationTree.setId(SnowFlakeUtil.getId());
-		Long parentId = trialClassificationTree.getParentId();
-		StringBuilder classificationAncestors = new StringBuilder();
-		classificationAncestors.append(trialClassificationTree.getId());
-		if(parentId!=0){
-			classificationAncestors.append( ",").append(parentId);
+	public R save(@Valid @RequestBody List<TrialClassificationTreeDTO> list,Integer groupType) {
+		if(groupType!=null&&groupType==1){
+			trialClassificationTreeService.update(new UpdateWrapper<TrialClassificationTree>().set("is_deleted", 1).eq("group_type",1));
 		}
-		while (parentId!=null&&parentId!=0){
-			parentId = selectAncestors(parentId);
-			if(parentId!=null&&parentId!=0){
-				classificationAncestors.append(parentId).append(",");
+		List<TrialClassificationTree>insertList=new ArrayList<>();
+		for (TrialClassificationTreeDTO trialClassificationTreeDTO : list) {
+			TrialClassificationTree trialClassificationTree = new TrialClassificationTree();
+			BeanUtil.copy(trialClassificationTreeDTO, trialClassificationTree);
+			trialClassificationTree.setId(SnowFlakeUtil.getId());
+			Long parentId = trialClassificationTree.getParentId();
+			StringBuilder classificationAncestors = new StringBuilder();
+			classificationAncestors.append(trialClassificationTree.getId());
+			if(parentId!=0){
+				classificationAncestors.append( ",").append(parentId);
+			}
+			while (parentId!=null&&parentId!=0){
+				parentId = selectAncestors(parentId);
+				if(parentId!=null&&parentId!=0){
+					classificationAncestors.append(parentId).append(",");
+				}
 			}
+			trialClassificationTree.setClassificationAncestors(classificationAncestors.toString());
+			trialClassificationTree.setGroupType(groupType);
+			insertList.add(trialClassificationTree);
 		}
-		trialClassificationTree.setClassificationAncestors(classificationAncestors.toString());
-		trialClassificationTreeService.save(trialClassificationTree);
-		return R.data(trialClassificationTree.getId());
+		return R.status(trialClassificationTreeService.saveOrUpdateBatch(insertList));
 	}
 
 	public Long selectAncestors(Long parentId) {
@@ -133,18 +141,16 @@ public class TrialClassificationTreeController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入trialClassificationTree")
-	public R update(Long id,String classificationName) {
-		if(id==null){
+	public R update(Long dfId,String classificationName) {
+		if(dfId==null){
 			return R.fail("请选择要修改的分类");
 		}
 		if(Func.isEmpty(classificationName)){
 			return R.fail("请输入分类名称");
 		}
 		TrialClassificationTree trialClassificationTree = new TrialClassificationTree();
-		trialClassificationTree.setId(id);
 		trialClassificationTree.setClassificationName(classificationName);
-		boolean b = trialClassificationTreeService.updateById(trialClassificationTree);
-		return R.status(b);
+		return R.status(trialClassificationTreeService.update(new UpdateWrapper<TrialClassificationTree>().set("classification_name", classificationName).eq("df_id", dfId)));
 	}
 
 //	/**

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

@@ -43,6 +43,9 @@ import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 德飞试验系统对接表 控制器
@@ -116,7 +119,8 @@ public class TrialSystemDockingController extends BladeController {
 			//异步下载文件并且上传Oss
 			trialSystemDockingService.syncUpdateFile(list1);
 		}
-		return R.status(b);
+		Map<Long, String> map = list1.stream().collect(Collectors.toMap(TrialSystemDocking::getId, TrialSystemDocking::getReportName));
+		return R.data(map);
 	}
 
 	/**
@@ -151,11 +155,11 @@ public class TrialSystemDockingController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		if (Func.isEmpty(ids)) {
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String dfId) {
+		if (Func.isEmpty(dfId)) {
 			return R.fail("参数错误");
 		}
-		trialSystemDockingService.updatedelete(Func.toLongList(ids));
+		trialSystemDockingService.updatedelete(Func.toLongList(dfId));
 		return R.status(true);
 	}
 

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

@@ -100,7 +100,7 @@ public class TrialSystemDockingServiceImpl extends BaseServiceImpl<TrialSystemDo
 		if (longList != null && !longList.isEmpty()) {
 			this.update(new UpdateWrapper<TrialSystemDocking>()
 					.set("is_deleted", 1)
-					.in("id", longList));
+					.in("de_id", longList));
 		}
 	}