From fb050c0dafa5363a73540dd9e52b78487e25ba0a Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 09 四月 2024 17:32:46 +0800
Subject: [PATCH] fix：新增手动抬杆记录

---
 src/main/java/com/boying/controller/ParkController.java |   69 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index bd38d70..de69d43 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -9,6 +9,7 @@
 import com.boying.entity.User;
 import com.boying.service.ParkService;
 import com.boying.service.UserService;
+import com.boying.util.RedisJsonUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -17,6 +18,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -24,7 +26,7 @@
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping("/park")
+@RequestMapping("ffzf/park")
 @RequiredArgsConstructor
 public class ParkController {
 
@@ -32,6 +34,7 @@
     private StringRedisTemplate redisTemplate;
     private final ParkService parkService;
     private final UserService userService;
+    private final RedisJsonUtil redisJsonUtil;
 
     @PostMapping("/findPage")
     public Object findPage(Page page) {
@@ -39,7 +42,12 @@
         List<Park> records = page1.getRecords();
         for (Park record : records) {
             String num = redisTemplate.opsForValue().get("car_park_" +  record.getId());
-            record.setCarNum(Integer.parseInt(num));
+            if(num != null){
+                record.setCarNum(Integer.parseInt(num));
+            }else {
+                record.setCarNum(0);
+            }
+
         }
         page1.setRecords(records);
         return R.ok(page1);
@@ -53,12 +61,18 @@
             redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
             redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
         }
+        try {
+            redisJsonUtil.set("park-"+park.getId(), park);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         return R.ok("淇濆瓨鎴愬姛");
     }
 
     @PostMapping("/delete")
     public Object delete(Long id) {
         parkService.removeById(id);
+        redisJsonUtil.del("park-"+id);
         return R.ok("鍒犻櫎鎴愬姛");
     }
 
@@ -89,27 +103,44 @@
     }
 
     @PostMapping("/getByUserId")
-    public Object getByUserId(Long userId) {
-        User byId = userService.getById(userId);
+    public Object getByUserId(String parkIds) {
         List<Park> list = new ArrayList<>();
-        if(byId == null){
-            return R.failed("鏈煡璇㈠埌鐢ㄦ埛");
-        }else {
-            String parkIds = byId.getParkIds();
-            if(StringUtils.isBlank(parkIds)){
-                return R.failed("璇ョ敤鎴锋湭绠＄悊鍋滆溅鍦�");
-            }
-            List<Long> ids= Arrays.stream(parkIds.split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList());
-            for (Long id : ids) {
-                Park byId1 = parkService.getById(id);
-                String num = redisTemplate.opsForValue().get("car_park_" +  byId1.getId());
-                byId1.setCarNum(Integer.parseInt(num));
-                list.add(byId1);
-            }
-            return R.ok(list);
+        if(StringUtils.isBlank(parkIds)){
+            return R.failed("璇ョ敤鎴锋湭绠＄悊鍋滆溅鍦�");
         }
+        List<Long> ids= Arrays.stream(parkIds.split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList());
+        for (Long id : ids) {
+            Park byId1 = parkService.getById(id);
+            String num = redisTemplate.opsForValue().get("car_park_" +  byId1.getId());
+            try {
+                if(StringUtils.isBlank(num)){
+                    num = "0";
+                }
+                byId1.setCarNum(Integer.parseInt(num));
+            }catch (Exception e){
+                byId1.setCarNum(0);
+                e.printStackTrace();
+            }
+            list.add(byId1);
+        }
+        return R.ok(list);
     }
 
+    @PostMapping("/getById")
+    public Object getById(Long parkId) {
+        Park byId = parkService.getById(parkId);
+        if(byId == null){
+            return R.failed("鏈煡璇㈠埌璇ュ仠杞﹀満");
+        }else {
+            String s = redisTemplate.opsForValue().get("car_park_" + parkId);
+            if(StringUtils.isBlank(s)){
+                redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+                s = "0";
+            }
+            byId.setCarNum(Integer.parseInt(s));
+            return R.ok(byId,"鏌ヨ鎴愬姛");
+        }
+    }
     @PostMapping("/editParkCarNum")
     public Object editParkCarNum(Park park) {
         Park byId = parkService.getById(park.getId());

--
Gitblit v1.9.1