cr 1 сар өмнө
parent
commit
4cb6df8d4f

+ 6 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/TrialSystemDockingDTO.java

@@ -31,6 +31,12 @@ import javax.validation.constraints.NotNull;
 @Data
 public class TrialSystemDockingDTO {
 	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 德飞数据ID
+	 */
+	private Long dataId;
+
 	/**
 	 * 项目Id
 	 */

+ 5 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSystemDocking.java

@@ -38,6 +38,11 @@ public class TrialSystemDocking extends BaseEntity {
 	* 主键
 	*/
 	private Long id;
+	/**
+	 * 德飞ID
+	 */
+	private Long dataId;
+
 	/**
 	 * 项目Id
 	 */

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

@@ -119,7 +119,7 @@ public class TrialSystemDockingController extends BladeController {
 			//异步下载文件并且上传Oss
 			trialSystemDockingService.syncUpdateFile(list1);
 		}
-		Map<Long, String> map = list1.stream().collect(Collectors.toMap(TrialSystemDocking::getId, TrialSystemDocking::getReportName));
+		Map<Long, Long> map = list1.stream().collect(Collectors.toMap(TrialSystemDocking::getDataId, TrialSystemDocking::getId));
 		return R.data(map);
 	}