From f26131172d91045a502cb5f42c9da4dac6ffaf65 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 21 六月 2024 16:26:01 +0800
Subject: [PATCH] check user and station
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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..867d237 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,6 +2,8 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.pojoBa.BaUser;
+import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
@@ -23,18 +25,24 @@
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="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);
- }
+ @GetMapping(path="getStationInfo")
+ public BaseResponse<PltStation> getStationInfo(String stationId){
+ PltStation stationInfo = sv.getStationInfo(stationId);
+ return BaseResponseUtils.buildSuccess(stationInfo);
}
/**
* 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
@@ -42,13 +50,24 @@
* @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);
- }
-
+ }*/
@GetMapping(path = "test")
public BaseResponse test() {
log.info("test");
--
Gitblit v1.8.0