From 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 13:20:25 +0800
Subject: [PATCH] update大屏左侧站点设备查询优化及设备因子名称显示null问题
---
src/main/java/com/moral/controller/AreaController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/AreaController.java b/src/main/java/com/moral/controller/AreaController.java
index 4a2a58b..f67ef19 100644
--- a/src/main/java/com/moral/controller/AreaController.java
+++ b/src/main/java/com/moral/controller/AreaController.java
@@ -4,6 +4,8 @@
import com.moral.entity.Area;
import com.moral.entity.City;
import com.moral.entity.Province;
+import com.moral.entity.Town;
+import com.moral.entity.Village;
import com.moral.service.AreaService;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,7 +22,7 @@
@Resource
AreaService areaService;
@GetMapping("getfullnames")
- public ResultBean<String> getFullNames(Integer code){
+ public ResultBean<String> getFullNames(Long code){
return new ResultBean<>(areaService.queryFullNameByCode(code));
}
@GetMapping("get-provinces")
@@ -47,4 +49,22 @@
resultBean.setCode(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("get-towns")
+ public ResultBean<List<Town>> getTowns(int areaCode){
+ ResultBean<List<Town>> resultBean = new ResultBean<>();
+ List<Town> list = areaService.getTowns(areaCode);
+ resultBean.setData(list);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
+
+ @GetMapping("get-villages")
+ public ResultBean<List<Village>> getVillages(Long townCode){
+ ResultBean<List<Village>> resultBean = new ResultBean<>();
+ List<Village> list = areaService.getVillages(townCode);
+ resultBean.setData(list);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
}
--
Gitblit v1.8.0