| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/BindOrUnbindParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/RcsService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@ import com.core.common.R; import com.zy.asrs.domain.param.ToInStaParam; import com.zy.asrs.domain.param.ToOutStaParam; import com.zy.asrs.entity.BindOrUnbindParam; import com.zy.asrs.entity.RcsReporterTask; import com.zy.asrs.entity.RcsReturn; import com.zy.asrs.service.RcsService; @@ -127,4 +128,15 @@ // log.info("AGV放货完成,给站点写9991工作号,下发任务:{},站点:{},agv任务号:{}", result, task.getStaNo(), task.getTaskNo()); } /** * 滑块检测区域站点是否还有空站点 * @param param 需要站点号和绑定 * @return */ @PostMapping("/api/robot/reporter/carrier/BindOrUnbind") public R BindOrUnbind(@RequestBody BindOrUnbindParam param){ return rcsService.bindOrUnbind(param); } } src/main/java/com/zy/asrs/entity/BindOrUnbindParam.java
New file @@ -0,0 +1,9 @@ package com.zy.asrs.entity; import lombok.Data; @Data public class BindOrUnbindParam { private String carrierCode="666666"; private String siteCode; } src/main/java/com/zy/asrs/service/RcsService.java
@@ -1,5 +1,7 @@ package com.zy.asrs.service; import com.core.common.R; import com.zy.asrs.entity.BindOrUnbindParam; import com.zy.asrs.entity.RcsReporterTask; import com.zy.asrs.entity.RcsReturn; @@ -12,4 +14,6 @@ * @return */ RcsReturn reporterTask(RcsReporterTask rcsReporterTask); R bindOrUnbind(BindOrUnbindParam param); } src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.R; import com.zy.asrs.entity.*; import com.zy.asrs.enums.RcsRetMethodEnum; import com.zy.asrs.service.AgvTaskService; @@ -774,7 +775,26 @@ return 0; } @Override public R bindOrUnbind (BindOrUnbindParam param) { //1.先进行绑定 String url = HIK_URL + "api/robot/controller/carrier/bind"; String response = sendPost(url, JSONObject.toJSONString(param)); if (!StringUtils.isEmpty(response) && response.contains("code")) { RcsReturn rcsReturn1 = JSONObject.parseObject(response, RcsReturn.class); if ("SUCCESS".equals(rcsReturn1.getCode())) { //2.绑定成功,对站定进行解绑 String url1 = HIK_URL + "api/robot/controller/carrier/unbind"; String response1 = sendPost(url1, JSONObject.toJSONString(param)); return R.ok(); } else { R.error("绑定失败,该区域满了"); } }else { return R.error(); } return R.ok(); } public void agvPause(StaProtocol staProtocol){ if (staProtocol.isHighError()) { String url = HIK_URL + "/api/robot/controller/zone/pause";