diff --git a/src/main/java/com/gaotao/config/ShiroConfig.java b/src/main/java/com/gaotao/config/ShiroConfig.java index 8bbb49ff..1f590064 100644 --- a/src/main/java/com/gaotao/config/ShiroConfig.java +++ b/src/main/java/com/gaotao/config/ShiroConfig.java @@ -54,6 +54,7 @@ public class ShiroConfig { filterMap.put("/api/agv/**", "anon");//agv反馈信息 filterMap.put("/api/dashboard/**", "anon");//看板接口 filterMap.put("/ws/dashboard/**", "anon");//看板接口 + filterMap.put("/api/handlingunit/**", "anon");//hu对外接口 filterMap.put("/swagger/**", "anon"); filterMap.put("/v2/api-docs", "anon"); filterMap.put("/swagger-ui.html", "anon"); diff --git a/src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java b/src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java new file mode 100644 index 00000000..6661dae4 --- /dev/null +++ b/src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java @@ -0,0 +1,33 @@ +package com.gaotao.modules.api.controller; + +import com.gaotao.common.utils.R; +import com.gaotao.modules.handlingunit.entity.HandlingUnit; +import com.gaotao.modules.handlingunit.entity.dto.*; +import com.gaotao.modules.handlingunit.service.HandlingUnitService; +import com.gaotao.modules.sys.controller.AbstractController; +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 java.util.List; + +@RequestMapping("/api/handlingunit") +@RestController +public class HandlingUnitApiController extends AbstractController { + + @Autowired + private HandlingUnitService handlingUnitService; + + /** + * 查询处理单元详情 + */ + @PostMapping("getHandlingUnitDetail") + public R getHandlingUnitDetail(@RequestBody HandlingUnitDto dto) { + HandlingUnit detail = handlingUnitService.getHandlingUnit(dto.getSite(), dto.getUnitId()); + return R.ok().put("data", detail); + } + + +} diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java b/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java index 3b7f97f7..08a91202 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java +++ b/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java @@ -23,6 +23,12 @@ public interface HandlingUnitService extends IService { * 查询处理单元详情 */ HandlingUnitDto getHandlingUnitDetail(String site, String unitId); + + /** + * 对外接口:扫描处理单元标签 + */ + HandlingUnit getHandlingUnit(String site, String unitId); + HandlingUnitDto scanHandlingUnitLabelForYiKu(String site, String unitId); HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId); diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java b/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java index a4921e56..f172eb7b 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java @@ -57,6 +57,11 @@ public class HandlingUnitServiceImpl extends ServiceImpl