From 4243be17cf2bb97a4901da548d589dec64743c8a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 八月 2023 13:59:56 +0800
Subject: [PATCH] #查询任务详情、查询任务指令集合接口
---
src/main/java/com/zy/asrs/controller/OpenController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6024d65..e3b17dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,8 +5,12 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.param.taskCreateParam;
+import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.TaskWrkService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.List;
@Slf4j
@RestController
@@ -22,6 +27,10 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private CommandInfoService commandInfoService;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
@@ -29,8 +38,8 @@
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
- public R taskCreate(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) taskCreateParam param,
+ public R taskCreate(@RequestHeader String appkey,
+ @RequestBody taskCreateParam param,
HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -49,6 +58,34 @@
return R.ok();
}
+ //鏌ヨ浠诲姟璇︽儏
+ @GetMapping("/queryTask")
+ public R queryTask(@RequestHeader String appkey,
+ @RequestParam String taskNo,
+ HttpServletRequest request) {
+ auth(appkey, taskNo, request);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+ return R.ok().add(taskWrk);
+ }
+
+ //鏌ヨ浠诲姟鎸囦护闆嗗悎
+ @GetMapping("/queryTaskCommand")
+ public R queryTaskCommand(@RequestHeader String appkey,
+ @RequestParam String taskNo,
+ HttpServletRequest request) {
+ auth(appkey, taskNo, request);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskNo);
+ return R.ok().add(commandInfos);
+ }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
--
Gitblit v1.9.1