From ddb050ac15149864f55299f8804d1cd92b093b23 Mon Sep 17 00:00:00 2001 From: sige Date: Fri, 14 Jun 2024 19:07:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.db | Bin 270336 -> 270336 bytes pom.xml | 2 +- .../iflytop/a800/controller/DeviceController.java | 6 +-- .../iflytop/a800/controller/TestController.java | 41 ++++++++++++++++++--- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/app.db b/app.db index 1956d7ba89ef85359685e6766278ffe3579cb931..b562b491bf7b8342ceea9b2ec454561edc97454e 100644 GIT binary patch delta 2183 zcma);&x;&I6vw-#XLjdDrfUbYn26#gATDB&s_OcAG46QCLCrxJ1Vdn}x~qb@dWwRb z9LzZ@7_aId;0`Py2qHNMfhb~bdlAKhSHXiP55Dfr#$M=M`|##RQ&pe$>-(y2K3Kc? zVC~Lx>H6a+isoPjY_zi}d+U#HZGW;I-`nne@$25k@;6j}>?~jZ^ymJ)e)136n=Su5 zd`RKpN{k*x=;7XM<6HEqR`FnQZn|DLNiCxp&M7Z2*DA-_Fom7YsboqLqUHU+E+(fp z`uh>uhs{5s&6ktKsLRIMgPrA>b3<@?3oHZEU<8bTy#{sxY!2t{Bk(azkd4p}=q|Eg zclTy%le8Cq1mE+x%#y)k_Cl0rg{MS1EEPD)87J6TlVhoaRfV&b*o@FOwk}+v9yUp7F%yNN!snjJys-(A1EhjyiiARA!!wB)cZ_1kb%q^v%37P7 z;N5?_#t=z@ZbxVr-A4O}BMxD`gyJ7}zP$YT?!|aecJMseOcrq$Z+mqWj(FJa;B@+Z zG#dXBp^xv6m&xBRKB>wK(tTz;c@&|~&@1V8={wUurXNnzQ(v8ulSh#7uP5d8@no@h zW*VP;c6N4J6x=)I2$rtOV8JOiL>o*^&_Wm$s5D)g;)efV^!C=}#nxL_&eQW(-<==) zxjt&JNT#WDr3*NO++c2uz*=yJ1^kpYvx;ci5jJdt4I8k+7RnpPFb&ZC9NG&TpJ!N> zR#M>#FBs1|!dBa0s|}d&hLH^P#+`9h78y3iOOT(=d0<+xOdqn!lSBz=Txo-?G+>}z zkaaGx$+^JXvkW@facm1}AWmVRdkcv$SBrW5)~wn5j7ei!39G z@&FQg8d(dh$?6}l%A*a^Z@_eQVBrf)6oY02DPrS-#W^vML>;6kPKvAvOWFcUDpvWV z^R*FD86>bi`TakcPZCY(GHM)iru>A4~2VYRUABF5F4-9bnz t)xs_!7*q?Z1}^`vgZuT$4&7H@8qL-@u5;>3 delta 50335 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 diff --git a/pom.xml b/pom.xml index bac5b3b..a12c09f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.iflytop uf - 0.0.38 + 0.0.40 diff --git a/src/main/java/com/iflytop/a800/controller/DeviceController.java b/src/main/java/com/iflytop/a800/controller/DeviceController.java index 9858a32..3970e8b 100644 --- a/src/main/java/com/iflytop/a800/controller/DeviceController.java +++ b/src/main/java/com/iflytop/a800/controller/DeviceController.java @@ -22,9 +22,9 @@ public class DeviceController extends UfApiControllerBase { @PostMapping("/api/device/temperature-get") @ResponseBody public UfApiResponse temperatureGet() { - String testCardWarehouseTempText = UfActuatorCmdExecutor.execute("TestCardWarehouse", "read_temperature"); - int testCardWarehouseTempInt = Integer.parseInt(testCardWarehouseTempText); - Double testCardWarehouseTemp = (double) testCardWarehouseTempInt / 100.0; +// String testCardWarehouseTempText = UfActuatorCmdExecutor.execute("TestCardWarehouse", "read_temperature"); +// int testCardWarehouseTempInt = Integer.parseInt(testCardWarehouseTempText); + Double testCardWarehouseTemp = 0.0; //(double) testCardWarehouseTempInt / 100.0; return this.success(Map.of( "testCardBoxCase", testCardWarehouseTemp )); diff --git a/src/main/java/com/iflytop/a800/controller/TestController.java b/src/main/java/com/iflytop/a800/controller/TestController.java index 1687c29..fe5ea86 100644 --- a/src/main/java/com/iflytop/a800/controller/TestController.java +++ b/src/main/java/com/iflytop/a800/controller/TestController.java @@ -1,9 +1,6 @@ package com.iflytop.a800.controller; import com.iflytop.a800.TaskManager; -import com.iflytop.a800.model.MdbEmergencyTestTask; -import com.iflytop.a800.model.MdbProject; -import com.iflytop.a800.model.MdbTubeRackTestTask; -import com.iflytop.a800.model.MdbTubeRackTestTaskTube; +import com.iflytop.a800.model.*; import com.iflytop.a800.resource.TestTube; import com.iflytop.a800.task.TubeRackTask; import com.iflytop.a800.task.TubeTestTask; @@ -16,9 +13,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; - import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @Controller @@ -149,4 +144,38 @@ public class TestController extends UfApiControllerBase { task.save(); return this.success(); } + + @PostMapping("/api/test/test-tube-rack-status-get") + @ResponseBody + public UfApiResponse tubeRackStatusGet() { + var statusProcessing = UfMdbDictItem.getValue("TUBE_RACK_TASK_STATUS", "PROCESSING"); + var rack = UfActiveRecord.findOne(MdbTubeRackTestTask.class, Map.of("status", statusProcessing)); + if ( null == rack ) { + return this.success(null); + } + + var tubeList = new ArrayList>(); + var tubes = rack.getTubes(); + for ( var tube : tubes ) { + var tubeItem = tube.toMap(); + tubeItem.put("projects", tube.getProjects()); + tubeList.add(tubeItem); + } + + var result = rack.toMap(); + result.put("tubes", tubeList); + return this.success(result); + } + + @PostMapping("/api/test/active-batch-list") + @ResponseBody + public UfApiResponse activeBatchList() { + var tests = UfActiveRecord.find(MdbTest.class); + var list = new ArrayList>(); + for ( var test : tests ) { + var item = test.toMap(); + list.add(item); + } + return this.success(list); + } }