1053设备客户端调用接口修改

src/main/java/com/neotel/smfcore/core/device/enums/OP_STATUS.java

@@ -45,6 +45,10 @@ public enum OP_STATUS {
      */
     OUTBOX,
     /**
+     * 在线体上
+     */
+    INLINE,
+    /**
      * 机器人正在移栽中
      */
     INROBOT,

src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java

@@ -375,7 +375,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         return resultMap;
     }
 
-    @ApiOperation("机器人更新任务状态")
+    @ApiOperation("更新任务状态")
     @PostMapping(value = "/service/store/robotBox/updateLocInfo")
     @ResponseBody
     @AnonymousAccess
@@ -441,12 +441,15 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         return ResultBean.newOkResult("");
     }
 
-
-    @ApiOperation("机器人定时获取任务")
-    @PostMapping(value = "/service/store/robotBox/getRobotTask")
+    @ApiOperation("获取指定任务信息 传realId时获取指定料盘任务信息，传cid时获取料仓任务，传robotIndex返回指定机器人任务")
+    @PostMapping(value = "/service/store/robotBox/getTask")
     @ResponseBody
     @AnonymousAccess
-    public ResultBean getRobotTask(HttpServletRequest request) {
+    public ResultBean getTask(HttpServletRequest request) {
+        String cid = request.getParameter("cid");
+        String realId = request.getParameter("realId");
+        String robotIndex = request.getParameter("robotIndex");
+
         Collection<DataLog> datalogs = taskService.getAllTasks();
         //先查找已在机器人的
 //        for (DataLog task : datalogs) {
@@ -457,8 +460,34 @@ public class RobotBoxHandler extends BaseDeviceHandler {
 //        }
         //查找出库已经到门口的
         for (DataLog task : datalogs) {
+            //根据realID获取任务
+            if (ObjectUtil.isNotEmpty(realId)) {
+                if (task.getBarcode().equals(realId)) {
+                    return returnTaskResult(task);
+                }
+            }
+            //机器人编号获取任务
+            else if (ObjectUtil.isNotEmpty(robotIndex)) {
                 if (task.isCheckOutTask()) {
+                    if (task.isBoxdoor() && task.getLocInfo().equals(robotIndex + "")) {
+                        return returnTaskResult(task);
+                    }
+                }
+            }
+            //根据CID获取任务
+            else if (ObjectUtil.isNotEmpty(cid)) {
+                if (task.getCid().equals(cid)) {
                     if (task.isBoxdoor()) {
+                        return returnTaskResult(task);
+                    }
+                }
+            }
+        }
+
+        return ResultBean.newErrorResult(-1, "", "");
+    }
+
+    private ResultBean returnTaskResult(DataLog task) {
         Map<String, String> taskMap = new HashMap<>();
         taskMap.put("cid", task.getCid());//取料位置
 //                    taskMap.put("targetPos", "out");//放料位置
@@ -480,40 +509,64 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         return ResultBean.newOkResult(taskMap);
     }
 
-            }
-        }
 
