From f77481e1f51ea1eada83377ef067e7988f3db356 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 03 三月 2026 16:50:39 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/AgvScheduleService.java | 3 +
src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java | 15 +++++--
src/main/java/com/zy/api/entity/dto/HKR.java | 79 +++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/api/controller/AgvScheduleController.java | 5 +-
4 files changed, 94 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/AgvScheduleController.java b/src/main/java/com/zy/api/controller/AgvScheduleController.java
index e141faa..9eec976 100644
--- a/src/main/java/com/zy/api/controller/AgvScheduleController.java
+++ b/src/main/java/com/zy/api/controller/AgvScheduleController.java
@@ -3,6 +3,7 @@
import com.core.common.R;
import com.zy.api.controller.params.AgvCallBackParam;
import com.zy.api.entity.CallAgvParams;
+import com.zy.api.entity.dto.HKR;
import com.zy.api.service.AgvScheduleService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +43,9 @@
*/
@ApiOperation("agv鎼繍缁撴灉鍥炰紶")
@PostMapping("/agv/result/callback")
- public R agvCarryCallBack(@RequestBody AgvCallBackParam params) {
+ public HKR agvCarryCallBack(@RequestBody AgvCallBackParam params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return HKR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return agvScheduleService.callback(params);
}
diff --git a/src/main/java/com/zy/api/entity/dto/HKR.java b/src/main/java/com/zy/api/entity/dto/HKR.java
new file mode 100644
index 0000000..b40039a
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/dto/HKR.java
@@ -0,0 +1,79 @@
+package com.zy.api.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Date;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "HKR", description = "娴峰悍鍝嶅簲淇℃伅")
+public class HKR<T> {
+ private static final String SUCCESS_CODE = "200";
+ private static final String FAIL_CODE = "500";
+
+ private String code;
+
+ private String message;
+
+ private Boolean success;
+
+ private String reqCode;
+
+ private Integer errorCode;
+
+ private T result;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date timestamp;
+
+ public HKR() {
+ this.timestamp = new Date(System.currentTimeMillis());
+ }
+
+ public static <T> HKR<T> ok() {
+ return new HKR<T>()
+ .setCode("SUCCESS")
+ .setSuccess(true)
+ .setMessage("鎿嶄綔鎴愬姛")
+ .setErrorCode(0);
+ }
+
+ public static <T> HKR<T> ok(T data) {
+ return new HKR<T>()
+ .setCode("SUCCESS")
+ .setSuccess(true)
+ .setMessage("鎿嶄綔鎴愬姛")
+ .setErrorCode(0)
+ .setResult(data);
+ }
+
+ public static <T> HKR<T> ok(T data, String message) {
+ return new HKR<T>()
+ .setCode("SUCCESS")
+ .setSuccess(true)
+ .setMessage(message)
+ .setErrorCode(0)
+ .setResult(data);
+ }
+
+ public static <T> HKR<T> error(String message) {
+ return new HKR<T>()
+ .setCode("ERROR")
+ .setSuccess(false)
+ .setMessage(message)
+ .setErrorCode(0);
+ }
+
+ public static <T> HKR<T> error(String code, String message) {
+ return new HKR<T>()
+ .setCode("ERROR")
+ .setSuccess(false)
+ .setMessage(message)
+ .setErrorCode(500);
+ }
+}
diff --git a/src/main/java/com/zy/api/service/AgvScheduleService.java b/src/main/java/com/zy/api/service/AgvScheduleService.java
index 6c0f6f3..ca81ddb 100644
--- a/src/main/java/com/zy/api/service/AgvScheduleService.java
+++ b/src/main/java/com/zy/api/service/AgvScheduleService.java
@@ -3,10 +3,11 @@
import com.core.common.R;
import com.zy.api.controller.params.AgvCallBackParam;
import com.zy.api.entity.CallAgvParams;
+import com.zy.api.entity.dto.HKR;
public interface AgvScheduleService {
R callAgvCarry(CallAgvParams params);
- R callback(AgvCallBackParam params);
+ HKR callback(AgvCallBackParam params);
}
diff --git a/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java b/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java
index d4f13a8..b63b00f 100644
--- a/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.api.controller.params.AgvCarriesParam;
import com.zy.api.controller.params.AgvRequestParam;
import com.zy.api.entity.CallAgvParams;
+import com.zy.api.entity.dto.HKR;
import com.zy.api.enums.OrderType;
import com.zy.api.service.AgvScheduleService;
import com.zy.asrs.entity.LocCache;
@@ -74,6 +75,10 @@
task.setWrkSts(TaskStatusType.AGV_TASK_ISSUED_OUT.type);
}
+ if (task.getIsNewIn().equals("M1")) {
+ params.setTaskType("M1");
+ }
+
HIKResultDTO hikResultDTO = sendAgvTask(params, HIKApiConstant.TASK_SUBMIT);
if (hikResultDTO.isSuccess()) {
@@ -101,16 +106,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R callback(AgvCallBackParam params) {
+ public HKR callback(AgvCallBackParam params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return HKR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getRobotTaskCode())) {
- return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ return HKR.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", params.getRobotTaskCode()));
if (Objects.isNull(task)) {
- return R.error("浠诲姟淇℃伅涓嶅瓨鍦紒锛�");
+ return HKR.error("浠诲姟淇℃伅涓嶅瓨鍦紒锛�");
}
if (Arrays.asList(TaskIOType.ALL_IN.type, TaskIOType.PICK_IN.type, TaskIOType.MERGE_IN.type)
@@ -134,7 +139,7 @@
if (!taskService.updateById(task)) {
throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- return R.ok("鎵ц瀹屾垚 锛侊紒");
+ return HKR.ok("鎵ц瀹屾垚 锛侊紒");
}
public HIKResultDTO sendAgvTask(CallAgvParams param, String path) {
--
Gitblit v1.9.1