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 | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index d662341..bdfea54 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -5,10 +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;
@@ -17,6 +23,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,16 +31,20 @@
import java.util.stream.Collectors;
@RestController
-@RequestMapping("/park")
+@RequestMapping("ffzf/park")
@RequiredArgsConstructor
+@Tag(description = "ffzf/park" , name = "鍋滆溅鍦烘帴鍙�" )
public class ParkController {
@Autowired
private StringRedisTemplate redisTemplate;
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();
@@ -51,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());
@@ -58,16 +70,24 @@
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")
+ @Operation(summary = "鍒犻櫎鍋滆溅鍦�" , description = "鍒犻櫎鍋滆溅鍦�" )
public Object delete(Long id) {
parkService.removeById(id);
+ redisJsonUtil.del("park-"+id);
return R.ok("鍒犻櫎鎴愬姛");
}
@PostMapping("findAll")
+ @Operation(summary = "鏌ヨ鎵�鏈�" , description = "鏌ヨ鎵�鏈�" )
public Object findAll() {
List<Park> all = parkService.list();
for (Park park : all) {
@@ -82,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);
@@ -94,38 +115,48 @@
}
@PostMapping("/getByUserId")
- public Object getByUserId(Long userId) {
- User byId = userService.getById(userId);
+ @Operation(summary = "鏍规嵁鐢ㄦ埛鏌ヨ绠＄悊鍋滆溅鍦鸿溅浣嶆暟" , description = "鏍规嵁鐢ㄦ埛鏌ヨ绠＄悊鍋滆溅鍦鸿溅浣嶆暟" )
+ 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")
+ @Operation(summary = "鏍规嵁id鏌ヨ鍋滆溅鍦猴紙APP锛�" , description = "鏍规嵁id鏌ヨ鍋滆溅鍦猴紙APP锛�" )
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")
+ @Operation(summary = "淇敼杞︿綅鏁�" , description = "淇敼杞︿綅鏁�" )
public Object editParkCarNum(Park park) {
Park byId = parkService.getById(park.getId());
if(byId == null){
@@ -139,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