From b784514b4c5414e3deb121f723fae6d8d875f4e5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期一, 10 七月 2023 16:52:38 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/OrderRecordController.java | 8 +
src/main/java/com/boying/job/PayResult2Scheduled.java | 3
src/main/java/com/boying/controller/car/PlateServlet3.java | 192 +++++++++++++++++++++++++----------------------
3 files changed, 110 insertions(+), 93 deletions(-)
diff --git a/src/main/java/com/boying/controller/OrderRecordController.java b/src/main/java/com/boying/controller/OrderRecordController.java
index b20267f..7f7204a 100644
--- a/src/main/java/com/boying/controller/OrderRecordController.java
+++ b/src/main/java/com/boying/controller/OrderRecordController.java
@@ -7,6 +7,7 @@
import com.boying.common.R;
import com.boying.entity.OrderRecord;
import com.boying.entity.OutPark;
+import com.boying.entity.Park;
import com.boying.entity.User;
import com.boying.entity.vo.OrderRecordVo;
import com.boying.service.OrderRecordService;
@@ -120,7 +121,12 @@
List<OutPark> value = objectListEntry.getValue();
Double collect1 = value.stream().collect(Collectors.summingDouble(OutPark::getPrice));
Map<String,Object> map = new HashMap<>();
- map.put("parkName",parkService.getById(key).getName());
+ Park byId = parkService.getById(key);
+ if(byId != null){
+ map.put("parkName",byId.getName());
+ }else {
+ map.put("parkName","鏈煡鍋滆溅鍦�");
+ }
map.put("orderNum",value.size());
map.put("orderMoney",collect1);
resultList.add(map);
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index ce0ce7a..82b1f85 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.boying.common.R;
import com.boying.common.SystemConfigProperties;
@@ -57,6 +58,7 @@
private final CostRuleService costRuleService;
private final WhiteListService whiteListService;
private final FileInfoService fileInfoService;
+ private final TicketBlackService ticketBlackService;
private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
/**
@@ -478,44 +480,29 @@
public void enterPark(String carNo,Integer barrierId,Integer parkId,FileInfo fileInfo) {
- Park park = parkService.getById(parkId);
-// int num = 0;
-// String s = redisTemplate.opsForValue().get("car_park_" + parkId);
-// if(park != null){
-// num = park.getNum();
-// if(s !=null){
-// if(Integer.parseInt(s) >= num){
-// redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS);
-// return;
-// }
-// }else {
-// s= "0";
-// redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS);
-// redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
-// }
-// }
- enterParkService.deleteByCarNo(carNo,parkId);
- EnterPark enterPark = new EnterPark();
- enterPark.setCarNo(carNo);
- enterPark.setBarrierId(barrierId);
- enterPark.setParkId(parkId);
+ TicketBlack black = ticketBlackService.getByCarNo(carNo, 1);
+ if(black != null){
+ System.out.println("榛戝悕鍗曡溅杈�"+carNo);
+ }else {
+ enterParkService.deleteByCarNo(carNo,parkId);
+ EnterPark enterPark = new EnterPark();
+ enterPark.setCarNo(carNo);
+ enterPark.setBarrierId(barrierId);
+ enterPark.setParkId(parkId);
- QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Ticket::getCarNo,enterPark.getCarNo())
- .eq(Ticket::getPayStatus,1);
- List<Ticket> tickets = ticketService.list(wrapper);
- if(tickets.size()>0){
- enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
+ QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Ticket::getCarNo,enterPark.getCarNo())
+ .eq(Ticket::getPayStatus,1);
+ List<Ticket> tickets = ticketService.list(wrapper);
+ if(tickets.size()>0){
+ enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
+ }
+ if(fileInfo != null){
+ enterPark.setImgId(fileInfo.getId());
+ }
+ enterParkService.saveOrUpdate(enterPark);
}
- if(fileInfo != null){
- enterPark.setImgId(fileInfo.getId());
- }
- enterParkService.saveOrUpdate(enterPark);
-
-// Barrier barrier = barrierService.getById(barrierId);
-// barrier.setType2(1);
-// barrierService.saveOrUpdate(barrier);
}
public double outPark(String carNo,Integer barrierId,Integer parkId,HttpServletRequest request, HttpServletResponse response,FileInfo fileInfo) throws ServletException, IOException {
@@ -625,70 +612,93 @@
public void inLedShow(String ledId,String carNo,Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String num = redisTemplate.opsForValue().get("car_park_" + parkId);
- if(num == null){
- num = "0";
- }
- Park byId = parkService.getById(parkId);
- int n = Integer.parseInt(num)+1;
- redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(n),30, TimeUnit.DAYS);
- int i = byId.getNum() - Integer.parseInt(num);
- if(i<0){
- i = 0;
- }
- String carType = "";
- String carDay = "";
- Barrier barrier = barrierService.findByCode(ledId);
- WhiteList byCarNo = whiteListService.getByCarNo(carNo);
- if(byCarNo == null){
- carType = "涓存椂杞�";
+ TicketBlack black = ticketBlackService.getByCarNo(carNo, 1);
+ if(black != null){
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2("榛戝悕鍗曡溅杈�");
+ ledBean.setcontent3("绂佹椹跺叆");
+ ledBean.setcontent4("鑱旂郴绠＄悊鍛�");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("榛戝悕鍗曡溅杈�"+carNo+",绂佹椹跺叆");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+ noOpen(request,response,data1);
}else {
- if (byCarNo.getType() == 0){
- //鐧藉悕鍗曟案涔呰溅杈�
- carType = "鏈堢杞�";
+ String num = redisTemplate.opsForValue().get("car_park_" + parkId);
+ if(num == null){
+ num = "0";
+ }
+ Park byId = parkService.getById(parkId);
+ int n = Integer.parseInt(num)+1;
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(n),30, TimeUnit.DAYS);
+ int i = byId.getNum() - Integer.parseInt(num);
+ if(i<0){
+ i = 0;
+ }
+ String carType = "";
+ String carDay = "";
+ Barrier barrier = barrierService.findByCode(ledId);
+ WhiteList byCarNo = whiteListService.getByCarNo(carNo);
+ if(byCarNo == null){
+ carType = "涓存椂杞�";
}else {
- //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
+ if (byCarNo.getType() == 0){
+ //鐧藉悕鍗曟案涔呰溅杈�
carType = "鏈堢杞�";
- long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
- carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
}else {
- carType = "涓存椂杞�";
+ //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
+ carType = "鏈堢杞�";
+ long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
+ carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
+ }
}
}
- }
- if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犺溅鐗�")){
- carDay = "娆㈣繋鍏変复";
- }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犺溅鐗�")){
- carDay = "鎷掔粷椹跺叆";
- }
+ if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犺溅鐗�")){
+ carDay = "娆㈣繋鍏変复";
+ }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犺溅鐗�")){
+ carDay = "鎷掔粷椹跺叆";
+ }
- LedBean ledBean = new LedBean();
- ledBean.setcolor1(0);
- ledBean.setcolor2(0);
- ledBean.setcolor3(0);
- ledBean.setcolor4(0);
- ledBean.setcontent1(carNo);
- ledBean.setcontent2(carType);
- ledBean.setcontent3(carDay);
- ledBean.setcontent4("浣欎綅:"+i);
- ledBean.setdisMode1(0);
- ledBean.setdisMode2(0);
- ledBean.setdisMode3(0);
- ledBean.setdisMode4(0);
- ledBean.setvoiceContent(carType+","+carNo+","+carDay);
- ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
- byte[] dataX = new byte[resultData.getlenth()];
- System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
- String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
- data1 = data1.replaceAll("\r\n", "");
+ LedBean ledBean = new LedBean();
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(carType);
+ ledBean.setcontent3(carDay);
+ ledBean.setcontent4("浣欎綅:"+i);
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent(carType+","+carNo+","+carDay);
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
- if(!carNo.equals("鏃犺溅鐗�")){
- open(request,response,data1);//鍏ュ満寮�闂�
- }else {
- noOpen(request,response,data1);
+ if(!carNo.equals("鏃犺溅鐗�")){
+ open(request,response,data1);//鍏ュ満寮�闂�
+ }else {
+ noOpen(request,response,data1);
+ }
}
-
}
public void inLedFullShow(String ledId, String carNo, Integer parkId,HttpServletRequest request, HttpServletResponse response) throws IOException {
diff --git a/src/main/java/com/boying/job/PayResult2Scheduled.java b/src/main/java/com/boying/job/PayResult2Scheduled.java
index ba64efd..3adb776 100644
--- a/src/main/java/com/boying/job/PayResult2Scheduled.java
+++ b/src/main/java/com/boying/job/PayResult2Scheduled.java
@@ -15,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -36,7 +37,7 @@
Boolean taskFlag = false;
- //@Scheduled(cron = "0/2 * * * * ?")
+ @Scheduled(cron = "0/2 * * * * ?")
public void execute() throws Exception {
if(taskFlag == true){
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
--
Gitblit v1.9.1