From 4992d0ea3fb6adaba4331fda37c43e8f0d00a458 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期三, 07 四月 2021 10:19:45 +0800
Subject: [PATCH] 更新试验计划接口；添加计划实时设备状态websocket
---
src/main/java/com/whyc/service/TestPlanService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/TestPlanService.java b/src/main/java/com/whyc/service/TestPlanService.java
index 1691d11..08c459a 100644
--- a/src/main/java/com/whyc/service/TestPlanService.java
+++ b/src/main/java/com/whyc/service/TestPlanService.java
@@ -11,12 +11,14 @@
import com.whyc.mapper.TestPlanMapper;
import com.whyc.pojo.DeviceManage;
import com.whyc.pojo.TestPlan;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
+import java.util.Random;
@Service
@Slf4j
@@ -68,10 +70,24 @@
}
public Response stopPlan(Integer num){
TestPlan testPlan = mapper.selectById(num);
- testPlan.setState(2);
+ //鑾峰彇璁″垝閲嶅娆℃暟
+ int planCount = testPlan.getPlanCount();
+ int testCount = testPlan.getTestCount();
+ if (planCount!=0 && testCount==planCount){
+ testPlan.setState(3);//宸茬粨鏉�
+ int k = (int)Math.random()*2;
+ if (k==1){
+ testPlan.setConclusion("閫氳繃");
+ }else{
+ testPlan.setConclusion("涓嶉�氳繃");
+ }
+ }else {
+ testPlan.setState(2);//宸插仠姝�
+ }
mapper.updateById(testPlan);
return new Response().setMsg(1,"鍋滄鎴愬姛");
}
+
public Response verifiedPlan(Integer num,String verifier){
TestPlan testPlan = mapper.selectById(num);
testPlan.setState(6);
--
Gitblit v1.9.1