From 928a66524efbdb2371b7fa6b7ee8b55b910182fa Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 19 四月 2024 08:01:45 +0800
Subject: [PATCH] fix：创建新分支

---
 src/main/java/com/boying/controller/ParkController.java |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index b709e68..bdfea54 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -5,11 +5,16 @@
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.boying.common.R;
+import com.boying.entity.EnterPark;
 import com.boying.entity.Park;
 import com.boying.entity.User;
+import com.boying.service.EnterParkService;
 import com.boying.service.ParkService;
 import com.boying.service.UserService;
 import com.boying.util.RedisJsonUtil;
+import io.swagger.models.auth.In;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -28,6 +33,7 @@
 @RestController
 @RequestMapping("ffzf/park")
 @RequiredArgsConstructor
+@Tag(description = "ffzf/park" , name = "鍋滆溅鍦烘帴鍙�" )
 public class ParkController {
 
     @Autowired
@@ -35,8 +41,10 @@
     private final ParkService parkService;
     private final UserService userService;
     private final RedisJsonUtil redisJsonUtil;
+    private final EnterParkService enterParkService;
 
     @PostMapping("/findPage")
+    @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
     public Object findPage(Page page) {
         Page page1 = parkService.page(page, new QueryWrapper<Park>().lambda().orderByDesc(Park::getId));
         List<Park> records = page1.getRecords();
@@ -54,6 +62,7 @@
     }
 
     @PostMapping("/save")
+    @Operation(summary = "淇濆瓨鍋滆溅鍦�" , description = "淇濆瓨鍋滆溅鍦�" )
     public Object save(Park park) {
         parkService.saveOrUpdate(park);
         String num = redisTemplate.opsForValue().get("car_park_" +  park.getId());
@@ -70,6 +79,7 @@
     }
 
     @PostMapping("/delete")
+    @Operation(summary = "鍒犻櫎鍋滆溅鍦�" , description = "鍒犻櫎鍋滆溅鍦�" )
     public Object delete(Long id) {
         parkService.removeById(id);
         redisJsonUtil.del("park-"+id);
@@ -77,6 +87,7 @@
     }
 
     @PostMapping("findAll")
+    @Operation(summary = "鏌ヨ鎵�鏈�" , description = "鏌ヨ鎵�鏈�" )
     public Object findAll() {
         List<Park> all = parkService.list();
         for (Park park : all) {
@@ -91,6 +102,7 @@
     }
 
     @PostMapping("/getCarNum")
+    @Operation(summary = "鏍规嵁id鏌ヨ杞︿綅鏁�" , description = "鏍规嵁id鏌ヨ杞︿綅鏁�" )
     public Object getCarNum(Long parkId) {
         Park byId = (Park) parkService.getById(parkId);
         String s = redisTemplate.opsForValue().get("car_park_" + parkId);
@@ -103,6 +115,7 @@
     }
 
     @PostMapping("/getByUserId")
+    @Operation(summary = "鏍规嵁鐢ㄦ埛鏌ヨ绠＄悊鍋滆溅鍦鸿溅浣嶆暟" , description = "鏍规嵁鐢ㄦ埛鏌ヨ绠＄悊鍋滆溅鍦鸿溅浣嶆暟" )
     public Object getByUserId(String parkIds) {
         List<Park> list = new ArrayList<>();
         if(StringUtils.isBlank(parkIds)){
@@ -112,16 +125,22 @@
         for (Long id : ids) {
             Park byId1 = parkService.getById(id);
             String num = redisTemplate.opsForValue().get("car_park_" +  byId1.getId());
-            if(StringUtils.isNotBlank(num)){
-                num = "0";
+            try {
+                if(StringUtils.isBlank(num)){
+                    num = "0";
+                }
+                byId1.setCarNum(Integer.parseInt(num));
+            }catch (Exception e){
+                byId1.setCarNum(0);
+                e.printStackTrace();
             }
-            byId1.setCarNum(Integer.parseInt(num));
             list.add(byId1);
         }
         return R.ok(list);
     }
 
     @PostMapping("/getById")
+    @Operation(summary = "鏍规嵁id鏌ヨ鍋滆溅鍦猴紙APP锛�" , description = "鏍规嵁id鏌ヨ鍋滆溅鍦猴紙APP锛�" )
     public Object getById(Long parkId) {
         Park byId = parkService.getById(parkId);
         if(byId == null){
@@ -137,6 +156,7 @@
         }
     }
     @PostMapping("/editParkCarNum")
+    @Operation(summary = "淇敼杞︿綅鏁�" , description = "淇敼杞︿綅鏁�" )
     public Object editParkCarNum(Park park) {
         Park byId = parkService.getById(park.getId());
         if(byId == null){
@@ -150,4 +170,23 @@
         }
     }
 
+    @PostMapping("/getParkCar")
+    @Operation(summary = "鑾峰彇鍦哄唴杞﹁締" , description = "鑾峰彇鍦哄唴杞﹁締" )
+    public Object getParkCar(Page page, Integer parkId,String carNo) {
+        QueryWrapper<EnterPark> enterParkQueryWrapper = new QueryWrapper<>();
+        enterParkQueryWrapper.lambda()
+                .eq(parkId != null,EnterPark::getParkId,parkId)
+                .like(StringUtils.isNotBlank(carNo),EnterPark::getCarNo,carNo)
+                .orderByDesc(EnterPark::getCreateTime);
+        Page<EnterPark> page1 = enterParkService.page(page, enterParkQueryWrapper);
+        for (EnterPark record : page1.getRecords()) {
+            record.setParkName(parkService.getById(record.getParkId()).getName());
+            if(record.getImgId() != null){
+                record.setImgPath("/ffzf/fileinfo/showImgById/"+record.getImgId());
+            }
+        }
+        return R.ok(page1);
+    }
+
+
 }

--
Gitblit v1.9.1