From 03ec5826348fe924243eb797559aef91afa98086 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 24 六月 2024 17:29:23 +0800
Subject: [PATCH] 记录组装各步骤

---
 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java |   73 ++++++++++++++++++++++++++++++++----
 1 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index c243064..faf9b6c 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -2,8 +2,12 @@
 
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
+import com.dy.pmsGlobal.pojoPlt.PltStation;
 import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
 import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,18 +27,34 @@
         this.sv = workOrderSv;
     }
     /**
+     * 鏌ヨ鐢ㄦ埛淇℃伅
+     * @param
+     * @return
+     */
+    @GetMapping(path="getUserInfo")
+    public BaseResponse<BaUser> getUserInfo(String userId) throws Exception {
+        BaUser userInfo  = sv.getUserInfo(userId);
+        return BaseResponseUtils.buildSuccess(userInfo);
+    }
+    /**
+     * 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢�
+     * @param
+     * @return
+     */
+    @GetMapping(path="getStationInfo")
+    public BaseResponse<PltStation> getStationInfo(String stationId){
+        PltStation stationInfo  = sv.getStationInfo(stationId);
+        return BaseResponseUtils.buildSuccess(stationInfo);
+    }
+    /**
      * 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢�
      * @param
      * @return
      */
     @GetMapping(path="checkStationUsed")
-    public BaseResponse<Boolean> isStationUsed(QueryVo last){
-        String message = sv.checkStationUsed(last);
-        if ("FALSE".equals(message.split("\\^")[0])) {
-            return BaseResponseUtils.buildFail(message.split("\\^")[1]);
-        } else {
-            return BaseResponseUtils.buildSuccess(true);
-        }
+    public BaseResponse<StaAssemblyWorkLast> checkStationUsed(QueryVo last){
+        StaAssemblyWorkLast stationInfo  = sv.checkStationUsed(last);
+        return BaseResponseUtils.buildSuccess(stationInfo);
     }
     /**
      * 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
@@ -42,11 +62,48 @@
      * @return
      */
     @GetMapping(path="planList")
-    public BaseResponse<List<PrAssemblyPlan>> selectOnLineList(){
+    public BaseResponse<List<PrAssemblyPlan>> selectAssyPlanList(){
+        PrAssemblyPlan params = new PrAssemblyPlan();
+        params.setStatus(1);
+        List<PrAssemblyPlan> list = sv.selectAssyPlanList(params);
+        return BaseResponseUtils.buildSuccess(list);
+    }
+    /**
+     * 鏍规嵁缁勮浠诲姟鏌ヨ鑺傜偣淇℃伅
+     * @param
+     * @return
+     */
+   /* @GetMapping(path="nodeList")
+    public BaseResponse<List<PrAssemblyPlan>> selectOnLineList(String processId){
         PrAssemblyPlan params = new PrAssemblyPlan();
         params.setStatus(1);
         List<PrAssemblyPlan> list = sv.selectList(params);
         return BaseResponseUtils.buildSuccess(list);
+    }*/
+    /**
+     * 淇濆瓨鐧诲綍淇℃伅
+     * @param
+     * @return
+     */
+    @PostMapping(path="save")
+    public BaseResponse<StaAssemblyWorkLast> save(@RequestBody @Valid QueryVo last){
+        StaAssemblyWorkLast result = sv.save(last);
+        return BaseResponseUtils.buildSuccess(result);
+    }
+
+    /**
+     * 淇濆瓨鐧诲嚭淇℃伅
+     * @param
+     * @return
+     */
+    @PostMapping(path="logout")
+    public BaseResponse<Boolean> logout(String id){
+        int count = sv.logout(id);
+        if (count <= 0) {
+            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+        } else {
+            return BaseResponseUtils.buildSuccess(true);
+        }
     }
 
     @GetMapping(path = "test")

--
Gitblit v1.8.0