From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Wed, 27 Jun 2018 12:34:27 +0800 Subject: [PATCH] 大屏布局监控点 返回配置数据 --- src/main/java/com/moral/controller/ProfessionController.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moral/controller/ProfessionController.java b/src/main/java/com/moral/controller/ProfessionController.java index bfa2aa6..10138a7 100644 --- a/src/main/java/com/moral/controller/ProfessionController.java +++ b/src/main/java/com/moral/controller/ProfessionController.java @@ -9,6 +9,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Optional; @RestController @RequestMapping("profession") @@ -16,7 +17,8 @@ @Resource ProfessionService professionService; @GetMapping(value = "getall") - public ResultBean<List<Profession>> getALL(){ - return new ResultBean<>(professionService.getProfessiontList()); + public ResultBean<List<Profession>> getALL(Optional<String> name){ + String queryName = name.isPresent()?name.get():null; + return new ResultBean<>(professionService.queryByName(queryName)); } } -- Gitblit v1.8.0