-        return ResultBean.newErrorResult(-1, "", "");
-    }
 
 
-    @ApiOperation("料仓判断仓门口是否可以放料")
-    @PostMapping(value = "/service/store/robotBox/getBoxDoorStatus")
-    @ResponseBody
-    @AnonymousAccess
-    public ResultBean getBoxDoorStatus(HttpServletRequest request) {
-        String cid = request.getParameter("cid");
-        //判断仓门口状态，0=空闲，返回其他表示仓门口有料或机器人正在取料
-        Storage storage = dataCache.getStorage(cid);
-        if (storage == null) {
-            return ResultBean.newErrorResult(99, "smfcore.robotBox.notFound", "未找到机器人料仓[{0}]", new String[]{cid});
-        }
-        if (!storage.isRobotBox()) {
-            return ResultBean.newErrorResult(99, "smfcore.robotBox.notFound", "未找到机器人料仓[{0}]", new String[]{cid});
-        }
-        Collection<DataLog> tasks = taskService.getQueueTasks();
-        for (DataLog task : tasks) {
-            if (task.getStorageId().equals(storage.getId())) {
-                if (task.isBoxdoor()) {
-                    return ResultBean.newErrorResult(-1, "smfcore.robotBox.boxHasTask", "任务[{0}][{1}]类型{2}状态{3}", new String[]{task.getPosName(), task.getBarcode(), task.getType() + "", task.getStatus()});
-                }
-//                else if(task.isPutInTask()&&task.isInRobot()){
-//                    return ResultBean.newErrorResult(-1, "smfcore.robotBox.boxHasTask", "任务[{0}][{1}]类型{2}状态{3}", new String[]{task.getPosName(), task.getBarcode(),task.getType()+"", task.getStatus()});
+
+//    @ApiOperation("机器人定时获取任务")
+//    @PostMapping(value = "/service/store/robotBox/getRobotTask")
+//    @ResponseBody
+//    @AnonymousAccess
+//    public ResultBean getRobotTask(HttpServletRequest request) {
+//        Collection<DataLog> datalogs = taskService.getAllTasks();
+//        //先查找已在机器人的
+////        for (DataLog task : datalogs) {
+////            if (task.isInRobot()) {
+////                //获取任务失败，还有未完成的任务
+////                return ResultBean.newErrorResult(1, "smfcore.task.lastNotEnd", "上个任务未结束{0}{1}", new String[]{task.getPosName(), task.getBarcode()});
+////            }
+////        }
+//        //查找出库已经到门口的
+//        for (DataLog task : datalogs) {
+//            if (task.isCheckOutTask()) {
+//                if (task.isBoxdoor()) {
+//                    return returnTaskResult(task);
+//                }
+//
+//            }
+//        }
+//
+//        return ResultBean.newErrorResult(-1, "", "");
+//    }
+
+
+//    @ApiOperation("获取指定任务信息")
+//    @PostMapping(value = "/service/store/robotBox/getBoxDoorStatus")
+//    @ResponseBody
+//    @AnonymousAccess
+//    public ResultBean getBoxDoorStatus(HttpServletRequest request) {
+//        String cid = request.getParameter("cid");
+//        //判断仓门口状态，0=空闲，返回其他表示仓门口有料或机器人正在取料
+//        Storage storage = dataCache.getStorage(cid);
+//        if (storage == null) {
+//            return ResultBean.newErrorResult(99, "smfcore.robotBox.notFound", "未找到机器人料仓[{0}]", new String[]{cid});
+//        }
+//        if (!storage.isRobotBox()) {
+//            return ResultBean.newErrorResult(99, "smfcore.robotBox.notFound", "未找到机器人料仓[{0}]", new String[]{cid});
+//        }
+//        Collection<DataLog> tasks = taskService.getQueueTasks();
+//        for (DataLog task : tasks) {
+//            if (task.getStorageId().equals(storage.getId())) {
+//                if (task.isBoxdoor()) {
+//                    return ResultBean.newErrorResult(-1, "smfcore.robotBox.boxHasTask", "任务[{0}][{1}]类型{2}状态{3}", new String[]{task.getPosName(), task.getBarcode(), task.getType() + "", task.getStatus()});
+//                }
+////                else if(task.isPutInTask()&&task.isInRobot()){
+////                    return ResultBean.newErrorResult(-1, "smfcore.robotBox.boxHasTask", "任务[{0}][{1}]类型{2}状态{3}", new String[]{task.getPosName(), task.getBarcode(),task.getType()+"", task.getStatus()});
+////                }
+//            }
+//        }
+//        return ResultBean.newOkResult("");
 //    }
-            }
-        }
-        return ResultBean.newOkResult("");
-    }
 
     @ApiOperation("点料后更新物料数量")
     @PostMapping(value = "/service/store/robotBox/updateReelQty")

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronML5Controller.java

+package com.neotel.smfcore.custom.micron1053.controller;
+
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Slf4j
+@RestController
+@Api(tags = "1053：ML5页面接口")
+@RequestMapping("/rest/micron/ml5")
+public class MicronML5Controller {
+    @ApiOperation("ML5页面数据获取")
+    @GetMapping("/view")
+    @AnonymousAccess
+    public ResultBean view( ) {
+
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("ML5设备状态更新")
+    @PostMapping(value = "/deviceStatus")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean deviceStatus(HttpServletRequest request) {
+        String barcode = request.getParameter("barcode");
+        Integer qty = Integer.parseInt(request.getParameter("qty")) ;
+
+        return ResultBean.newOkResult("");
+    }
+}