From 9f83bdaebfd57892bc48857c286780a01efeb581 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期三, 07 四月 2021 11:18:24 +0800
Subject: [PATCH] 更新试验计划接口
---
src/main/java/com/whyc/controller/TestPlanController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/TestPlanController.java b/src/main/java/com/whyc/controller/TestPlanController.java
index 4fdd69e..6ee0129 100644
--- a/src/main/java/com/whyc/controller/TestPlanController.java
+++ b/src/main/java/com/whyc/controller/TestPlanController.java
@@ -1,15 +1,19 @@
package com.whyc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.pojo.DeviceInf;
import com.whyc.pojo.TestPlan;
+import com.whyc.service.DeviceInfService;
import com.whyc.service.TestPlanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
@RestController
@RequestMapping("testPlan")
@@ -18,6 +22,9 @@
public class TestPlanController {
@Autowired
private TestPlanService service;
+ @Autowired
+ private DeviceInfService deviceInfService;
+
@GetMapping("all")
@ApiOperation(value = "鏌ヨ鎵�鏈�-鍒嗛〉")
@@ -42,6 +49,20 @@
return service.getOne(num);
}
+ @GetMapping("getDeviceInf")
+ @ApiOperation(value = "璁惧淇℃伅")
+ public Response getDeviceInf(@RequestParam Integer num){
+ TestPlan testPlan = service.getOneById(num);
+ String devices = testPlan.getDevices();
+ String[] ids = devices.split(",");
+ List<DeviceInf> list = new ArrayList<>();
+ for (String deviceId:ids) {
+ DeviceInf deviceInf = deviceInfService.getOneByDeviceId(Integer.valueOf(deviceId));
+ list.add(deviceInf);
+ }
+ return new Response().set(1,list);
+ }
+
@PostMapping
@ApiOperation(value = "鏂板")
--
Gitblit v1.9.1