From 83a1aa3133ce9c35fb428d0cdf4a84adda4ba3ac Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 24 四月 2024 16:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/boying/controller/StreetController.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index 55abf63..7cf1b0a 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -11,6 +11,8 @@
 import com.boying.service.StreetReRoadService;
 import com.boying.service.StreetService;
 import com.boying.util.LngLatUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,6 +29,7 @@
 @RestController
 @RequestMapping("ffzf/street")
 @RequiredArgsConstructor
+@Tag(description = "ffzf/street" , name = "琛楅亾缁熻" )
 public class StreetController {
 
 
@@ -35,6 +38,7 @@
     private final StreetLogoService streetLogoService;
 
     @PostMapping("/findPage")
+    @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
     public Object findPage(Page page, Street street) {
         QueryWrapper<Street> wrapper = new QueryWrapper<>();
         wrapper.lambda()
@@ -43,6 +47,7 @@
     }
 
     @PostMapping("/save")
+    @Operation(summary = "鏂板琛楅亾" , description = "鏂板琛楅亾" )
     public Object save(Street street) {
         QueryWrapper<Street> wrapper = new QueryWrapper<>();
         wrapper.lambda()
@@ -63,6 +68,7 @@
     }
 
     @PostMapping("/save2")
+    @Operation(summary = "鏂板璺�" , description = "鏂板璺�" )
     public Object save2(StreetReRoad streetReRoad) {
         streetReRoadService.saveOrUpdate(streetReRoad);
         return R.ok();
@@ -70,18 +76,21 @@
 
 
     @PostMapping("/delete")
+    @Operation(summary = "鍒犻櫎琛�" , description = "鍒犻櫎琛�" )
     public Object delete(Long id) {
         streetService.removeById(id);
         return R.ok();
     }
 
     @PostMapping("/delete2")
+    @Operation(summary = "鍒犻櫎璺�" , description = "鍒犻櫎璺�" )
     public Object delete2(Long id) {
         streetReRoadService.removeById(id);
         return R.ok();
     }
 
     @GetMapping("/findById")
+    @Operation(summary = "鏍规嵁id鏌ヨ锛圓PP锛�" , description = "鏍规嵁id鏌ヨ锛圓PP锛�" )
     public Object findById(Long id,int type) {
         if(type==0){
             QueryWrapper<StreetReRoad> roadQueryWrapper = new QueryWrapper<>();
@@ -110,21 +119,29 @@
     }
 
     @GetMapping("/findList")
+    @Operation(summary = "鏌ヨ鎵�鏈夎閬撳拰璺�" , description = "鏌ヨ鎵�鏈夎閬撳拰璺�" )
     public Object findAll() {
         Map<String,Object> map = new HashMap<>();
         QueryWrapper<Street> wrapper = new QueryWrapper<>();
-//        wrapper.lambda()
-//                .eq(Street::getType,0);
-//        map.put("list1",streetService.list(wrapper));
-//        wrapper.clear();
-//        wrapper.lambda()
-//                .eq(Street::getType,1);
-//        map.put("list2",streetService.list(wrapper));
+        wrapper.lambda()
+                .eq(Street::getType,0);
+        map.put("list1",streetService.list(wrapper));
+        wrapper.clear();
+        wrapper.lambda()
+                .eq(Street::getType,1);
+        map.put("list2",streetService.list(wrapper));
 
+        return R.ok(map);
+    }
+
+    @GetMapping("/findList2")
+    @Operation(summary = "鏌ヨ鎵�鏈夎閬�" , description = "鏌ヨ鎵�鏈夎閬�" )
+    public Object findAll2() {
         return R.ok(streetService.list());
     }
 
     @PostMapping("findLogo")
+    @Operation(summary = "鏌ヨ鎵�鏈夎閬撹繚绔�" , description = "鏌ヨ鎵�鏈夎閬撹繚绔�" )
     public Object findLogo(String lng ,String lat) {
         List<StreetLogo> all = streetLogoService.list();
         List<StreetLogo> all2 = new ArrayList<>();

--
Gitblit v1.9.1