From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/StreetController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index b6a8390..27ecd22 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -12,6 +12,7 @@
import com.boying.service.StreetService;
import com.boying.util.LngLatUtil;
import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -80,7 +81,7 @@
return R.ok();
}
- @PostMapping("/findById")
+ @GetMapping("/findById")
public Object findById(Long id,int type) {
if(type==0){
QueryWrapper<StreetReRoad> roadQueryWrapper = new QueryWrapper<>();
@@ -108,7 +109,7 @@
}
}
- @PostMapping("/findList")
+ @GetMapping("/findList")
public Object findAll() {
Map<String,Object> map = new HashMap<>();
QueryWrapper<Street> wrapper = new QueryWrapper<>();
@@ -119,9 +120,15 @@
wrapper.lambda()
.eq(Street::getType,1);
map.put("list2",streetService.list(wrapper));
+
return R.ok(map);
}
+ @GetMapping("/findList2")
+ public Object findAll2() {
+ return R.ok(streetService.list());
+ }
+
@PostMapping("findLogo")
public Object findLogo(String lng ,String lat) {
List<StreetLogo> all = streetLogoService.list();
--
Gitblit v1.9.1