From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/BasLiftController.java | 138 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLiftController.java b/src/main/java/com/zy/asrs/controller/BasLiftController.java
index 6153fa2..e7a8510 100644
--- a/src/main/java/com/zy/asrs/controller/BasLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLiftController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,8 +13,10 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -23,6 +26,9 @@
@Autowired
private BasLiftService basLiftService;
+
+ @Value("${wcs-slave.url}")
+ private String wcsUrl;
@RequestMapping(value = "/basLift/{id}/auth")
@ManagerAuth
@@ -70,7 +76,7 @@
@ManagerAuth
public R update(BasLift basLift){
if (Cools.isEmpty(basLift) || null==basLift.getLiftNo()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
basLiftService.updateById(basLift);
return R.ok();
@@ -122,4 +128,134 @@
return R.ok();
}
+ @RequestMapping(value = "/basLift/command/list/auth")
+ @ManagerAuth
+ public R liftCommandQuery(@RequestParam Integer wrkNo) {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("total", 0);
+ hashMap.put("records", null);
+ try {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("wrkNo", wrkNo);
+ String response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath("/lift/command/query")
+ .setParams(map)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ JSONObject assignCommand = data.getJSONObject("assignCommand");
+ JSONArray commands = assignCommand.getJSONArray("commands");
+ Integer commandStep = data.getInteger("commandStep");//褰撳墠姝ュ簭
+ for (int i = 0; i < commands.size(); i++) {
+ JSONObject object = commands.getJSONObject(i);
+ object.put("commandStep", commandStep);//褰撳墠姝ュ簭
+ commands.set(i, object);
+ }
+ hashMap.put("total", commands.size());
+ hashMap.put("records", commands);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error();
+ }
+
+ return R.ok().add(hashMap);
+ }
+
+ //鍥為��鍛戒护
+ @RequestMapping(value = "/basLift/command/rollback/auth")
+ @ManagerAuth
+ public R liftCommandRollback(@RequestBody JSONObject param) {
+ try {
+ String response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath("/lift/command/rollback")
+ .setParams(param)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return R.ok();
+ }
+ return R.error();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error();
+ }
+ }
+
+ //鍛戒护瀹屾垚鐘舵�佸垏鎹�
+ @RequestMapping(value = "/basLift/command/completeSwitch/auth")
+ @ManagerAuth
+ public R liftCommandCompleteSwitch(@RequestBody JSONObject param) {
+ try {
+ String response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath("/lift/command/completeSwitch")
+ .setParams(param)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return R.ok();
+ }
+ return R.error();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error();
+ }
+ }
+
+ //閲嶅惎浠诲姟(鍛戒护)
+ @RequestMapping(value = "/basLift/command/restart/auth")
+ @ManagerAuth
+ public R liftCommandRestart(@RequestBody JSONObject param) {
+ try {
+ String response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath("/lift/command/restart")
+ .setParams(param)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return R.ok();
+ }
+ return R.error("閲嶅惎澶辫触");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error();
+ }
+ }
+
+ //鍒犻櫎浠诲姟(鍛戒护)
+ @RequestMapping(value = "/basLift/command/del/auth")
+ @ManagerAuth
+ public R liftCommandDel(@RequestBody JSONObject param) {
+ try {
+ String response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath("/lift/command/del")
+ .setParams(param)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ return R.ok();
+ }
+ return R.error("鍒犻櫎澶辫触");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error();
+ }
+ }
+
}
--
Gitblit v1.9.1