From cb98548ecc0fa2d4388eb67528b98be39670bc0c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 20 七月 2023 10:05:02 +0800
Subject: [PATCH] agv 有单入库功能
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 47 ++++++-----------------------------------------
1 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index e825c78..d922dfe 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -1,14 +1,13 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvWrkMast;
-import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.entity.param.AgvTaskCallBackParam;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.AppAuthUtil;
import com.zy.common.web.BaseController;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@@ -21,9 +20,9 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Date;
import java.util.EnumSet;
/**
@@ -54,10 +53,10 @@
@PostMapping("/task/event/status")
@AppAuth(memo = "ESS浠诲姟鍥炶皟")
- public R taskEventStaus(@RequestBody AgvTaskCallBackParam param){
+ public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){
- //淇濆瓨姣忔璋冪敤璇ユ帴鍙ｇ殑鍙傛暟锛屼綔涓哄巻鍙插彲鏌ヨ
- //saveApiLog(param);
+ //save api log (appkey 鍚庣画娣诲姞)
+ AppAuthUtil.auth("test-appkey",param, request);
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
if(Cools.isEmpty(agvWrkMast)){
@@ -95,15 +94,6 @@
return true;
}
- private void saveApiLog(AgvTaskCallBackParam param){
- ApiLog apiLog = new ApiLog();
- apiLog.setNamespace("ESS浠诲姟鍥炶皟");
- apiLog.setUrl("/agv/task/event/status");
- apiLog.setRequest(JSONObject.toJSONString(param));
- apiLog.setCreateTime(new Date());
- apiLogService.insert(apiLog);
- }
-
}
enum AgvTask{
@@ -114,27 +104,8 @@
task{
@Transactional
public void success(AgvTaskCallBackParam param) {
-
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),205);
-
- /*
- int wrkNo = Integer.valueOf(param.getTaskCode());
- String barcode = agvWrkMastService.selectById(wrkNo).getBarcode();
- //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
- agvWrkMastLogService.save(wrkNo);
- //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
- agvWrkDetlLogService.save(wrkNo);
- //鍒犻櫎AGV宸ヤ綔妗�
- agvWrkMastService.deleteById(wrkNo);
- //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
- agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
- //鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗�
- agvWaitPakinLogService.save(barcode);
- //鍒犻櫎鍏ュ簱閫氱煡妗�
- agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("zpallet",barcode));
- */
-
}
public void fail(AgvTaskCallBackParam param) {
@@ -203,14 +174,8 @@
tote_unload{
@Transactional
public void success(AgvTaskCallBackParam param) {
- int wrkNo = Integer.valueOf(param.getTaskCode());
- String barcode = agvWrkMastService.selectById(wrkNo).getBarcode();
- //淇敼鐩爣搴撲綅鐘舵�佷负F.鍦ㄥ簱
- //agvLocMastService.updateLocStsByLocNo(param.getLocationCode(),"F");
- //鏇存柊鐩爣搴撲綅鏄庣粏
- //agvLocDetlService.addLocDetlInfo(param.getLocationCode(),wrkNo);
//淇敼宸ヤ綔妗ｇ姸鎬佷负204.鏀捐揣瀹屾垚
- agvWrkMastService.updateWrkStsByWrkNo(wrkNo,204);
+ agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),204);
}
public void fail(AgvTaskCallBackParam param) {
--
Gitblit v1.9.1