From 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 21:30:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index d86ae85..5236ba6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.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;
@@ -16,19 +17,22 @@
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.LocMastInitParam;
-import com.zy.asrs.service.AdjDetlService;
-import com.zy.asrs.service.AgvLocDetlService;
-import com.zy.asrs.service.AgvLocMastService;
-import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.asrs.service.*;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
+@Slf4j
@RestController
@RequestMapping("/agv")
public class AgvLocMastController extends BaseController {
@@ -41,6 +45,13 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private AdjDetlService adjDetlService;
+ @Autowired
+ ApiLogService apiLogService;
+
+ @Value("${agv.url}")
+ private String url;
+ @Value("${agv.locStsUrl}")
+ private String locStsUrl;
@RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
@@ -86,6 +97,7 @@
if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
}
+ String barcode = oldLocMast.getBarcode();
int br = 0;
if (locMast.getLocSts() == "O" || locMast.getLocSts() == "X") {
switch (locMast.getBarcode().substring(0, 2)) {
@@ -146,6 +158,49 @@
locMast.setModiTime(now);
if (!agvLockMastService.updateById(locMast)) {
throw new CoolException("涓诲簱浣嶄慨鏀瑰け璐�");
+ } else {
+// try {
+// if (locMast.getLocSts().equals("O")) {
+// HashMap<String, String> data = new HashMap<>();
+// data.put("reqCode", System.currentTimeMillis() + "");
+// data.put("podCode", barcode);
+// data.put("positionCode", locMast.getLocNo());
+// data.put("indBind", "0");
+// String response = "";
+// boolean success = false;
+// int code = 0;
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(url)
+// .setPath(locStsUrl)
+// .setTimeout(30, TimeUnit.SECONDS)
+// .setJson(JSONObject.toJSONString(data))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// code = Integer.parseInt(jsonObject.get("code").toString());
+// if (code != 0) {
+// log.info("搴撲綅瑙ｇ粦AGV鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + response);
+// } else {
+// success = true;
+// }
+// } catch (Exception e) {
+// throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+// } finally {
+// apiLogService.save(
+// "璐ф灦涓庝綅缃В缁�",
+// url + locStsUrl,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(data),
+// response,
+// success
+// );
+// }
+// }
+// } catch (Exception e) {
+//
+// }
}
return R.ok();
}
--
Gitblit v1.9.1