From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app
---
src/main/java/com/boying/controller/ParkController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index 8f96e7d..4d3ac74 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -1,25 +1,43 @@
package com.boying.controller;
import com.boying.common.BaseController;
+import com.boying.common.util.StringUtil;
import com.boying.entity.Park;
+import com.boying.entity.User;
import com.boying.service.ParkService;
+import com.boying.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("park")
public class ParkController extends BaseController {
@Autowired
+ private StringRedisTemplate redisTemplate;
+
+ @Autowired
private ParkService parkService;
+
+ @Autowired
+ private UserService userService;
@PostMapping("findPage")
public Object findPage(int page,int pageSize) {
@@ -42,7 +60,47 @@
@PostMapping("findAll")
public Object findAll() {
- List all = parkService.findAll();
- return success("鍒犻櫎鎴愬姛",all);
+ List<Park> all = parkService.findAll();
+ for (Park park : all) {
+ String s = redisTemplate.opsForValue().get("car_park_" + park.getId());
+ if(StringUtil.isNullOrEmpty(s)){
+ park.setCarNum(0);
+ }else {
+ park.setCarNum(Integer.parseInt(s));
+ }
+ }
+ return success("鏌ヨ鎴愬姛",all);
}
+
+ @PostMapping("getCarNum")
+ public Object getCarNum(Long parkId) {
+ Park byId = (Park) parkService.findById(parkId);
+ String s = redisTemplate.opsForValue().get("car_park_" + parkId);
+ if(StringUtil.isNullOrEmpty(s)){
+ byId.setCarNum(0);
+ }else {
+ byId.setCarNum(Integer.parseInt(s));
+ }
+ return success("鏌ヨ鎴愬姛",byId);
+ }
+
+ @PostMapping("getByUserId")
+ public Object getByUserId(Long userId) {
+ User byId = (User)userService.findById(userId);
+ List<Park> list = new ArrayList<>();
+ if(byId == null){
+ return error("鏈煡璇㈠埌鐢ㄦ埛");
+ }else {
+ String parkIds = byId.getParkIds();
+ if(StringUtil.isNullOrEmpty(parkIds)){
+ return error("璇ョ敤鎴锋湭绠＄悊鍋滆溅鍦�");
+ }
+ List<Long> ids= Arrays.stream(parkIds.split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList());
+ for (Long id : ids) {
+ list.add((Park) parkService.findById(id));
+ }
+ return success("鏌ヨ鎴愬姛",list);
+ }
+ }
+
}
--
Gitblit v1.9.1