From 5d813bb3a09810648e607a46d44f350686e3dc28 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 09:45:33 +0800
Subject: [PATCH] device report finish

---
 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
index 48793d7..a8a4cb7 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
@@ -7,12 +7,15 @@
 import com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems;
 import com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems;
 import com.dy.pmsGlobal.pojoPr.PrProductionNode;
+import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
+import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *璁板綍缁勮鍚勬楠�
@@ -29,7 +32,7 @@
 
     @PostMapping(path = "save")
     public BaseResponse save(@RequestBody @Valid QueryVo vo) {
-        log.info("AssemblyStepCtrl.save()");
+        log.info("AssemblyStepCtrl.save():"+vo);
         int count = sv.save(vo);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -40,7 +43,7 @@
 
     @PostMapping(path = "repair")
     public BaseResponse repair(@RequestBody @Valid QueryVo vo) {
-        log.info("AssemblyStepCtrl.repair()");
+        log.info("AssemblyStepCtrl.repair():"+vo);
         int count = sv.repair(vo);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -55,6 +58,7 @@
      */
     @GetMapping(path="getSopByNodeId")
     public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId){
+        log.info("AssemblyStepCtrl.getSopByNodeId():"+nodeId);
         PrProductionNode result = sv.getSopByNodeId(nodeId);
         return BaseResponseUtils.buildSuccess(result);
     }
@@ -65,6 +69,7 @@
      */
     @GetMapping(path="getParamsByProId")
     public BaseResponse<List<PltProductParams>> getParamsByProId(String proId){
+        log.info("AssemblyStepCtrl.getParamsByProId():"+proId);
         List<PltProductParams> result = sv.getParamsByProId(proId);
         return BaseResponseUtils.buildSuccess(result);
     }
@@ -75,18 +80,19 @@
      */
     @GetMapping(path="getFileByProId")
     public BaseResponse<List<PltProductFile>> getFileByProId(String proId){
+        log.info("AssemblyStepCtrl.getFileByProId():"+proId);
         List<PltProductFile> result = sv.getFileByProId(proId);
         return BaseResponseUtils.buildSuccess(result);
     }
     @GetMapping(path = "getQualityItems")
     public BaseResponse<List<PltProductQualityInspectionItems>> getQualityItems(String proId) {
-        log.info("AssemblyStepCtrl.getQualityItems()");
+        log.info("AssemblyStepCtrl.getQualityItems():"+proId);
         List<PltProductQualityInspectionItems> result = sv.getQualityItems(proId);
         return BaseResponseUtils.buildSuccess(result);
     }
     @GetMapping(path = "getTestItems")
     public BaseResponse<List<PltProductTestInspectionItems>> getTestItems(String proId) {
-        log.info("AssemblyStepCtrl.getTestItems()");
+        log.info("AssemblyStepCtrl.getTestItems():"+proId);
         List<PltProductTestInspectionItems> result = sv.getTestItems(proId);
         return BaseResponseUtils.buildSuccess(result);
     }
@@ -98,7 +104,7 @@
      */
     @PostMapping(path = "testing")
     public BaseResponse testing(@RequestBody @Valid QueryVo vo) {
-        log.info("AssemblyStepCtrl.testing()");
+        log.info("AssemblyStepCtrl.testing():"+vo);
         int count = sv.testing(vo);
         if (count <= 0) {
             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -106,4 +112,25 @@
             return BaseResponseUtils.buildSuccess(true);
         }
     }
+
+    @GetMapping(path = "queryByDeviceNo")
+    public BaseResponse<Map<String,String>> queryByDeviceNo(String deviceNo) {
+        log.info("AssemblyStepCtrl.queryByDeviceNo():"+deviceNo);
+        Map<String,String> result = sv.queryByDeviceNo(deviceNo);
+        return BaseResponseUtils.buildSuccess(result);
+    }
+
+    @GetMapping(path = "queryLifeByDeviceNo")
+    public BaseResponse<?> queryLifeByDeviceNo(String deviceNo) {
+        log.info("AssemblyStepCtrl.queryLifeByDeviceNo():"+deviceNo);
+        List<StaDeviceLife> result = sv.queryLifeByDeviceNo(deviceNo);
+        return BaseResponseUtils.buildSuccess(result);
+    }
+
+    @GetMapping(path = "queryLogByDeviceNo")
+    public BaseResponse<?> queryLogByDeviceNo(String deviceNo) {
+        log.info("AssemblyStepCtrl.queryLogByDeviceNo():"+deviceNo);
+        List<StaDeviceProductionLog> result = sv.queryLogByDeviceNo(deviceNo);
+        return BaseResponseUtils.buildSuccess(result);
+    }
 }

--
Gitblit v1.8.0