From 18ccf9022f3ab7f8160c58d5144efa006f1dcefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=9F=E5=B0=8F=E6=9F=BF?= <15150590045@163.com>
Date: Fri, 15 Mar 2024 15:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/wcs/back/controller/HkController.java | 40 +++++++++++++++++++
 .../wcs/back/controller/WcsController.java    |  3 +-
 .../java/com/wcs/back/domain/HkResult.java    | 33 +++++++++++++++
 .../com/wcs/back/service/IWcsService.java     |  8 ++++
 .../wcs/back/service/impl/WcsServiceImpl.java | 17 ++++++++
 5 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/wcs/back/controller/HkController.java
 create mode 100644 src/main/java/com/wcs/back/domain/HkResult.java

diff --git a/src/main/java/com/wcs/back/controller/HkController.java b/src/main/java/com/wcs/back/controller/HkController.java
new file mode 100644
index 0000000..e585a64
--- /dev/null
+++ b/src/main/java/com/wcs/back/controller/HkController.java
@@ -0,0 +1,40 @@
+package com.wcs.back.controller;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.wcs.back.domain.HkResult;
+import com.wcs.back.service.IWcsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * wcs回调Controller
+ *
+ * @author zf
+ * @date 2022-11-11
+ */
+@RestController
+@RequestMapping("/rcms")
+@Api(value = "wcs回调控制器", tags = {"wcs回调管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class HkController {
+
+    private final IWcsService wcsService;
+
+    /**
+     * 海康任务下发
+     */
+    @ApiOperation("海康任务下发")
+    @PostMapping("/services/rest/hikRpcService/genAgvSchedulingTask")
+    public HkResult genAgvSchedulingTask(@RequestBody String json, HttpServletRequest request) throws JsonProcessingException {
+        HkResult hkResult = wcsService.genAgvSchedulingTask(json, request);
+        return hkResult;
+    }
+}
diff --git a/src/main/java/com/wcs/back/controller/WcsController.java b/src/main/java/com/wcs/back/controller/WcsController.java
index 677d115..caf0b67 100644
--- a/src/main/java/com/wcs/back/controller/WcsController.java
+++ b/src/main/java/com/wcs/back/controller/WcsController.java
@@ -69,7 +69,7 @@ public class WcsController {
     /**
      * 指令下发
      */
-    @ApiOperation("滚筒任务下发")
+    @ApiOperation("指令下发")
     @PostMapping("/Directives")
     public WcsResult Directives(@RequestBody String json, HttpServletRequest request) throws JsonProcessingException {
         WcsResult wcsResult = wcsService.Directives(json, request);
@@ -95,5 +95,4 @@ public class WcsController {
         WcsResult2 wcsResult = wcsService.GetRollerInfo();
         return wcsResult;
     }
-
 }
diff --git a/src/main/java/com/wcs/back/domain/HkResult.java b/src/main/java/com/wcs/back/domain/HkResult.java
new file mode 100644
index 0000000..d633e58
--- /dev/null
+++ b/src/main/java/com/wcs/back/domain/HkResult.java
@@ -0,0 +1,33 @@
+package com.wcs.back.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 海康响应
+ *
+ * @author zf
+ * @date 2024/2/29
+ */
+@Data
+public class HkResult implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 返回码::0-成功 */
+    @ApiModelProperty("返回码::0-成功 ")
+    private String code;
+
+    /** 返回消息 */
+    @ApiModelProperty("返回消息")
+    private String message;
+
+    /** 请求编号 */
+    @ApiModelProperty("请求编号")
+    private String reqCode;
+
+    /** 自定义返回（返回任务单号） */
+    @ApiModelProperty("自定义返回（返回任务单号）")
+    private String data;
+}
diff --git a/src/main/java/com/wcs/back/service/IWcsService.java b/src/main/java/com/wcs/back/service/IWcsService.java
index ea63329..00cadb4 100644
--- a/src/main/java/com/wcs/back/service/IWcsService.java
+++ b/src/main/java/com/wcs/back/service/IWcsService.java
@@ -1,6 +1,7 @@
 package com.wcs.back.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.wcs.back.domain.HkResult;
 import com.wcs.back.domain.WcsResult;
 import com.wcs.back.domain.WcsResult2;
 
@@ -65,4 +66,11 @@ public interface IWcsService {
      */
     WcsResult2 GetRollerInfo();
 
+    /**
+     * 海康任务创建
+     * @param json
+     * @param request
+     * @return
+     */
+    HkResult genAgvSchedulingTask(String json, HttpServletRequest request);
 }
diff --git a/src/main/java/com/wcs/back/service/impl/WcsServiceImpl.java b/src/main/java/com/wcs/back/service/impl/WcsServiceImpl.java
index 977f7c8..05f2a79 100644
--- a/src/main/java/com/wcs/back/service/impl/WcsServiceImpl.java
+++ b/src/main/java/com/wcs/back/service/impl/WcsServiceImpl.java
@@ -359,6 +359,23 @@ public class WcsServiceImpl implements IWcsService {
         return wcsResult2;
     }
 
+    /**
+     * 海康任务创建
+     *
+     * @param json
+     * @param request
+     * @return
+     */
+    @Override
+    public HkResult genAgvSchedulingTask(String json, HttpServletRequest request) {
+        HkResult hkResult = new HkResult();
+        hkResult.setCode("0");
+        hkResult.setMessage("成功");
+        hkResult.setReqCode("0");
+        hkResult.setData("F01169C808C317111G");
+        return hkResult;
+    }
+
     // 发送 HTTP POST 请求
     private <T> WcsResult sendHttpPost(T taskCallBack, String url) {
         String jsonString = JSON.toJSONString(taskCallBack);