From 15b3290a092ea16be998d5ce3c1df06ec3752bb5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期二, 15 八月 2023 10:37:54 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 285 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 172 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 56584f7..612d1e5 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";
/**
@@ -225,7 +227,7 @@
while((str = reader.readLine()) != null){
lineStr += str;
}
- System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr);
+ // System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr);
JSONObject jsonObject1 = JSON.parseObject(lineStr);
JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate");
@@ -338,18 +340,36 @@
if(Integer.parseInt(num) >= byId.getNum() ){
return R.failed(null,"绂佹閫氳,杞︿綅宸叉弧");
}else {
- enterPark.setCreateTime(LocalDateTime.now());
- 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<EnterPark> wrapper2 = new QueryWrapper<>();
+ wrapper2.lambda()
+ .eq(EnterPark::getBarrierId,barrier.getId())
+ .orderByDesc(EnterPark::getCreateTime)
+ .last(" limit 1");
+ EnterPark one = enterParkService.getOne(wrapper2);
+ if(one == null){
+ return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
+ }else {
+ if(one.getCarNo().equals("鏃犵墝杞�")){
+ enterPark.setCreateTime(LocalDateTime.now());
+ 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);//鍙戠幇鏈夎繚绔�
+ }
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
+ enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
+ enterParkService.save(enterPark);
+ barrier.setType2(1);
+ barrierService.updateById(barrier);
+ return R.ok();
+ }else {
+ return R.failed("闈炴硶鎿嶄綔");
+ }
}
- enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
- enterParkService.save(enterPark);
- return R.ok();
}
}
return R.failed(null,"鏁版嵁寮傚父");
@@ -391,6 +411,15 @@
outPark.setTime(l/(1000*60));
toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
money = costRuleService.getMoney(one.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(one.getIsPay()==1){
+ money = money - one.getPrice();
+ }else {
+ one.setPrice(money);
+ one.setIsPay(0);
+ enterParkService.updateById(one);
+ }
} catch (ParseException e) {
e.printStackTrace();
}
@@ -462,44 +491,31 @@
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.setIsPay(0);
+ enterPark.setPrice(0);
+ 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 {
@@ -525,6 +541,15 @@
outPark.setTime(l/(1000*60));
toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(enterPark.getIsPay() != null && enterPark.getIsPay()==1){
+ money = money - enterPark.getPrice();
+ }else {
+ enterPark.setPrice(money);
+ enterPark.setIsPay(0);
+ enterParkService.updateById(enterPark);
+ }
} catch (ParseException e) {
e.printStackTrace();
}
@@ -553,7 +578,7 @@
if(w.getType()==0){
outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
+ byCarNoAndBarrierId.setStatus(2);
byCarNoAndBarrierId.setStatus2(1);
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
@@ -567,7 +592,7 @@
if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
+ byCarNoAndBarrierId.setStatus(2);
byCarNoAndBarrierId.setStatus2(1);
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
@@ -609,63 +634,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)){
- 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", "");
- open(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 {
@@ -735,21 +790,25 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
if(type == 0){
- //寮�闂�
- open(request,response,data1);
- redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
- int i = Integer.parseInt(redisnum);
- i--;
- if(i<0){
- String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
- writeTxt2(s);
- redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ if(carNo.equals("鏃犺溅鐗�")){
+ noOpen(request,response,data1);
}else {
- String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
- writeTxt2(s);
- redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ //寮�闂�
+ open(request,response,data1);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
}
}else {
noOpen(request,response,data1);
--
Gitblit v1.9.1