From 20fe694cb2b74434d2807a6558c836e5a5067bc6 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Fri, 9 Aug 2024 11:37:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E7=AC=AC=E4=B8=80=E9=A1=B5?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server_api/controller/HighDangerController.java | 10 ++++++++-- .../hiatmp/server_api/mapper/HighDangerMapper.java | 4 +++- .../hiatmp/server_api/service/HighDangerService.java | 5 ++++- .../service/impl/HighDangerBaseServiceImpl.java | 11 +++++++++-- .../main/resources/sql-mapper/HighDangerMapper.xml | 10 +++++++++- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 8d0fcc1..20cc63d 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -1151,8 +1151,14 @@ public class HighDangerController { } @GetMapping("/getRoadTypes") - public ServerResponse getRoadType() { - List roadTypes = highDangerService.getRoadTypes(); + public ServerResponse getRoadType(@RequestParam Integer enumType) { + List roadTypes = highDangerService.getRoadTypes(enumType); + return ServerResponse.ok(roadTypes); + } + + @GetMapping("/getEnumValues") + public ServerResponse getEnumValues(@RequestParam Integer enumType) { + List roadTypes = highDangerService.getEnumValues(enumType); return ServerResponse.ok(roadTypes); } diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index 7600562..76497be 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java @@ -101,7 +101,9 @@ public interface HighDangerMapper{ void updateSectionCommunity(@Param("businessId") String businessId,@Param("xqcode") String xqcode,@Param("jdcode") String jdcode); - List getRoadTypes(); + List getRoadTypes(Integer enumType); + + List getEnumValues(Integer enumType); SectionVO getSectionByCode(String sectionCode); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java index 03fe5ea..a726503 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/HighDangerService.java @@ -6,6 +6,7 @@ import com.hisense.hiatmp.model.common.HighDangerRoad; import com.hisense.hiatmp.model.common.ThtDangerItems; import com.hisense.hiatmp.model.dmr.Point; import com.hisense.hiatmp.server_api.utils.CoordinateConverter; +import io.swagger.models.auth.In; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -35,7 +36,9 @@ public interface HighDangerService { void insertDangerRoad(HighDangerRoad highDangerRoad); - List getRoadTypes(); + List getRoadTypes(Integer enumType); + + List getEnumValues(Integer enumType); // 随机生成12位数字 String random12(); diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java index 6371b3d..b1862b2 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/HighDangerBaseServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import javax.imageio.ImageIO; @@ -348,9 +349,15 @@ public class HighDangerBaseServiceImpl implements HighDangerService { } @Override - public List getRoadTypes() { + public List getRoadTypes(Integer enumType) { // 获取道路类型 - return highDangerMapper.getRoadTypes(); + return highDangerMapper.getRoadTypes(enumType); + } + + @Override + public List getEnumValues(Integer enumType) { + // 获取道路类型 + return highDangerMapper.getEnumValues(enumType); } public String random12(){ diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index 0f6f74c..c75e4a0 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -664,7 +664,15 @@ + +