From e68a90d29289858e4106a0fb5e615408b41ea102 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期一, 18 三月 2024 13:45:37 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/car/PlateServlet2.java | 9
src/main/java/com/boying/controller/phone/TicketController.java | 30 +
src/main/java/com/boying/controller/car/PlateServlet3.java | 9
src/main/java/com/boying/entity/Ticket.java | 4
src/main/java/com/boying/job/YCGetEticketScheduled.java | 12
src/main/java/com/boying/controller/car/PlateServlet.java | 1202 +++++++++++++++++++++++++++---------------------------
src/main/java/com/boying/job/YCEticketScheduled.java | 14
src/main/java/com/boying/controller/phone/YCPayController.java | 12
src/main/java/com/boying/job/GetEticketScheduled.java | 6
src/main/java/com/boying/job/EticketScheduled.java | 14
10 files changed, 684 insertions(+), 628 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet.java b/src/main/java/com/boying/controller/car/PlateServlet.java
index 9fa4d11..bd6a911 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet.java
@@ -36,604 +36,604 @@
/**
* Servlet implementation class PlateServlet
*/
-@Controller
-@RequestMapping("/car1")
-@RequiredArgsConstructor
-public class PlateServlet extends HttpServlet {
- private static final long serialVersionUID = 1L;
- private final SystemConfigProperties systemConfigProperties;
- private final StringRedisTemplate redisTemplate;
- private final ParkService parkService;
- private final OutParkService outParkService;
- private final EnterParkService enterParkService;
- private final BarrierService barrierService;
- private final TicketService ticketService;
- private final CostRuleService costRuleService;
- private final LedShowService ledShowService;
- private final WhiteListService whiteListService;
-
- /**
- * 鍥炲寮�闂�
- */
- protected void open(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- response.setContentType("text/json");
- PrintWriter out = response.getWriter();
- out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}");
- out.flush();
- out.close();
- }
-
- //杞爜
- public static String deCode(String str) {
- try {
- byte[] b = str.getBytes("UTF-8");//锟斤拷锟斤拷
- String sa = new String(b);//锟斤拷锟斤拷:锟斤拷什么锟街凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞裁达拷址锟斤拷锟斤拷锟斤拷锟�
- //String sa = new String(str.getBytes());
-
- return sa;
- } catch (Exception e) {
- e.printStackTrace();
- return "";
- }
- }
-
- protected void noOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
- response.setContentType("text/json");
- PrintWriter out = response.getWriter();
- out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}");
- out.flush();
- out.close();
- }
-
- @PostMapping("/status")
- public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
- Barrier barrier = barrierService.findByCode(serialno);
- Park park = parkService.getById(barrier.getParkId());
- String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
- String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId());
- if(StringUtils.isBlank(redis) || redis.equals("false")){
- return;
- }
- if(barrier!=null){
- if(barrier.getType2()==1){
- open(request,response);
- if(barrier.getType() == 1){
- int i = Integer.parseInt(redisnum);
- i++;
- redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
- }else if(barrier.getType() == 0){
- int i = Integer.parseInt(redisnum);
- i--;
- if(i<0){
- redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
- }else {
- redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
- }
-
- }
- barrier.setType2(0);
- barrier.setUpdateTime(LocalDateTime.now());
- barrierService.saveOrUpdate(barrier);
- //outLedShowDefault(barrier.getCode(),barrier.getParkId());
- return;
- }
- barrier.setStatus(0);
- barrier.setUpdateTime(LocalDateTime.now());
- barrierService.saveOrUpdate(barrier);
-
- OutPark outPark = outParkService.count4(barrier.getId());
- if(outPark!=null){
- open(request,response);
- if(barrier.getType() == 0){
- int i = Integer.parseInt(redisnum);
- i--;
- if(i<0){
- redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
- }else {
- redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
- }
- }
- outPark.setStatus2(1);
- outParkService.saveOrUpdate(outPark);
- //outLedShowDefault(barrier.getCode(),barrier.getParkId());
-
- }else{
- noOpen(request,response);
- }
- }
- }
- /**
- * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- @PostMapping("/PlateServlet")
- protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String s= "";
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
- BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
- String str = "";
- String lineStr = "";
- while((str = reader.readLine()) != null){
- lineStr += str;
- }
- System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr);
-
- JSONObject jsonObject1 = JSON.parseObject(lineStr);
- JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate");
- JSONObject result = alarmInfoPlate.getJSONObject("result");
- JSONObject plateResult = result.getJSONObject("PlateResult");
- String carNo = plateResult.get("license").toString();
- String code = alarmInfoPlate.get("serialno").toString();
-
- try {
- JsonParser parser=new JsonParser();
- do {
- JsonObject jsonObject=(JsonObject) parser.parse(lineStr);
- if( jsonObject == null || jsonObject.isJsonNull() ) {
- break;
- }
-
- JsonObject jsonInfoPlate = jsonObject.get("AlarmInfoPlate").getAsJsonObject();
- if( jsonInfoPlate == null || jsonInfoPlate.isJsonNull() ) {
- break;
- }
-
- JsonObject jsonResult = jsonInfoPlate.get("result").getAsJsonObject();
- if( jsonResult == null || jsonResult.isJsonNull() ) {
- break;
- }
-
- JsonObject jsonPlateResult = jsonResult.get("PlateResult").getAsJsonObject();
- if( jsonPlateResult == null || jsonPlateResult.isJsonNull() ) {
- break;
- }
-
- String license = jsonPlateResult.get("license").getAsString();//杞︾墝鍙�
- if( license == null || license == "") {
- break;
- }
-
- String serialno = jsonInfoPlate.get("serialno").getAsString();//鎽勫儚鏈哄簭鍒楀彿
- if( serialno == null || serialno == "" ) {
- break;
- }
-
- System.out.println("缂栧彿锛�"+serialno+"璁惧璇嗗埆鍒颁簡锛�"+license);
- String format = sdf.format(new Date());
- s+= format+",杞︾墝鍙蜂负锛�"+license+",serialno涓猴細"+code+" ";
-
- Barrier barrier = barrierService.findByCode(code);
- System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier);
- if(barrier==null){
- s+="鏌ヨ閬撻椄涓虹┖\n";
- }else{
- if(barrier.getType()==0){
- //noOpen(request,response);
- outPark(license, barrier.getId(), barrier.getParkId());
- s+=license+"-淇濆瓨鍑哄満璁板綍\n";
- }else{
- String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
- if(StringUtils.isBlank(num)){
- num = "0";
- redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
- }
- Park byId = parkService.getById(barrier.getParkId());
- if(Integer.parseInt(num) >= byId.getNum() ){
- //led鏄剧ず
- Boolean aBoolean = inLedFullShow(code, license,barrier.getParkId());
- noOpen(request,response);
- }else {
- //led鏄剧ず
- Boolean aBoolean = inLedShow(code, license,barrier.getParkId());
- if(aBoolean){
- //鍏ュ満鎶潌
- open(request, response);
- enterPark(license,barrier.getId(),barrier.getParkId());
- s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
- }
- }
- }
- }
- writeTxt(s);
- }while(false);
- }
- catch (Exception e) {
- System.out.println("鏃犲叆鍦鸿褰�");
- s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父";
- writeTxt(s);
- }
- }
-
-
- private void writeTxt( String txt)
- {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- try
- {
- FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true);
- BufferedWriter bw=new BufferedWriter(f);
- bw.write(txt);
- bw.newLine();
- bw.close();
- }
- catch(Exception e)
- {
- System.out.println("鎵撳嵃閿欒");
- }
- }
-
-
-
-
- public void enterPark(String carNo,Integer barrierId,Integer parkId) {
- 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);
-
- 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);//鍙戠幇鏈夎繚绔�
- }
- enterParkService.saveOrUpdate(enterPark);
-
- Barrier barrier = barrierService.getById(barrierId);
- barrier.setType2(1);
- barrierService.saveOrUpdate(barrier);
- }
-
- public double outPark(String carNo,Integer barrierId,Integer parkId) {
- double money = 0.0;
- EnterPark enterPark = null;
- String toDayHrMinSec = null;
- OutPark outPark = new OutPark();
- outPark.setCarNo(carNo);
- outPark.setParkId(parkId);
- outPark.setBarrierId(barrierId);
- outPark.setCreateTime(LocalDateTime.now());
- outPark.setCode(System.currentTimeMillis()+"");
- List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo,parkId);
-
- if(byCarNo.size() == 0){
- System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�");
- }else{
- enterPark = byCarNo.get(0);
- System.out.println("鍏ュ満璁板綍锛�"+enterPark);
- outPark.setEnterTime(enterPark.getCreateTime());
- try {
- long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
- outPark.setTime(l/(1000*60));
- toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
- money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- }
- //outPark.setPrice(Double.valueOf(String.format("%.1f", money)));
- outPark.setPrice(money);
- outPark.setStatus3(findTicket(carNo));
- outParkService.saveOrUpdate(outPark);
- Barrier barrier =barrierService.getById(barrierId);
- barrier.setCarNo(carNo);
- //led灞曠ず
- if(toDayHrMinSec == null){
- toDayHrMinSec = "涓嶈冻涓ゅ皬鏃�";
- }
- //鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟
- QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(WhiteList::getCarNo,carNo);
- List<WhiteList> all = whiteListService.list(wrapper);
- if(all.size() >0){
- for(WhiteList w : all){
- if(w.getType()==0){
- outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
- barrier.setType2(1);
- barrierService.saveOrUpdate(barrier);
- OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
- outParkService.saveOrUpdate(byCarNoAndBarrierId);
- return 0.0;
- }else{
- if(w.getParkIds()!=null){
- if(w.getEndTime()!=null){
- String parkIds = w.getParkIds();
- String[] split = parkIds.split(",");
- for (String s : split) {
- int pid = Integer.parseInt(s);
- if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
- outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
- barrier.setType2(1);
- barrierService.saveOrUpdate(barrier);
- OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
- outParkService.saveOrUpdate(byCarNoAndBarrierId);
- return 0.0;
- }
- }
- }
- }
- }
- }
- }
- outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId());
- if(outPark.getPrice()==0&&outPark.getStatus3()==0){
- System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
- barrier.setType2(1);
- }
- barrierService.saveOrUpdate(barrier);
- return money;
- }
-
- public int findTicket(String carNo){
- QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Ticket::getCarNo,carNo)
- .eq(Ticket::getPayStatus,1);
- List<Ticket> tickets = ticketService.list(wrapper);
- if(tickets.size()>0){
- return 1;
- }else{
- return 0;
- }
- }
-
- public Boolean inLedShow(String ledId,String carNo,Integer parkId){
- String num = redisTemplate.opsForValue().get("car_park_" + parkId);
- Park byId = parkService.getById(parkId);
- 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 (byCarNo.getType() == 0){
- //鐧藉悕鍗曟案涔呰溅杈�
- carType = "鏈堢杞�";
- }else {
- //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
- carType = "鏈堢杞�";
- long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
- carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
- }
- }
- }
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- LedShow ledShow = new LedShow();
- ledShow.setLedId(ledId);
- ledShow.setNumber(parkId);
- ledShow.setStatus(1);
- ledShow.setType(2);
- ledShow.setName(barrier.getName());
- ledShow.setIsDefault(1);
- ledShow.setPassword("boying_ffpark");
- ledShow.setTimeStamp(sdf.format(new Date()));
- ledShow.setColor1(1);
- ledShow.setColor2(2);
- ledShow.setColor3(1);
- ledShow.setColor4(2);
- ledShow.setContent1(carNo);
- ledShow.setContent2(carType);
- ledShow.setContent3("杞︿綅鍓╀綑锛�"+i);
- ledShow.setContent4(carDay);
- ledShow.setDisMode1(0);
- ledShow.setDisMode2(0);
- ledShow.setDisMode3(1);
- ledShow.setDisMode4(1);
- ledShow.setStatus1(0);
- ledShow.setStatus2(0);
- ledShow.setStatus3(0);
- ledShow.setStatus4(0);
- if(barrier.getIpAddress() != null){
- ledShow.setIpAddress(barrier.getIpAddress());
- }
- if(barrier.getPort() != 0){
- ledShow.setPort(barrier.getPort());
- }
- ledShow.setVoiceContent(carNo+carType+"娆㈣繋杩涘満");
- return ledShowService.save(ledShow);
- }
-
- public Boolean inLedFullShow(String ledId, String carNo, Integer parkId){
- String carType = "";
- String carDay = "";
- Barrier barrier = barrierService.findByCode(ledId);
- WhiteList byCarNo = whiteListService.getByCarNo(carNo);
- if(byCarNo == null){
- carType = "涓存椂杞�";
- }else {
- if (byCarNo.getType() == 0){
- //鐧藉悕鍗曟案涔呰溅杈�
- carType = "鏈堢杞�";
- }else {
- //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
- carType = "鏈堢杞�";
- long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
- carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
- }
- }
- }
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- LedShow ledShow = new LedShow();
- ledShow.setLedId(ledId);
- ledShow.setNumber(parkId);
- ledShow.setStatus(1);
- ledShow.setType(2);
- ledShow.setName(barrier.getName());
- ledShow.setIsDefault(1);
- ledShow.setPassword("boying_ffpark");
- ledShow.setTimeStamp(sdf.format(new Date()));
- ledShow.setColor1(1);
- ledShow.setColor2(2);
- ledShow.setColor3(1);
- ledShow.setColor4(2);
- ledShow.setContent1(carNo);
- ledShow.setContent2(carType);
- ledShow.setContent3("杞︿綅宸叉弧");
- ledShow.setContent4("璇烽┒绂�");
- ledShow.setDisMode1(0);
- ledShow.setDisMode2(0);
- ledShow.setDisMode3(1);
- ledShow.setDisMode4(1);
- ledShow.setStatus1(0);
- ledShow.setStatus2(0);
- ledShow.setStatus3(0);
- ledShow.setStatus4(0);
- if(barrier.getIpAddress() != null){
- ledShow.setIpAddress(barrier.getIpAddress());
- }
- if(barrier.getPort() != 0){
- ledShow.setPort(barrier.getPort());
- }
- ledShow.setVoiceContent("杞︿綅宸叉弧璇烽┒绂�");
- return ledShowService.save(ledShow);
- }
-
- public Boolean outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId){
- Barrier barrier = barrierService.findByCode(ledId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- LedShow ledShow = new LedShow();
- ledShow.setLedId(ledId);
- ledShow.setNumber(parkId);
- ledShow.setStatus(1);
- ledShow.setType(2);
- ledShow.setName(barrier.getName());
- ledShow.setIsDefault(1);
- ledShow.setPassword("boying_ffpark");
- ledShow.setTimeStamp(sdf.format(new Date()));
- ledShow.setColor1(1);
- ledShow.setColor2(2);
- ledShow.setColor3(1);
- ledShow.setColor4(2);
- ledShow.setContent1(carNo);
- ledShow.setContent2("鍋滆溅"+timeStamp);
- ledShow.setContent3("浜よ垂"+price+"鍏�");
- ledShow.setContent4("绂佹闂潌");
- ledShow.setDisMode1(0);
- ledShow.setDisMode2(1);
- ledShow.setDisMode3(1);
- ledShow.setDisMode4(0);
- ledShow.setStatus1(0);
- ledShow.setStatus2(0);
- ledShow.setStatus3(0);
- ledShow.setStatus4(0);
- if(barrier.getIpAddress() != null){
- ledShow.setIpAddress(barrier.getIpAddress());
- }
- if(barrier.getPort() != 0){
- ledShow.setPort(barrier.getPort());
- }
- ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�");
- return ledShowService.save(ledShow);
- }
-
- public Boolean outLedShow2(String ledId,String carNo,String text,String timeStamp,Integer parkId){
- Barrier barrier = barrierService.findByCode(ledId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- LedShow ledShow = new LedShow();
- ledShow.setLedId(ledId);
- ledShow.setNumber(parkId);
- ledShow.setStatus(1);
- ledShow.setType(2);
- ledShow.setName(barrier.getName());
- ledShow.setIsDefault(1);
- ledShow.setPassword("boying_ffpark");
- ledShow.setTimeStamp(sdf.format(new Date()));
- ledShow.setColor1(1);
- ledShow.setColor2(2);
- ledShow.setColor3(1);
- ledShow.setColor4(2);
- ledShow.setContent1(carNo);
- ledShow.setContent2("鍋滆溅"+timeStamp);
- ledShow.setContent3(text);
- ledShow.setContent4("绂佹闂潌");
- ledShow.setDisMode1(0);
- ledShow.setDisMode2(1);
- ledShow.setDisMode3(1);
- ledShow.setDisMode4(0);
- ledShow.setStatus1(0);
- ledShow.setStatus2(0);
- ledShow.setStatus3(0);
- ledShow.setStatus4(0);
- if(barrier.getIpAddress() != null){
- ledShow.setIpAddress(barrier.getIpAddress());
- }
- if(barrier.getPort() != 0){
- ledShow.setPort(barrier.getPort());
- }
- ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp);
- return ledShowService.save(ledShow);
- }
-
- public Boolean outLedShowDefault(String ledId,Integer parkId){
- Barrier barrier = barrierService.findByCode(ledId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- LedShow ledShow = new LedShow();
- ledShow.setLedId(ledId);
- ledShow.setNumber(parkId);
- ledShow.setStatus(1);
- ledShow.setType(2);
- ledShow.setName(barrier.getName());
- ledShow.setIsDefault(1);
- ledShow.setPassword("boying_ffpark");
- ledShow.setTimeStamp(sdf.format(new Date()));
- ledShow.setColor1(1);
- ledShow.setColor2(1);
- ledShow.setColor3(1);
- ledShow.setColor4(1);
- ledShow.setContent1("娆㈣繋鍏変复");
- ledShow.setContent2("涓�杞︿竴鏉�");
- ledShow.setContent3("鍑忛�熸參琛�");
- ledShow.setContent4("瀹夊叏琛岄┒");
- ledShow.setDisMode1(0);
- ledShow.setDisMode2(0);
- ledShow.setDisMode3(0);
- ledShow.setDisMode4(0);
- ledShow.setStatus1(0);
- ledShow.setStatus2(0);
- ledShow.setStatus3(0);
- ledShow.setStatus4(0);
- if(barrier.getIpAddress() != null){
- ledShow.setIpAddress(barrier.getIpAddress());
- }
- if(barrier.getPort() != 0){
- ledShow.setPort(barrier.getPort());
- }
- ledShow.setVoiceContent("");
- return ledShowService.save(ledShow);
- }
-
-}
+//@Controller
+//@RequestMapping("/car1")
+//@RequiredArgsConstructor
+//public class PlateServlet extends HttpServlet {
+// private static final long serialVersionUID = 1L;
+// private final SystemConfigProperties systemConfigProperties;
+// private final StringRedisTemplate redisTemplate;
+// private final ParkService parkService;
+// private final OutParkService outParkService;
+// private final EnterParkService enterParkService;
+// private final BarrierService barrierService;
+// private final TicketService ticketService;
+// private final CostRuleService costRuleService;
+// private final LedShowService ledShowService;
+// private final WhiteListService whiteListService;
+//
+// /**
+// * 鍥炲寮�闂�
+// */
+// protected void open(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+// response.setContentType("text/json");
+// PrintWriter out = response.getWriter();
+// out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}");
+// out.flush();
+// out.close();
+// }
+//
+// //杞爜
+// public static String deCode(String str) {
+// try {
+// byte[] b = str.getBytes("UTF-8");//锟斤拷锟斤拷
+// String sa = new String(b);//锟斤拷锟斤拷:锟斤拷什么锟街凤拷锟斤拷锟斤拷锟斤拷锟斤拷锟绞裁达拷址锟斤拷锟斤拷锟斤拷锟�
+// //String sa = new String(str.getBytes());
+//
+// return sa;
+// } catch (Exception e) {
+// e.printStackTrace();
+// return "";
+// }
+// }
+//
+// protected void noOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
+// response.setContentType("text/json");
+// PrintWriter out = response.getWriter();
+// out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}");
+// out.flush();
+// out.close();
+// }
+//
+// @PostMapping("/status")
+// public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
+// Barrier barrier = barrierService.findByCode(serialno);
+// Park park = parkService.getById(barrier.getParkId());
+// String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
+// String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId());
+// if(StringUtils.isBlank(redis) || redis.equals("false")){
+// return;
+// }
+// if(barrier!=null){
+// if(barrier.getType2()==1){
+// open(request,response);
+// if(barrier.getType() == 1){
+// int i = Integer.parseInt(redisnum);
+// i++;
+// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+// }else if(barrier.getType() == 0){
+// int i = Integer.parseInt(redisnum);
+// i--;
+// if(i<0){
+// redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
+// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+// }else {
+// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+// }
+//
+// }
+// barrier.setType2(0);
+// barrier.setUpdateTime(LocalDateTime.now());
+// barrierService.saveOrUpdate(barrier);
+// //outLedShowDefault(barrier.getCode(),barrier.getParkId());
+// return;
+// }
+// barrier.setStatus(0);
+// barrier.setUpdateTime(LocalDateTime.now());
+// barrierService.saveOrUpdate(barrier);
+//
+// OutPark outPark = outParkService.count4(barrier.getId());
+// if(outPark!=null){
+// open(request,response);
+// if(barrier.getType() == 0){
+// int i = Integer.parseInt(redisnum);
+// i--;
+// if(i<0){
+// redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
+// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+// }else {
+// redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+// redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+// }
+// }
+// outPark.setStatus2(1);
+// outParkService.saveOrUpdate(outPark);
+// //outLedShowDefault(barrier.getCode(),barrier.getParkId());
+//
+// }else{
+// noOpen(request,response);
+// }
+// }
+// }
+// /**
+// * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+// */
+// @PostMapping("/PlateServlet")
+// protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+// String s= "";
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+// BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
+// String str = "";
+// String lineStr = "";
+// while((str = reader.readLine()) != null){
+// lineStr += str;
+// }
+// System.out.println("鑾峰彇鍒扮殑閬撻椄鎺ㄩ�佹暟鎹负锛�"+lineStr);
+//
+// JSONObject jsonObject1 = JSON.parseObject(lineStr);
+// JSONObject alarmInfoPlate = jsonObject1.getJSONObject("AlarmInfoPlate");
+// JSONObject result = alarmInfoPlate.getJSONObject("result");
+// JSONObject plateResult = result.getJSONObject("PlateResult");
+// String carNo = plateResult.get("license").toString();
+// String code = alarmInfoPlate.get("serialno").toString();
+//
+// try {
+// JsonParser parser=new JsonParser();
+// do {
+// JsonObject jsonObject=(JsonObject) parser.parse(lineStr);
+// if( jsonObject == null || jsonObject.isJsonNull() ) {
+// break;
+// }
+//
+// JsonObject jsonInfoPlate = jsonObject.get("AlarmInfoPlate").getAsJsonObject();
+// if( jsonInfoPlate == null || jsonInfoPlate.isJsonNull() ) {
+// break;
+// }
+//
+// JsonObject jsonResult = jsonInfoPlate.get("result").getAsJsonObject();
+// if( jsonResult == null || jsonResult.isJsonNull() ) {
+// break;
+// }
+//
+// JsonObject jsonPlateResult = jsonResult.get("PlateResult").getAsJsonObject();
+// if( jsonPlateResult == null || jsonPlateResult.isJsonNull() ) {
+// break;
+// }
+//
+// String license = jsonPlateResult.get("license").getAsString();//杞︾墝鍙�
+// if( license == null || license == "") {
+// break;
+// }
+//
+// String serialno = jsonInfoPlate.get("serialno").getAsString();//鎽勫儚鏈哄簭鍒楀彿
+// if( serialno == null || serialno == "" ) {
+// break;
+// }
+//
+// System.out.println("缂栧彿锛�"+serialno+"璁惧璇嗗埆鍒颁簡锛�"+license);
+// String format = sdf.format(new Date());
+// s+= format+",杞︾墝鍙蜂负锛�"+license+",serialno涓猴細"+code+" ";
+//
+// Barrier barrier = barrierService.findByCode(code);
+// System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier);
+// if(barrier==null){
+// s+="鏌ヨ閬撻椄涓虹┖\n";
+// }else{
+// if(barrier.getType()==0){
+// //noOpen(request,response);
+// outPark(license, barrier.getId(), barrier.getParkId());
+// s+=license+"-淇濆瓨鍑哄満璁板綍\n";
+// }else{
+// String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
+// if(StringUtils.isBlank(num)){
+// num = "0";
+// redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
+// redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
+// }
+// Park byId = parkService.getById(barrier.getParkId());
+// if(Integer.parseInt(num) >= byId.getNum() ){
+// //led鏄剧ず
+// Boolean aBoolean = inLedFullShow(code, license,barrier.getParkId());
+// noOpen(request,response);
+// }else {
+// //led鏄剧ず
+// Boolean aBoolean = inLedShow(code, license,barrier.getParkId());
+// if(aBoolean){
+// //鍏ュ満鎶潌
+// open(request, response);
+// enterPark(license,barrier.getId(),barrier.getParkId());
+// s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
+// }
+// }
+// }
+// }
+// writeTxt(s);
+// }while(false);
+// }
+// catch (Exception e) {
+// System.out.println("鏃犲叆鍦鸿褰�");
+// s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父";
+// writeTxt(s);
+// }
+// }
+//
+//
+// private void writeTxt( String txt)
+// {
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+// try
+// {
+// FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true);
+// BufferedWriter bw=new BufferedWriter(f);
+// bw.write(txt);
+// bw.newLine();
+// bw.close();
+// }
+// catch(Exception e)
+// {
+// System.out.println("鎵撳嵃閿欒");
+// }
+// }
+//
+//
+//
+//
+// public void enterPark(String carNo,Integer barrierId,Integer parkId) {
+// 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);
+//
+// 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);//鍙戠幇鏈夎繚绔�
+// }
+// enterParkService.saveOrUpdate(enterPark);
+//
+// Barrier barrier = barrierService.getById(barrierId);
+// barrier.setType2(1);
+// barrierService.saveOrUpdate(barrier);
+// }
+//
+// public double outPark(String carNo,Integer barrierId,Integer parkId) {
+// double money = 0.0;
+// EnterPark enterPark = null;
+// String toDayHrMinSec = null;
+// OutPark outPark = new OutPark();
+// outPark.setCarNo(carNo);
+// outPark.setParkId(parkId);
+// outPark.setBarrierId(barrierId);
+// outPark.setCreateTime(LocalDateTime.now());
+// outPark.setCode(System.currentTimeMillis()+"");
+// List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo,parkId);
+//
+// if(byCarNo.size() == 0){
+// System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�");
+// }else{
+// enterPark = byCarNo.get(0);
+// System.out.println("鍏ュ満璁板綍锛�"+enterPark);
+// outPark.setEnterTime(enterPark.getCreateTime());
+// try {
+// long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+// outPark.setTime(l/(1000*60));
+// toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
+// money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+//
+// }
+// //outPark.setPrice(Double.valueOf(String.format("%.1f", money)));
+// outPark.setPrice(money);
+// outPark.setStatus3(findTicket(carNo));
+// outParkService.saveOrUpdate(outPark);
+// Barrier barrier =barrierService.getById(barrierId);
+// barrier.setCarNo(carNo);
+// //led灞曠ず
+// if(toDayHrMinSec == null){
+// toDayHrMinSec = "涓嶈冻涓ゅ皬鏃�";
+// }
+// //鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟
+// QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
+// wrapper.lambda()
+// .eq(WhiteList::getCarNo,carNo);
+// List<WhiteList> all = whiteListService.list(wrapper);
+// if(all.size() >0){
+// for(WhiteList w : all){
+// if(w.getType()==0){
+// outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
+// barrier.setType2(1);
+// barrierService.saveOrUpdate(barrier);
+// OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
+// byCarNoAndBarrierId.setStatus(1);
+// outParkService.saveOrUpdate(byCarNoAndBarrierId);
+// return 0.0;
+// }else{
+// if(w.getParkIds()!=null){
+// if(w.getEndTime()!=null){
+// String parkIds = w.getParkIds();
+// String[] split = parkIds.split(",");
+// for (String s : split) {
+// int pid = Integer.parseInt(s);
+// if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
+// outLedShow2(barrier.getCode(),barrier.getCarNo(),"鏈堢杞�",toDayHrMinSec,barrier.getParkId());
+// barrier.setType2(1);
+// barrierService.saveOrUpdate(barrier);
+// OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
+// byCarNoAndBarrierId.setStatus(1);
+// outParkService.saveOrUpdate(byCarNoAndBarrierId);
+// return 0.0;
+// }
+// }
+// }
+// }
+// }
+// }
+// }
+// outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId());
+// if(outPark.getPrice()==0&&outPark.getStatus3()==0){
+// System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
+// barrier.setType2(1);
+// }
+// barrierService.saveOrUpdate(barrier);
+// return money;
+// }
+//
+// public int findTicket(String carNo){
+// QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
+// wrapper.lambda()
+// .eq(Ticket::getCarNo,carNo)
+// .eq(Ticket::getPayStatus,1);
+// List<Ticket> tickets = ticketService.list(wrapper);
+// if(tickets.size()>0){
+// return 1;
+// }else{
+// return 0;
+// }
+// }
+//
+// public Boolean inLedShow(String ledId,String carNo,Integer parkId){
+// String num = redisTemplate.opsForValue().get("car_park_" + parkId);
+// Park byId = parkService.getById(parkId);
+// 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 (byCarNo.getType() == 0){
+// //鐧藉悕鍗曟案涔呰溅杈�
+// carType = "鏈堢杞�";
+// }else {
+// //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
+// if(byCarNo.getParkId().equals(barrier.getParkId())){
+// carType = "鏈堢杞�";
+// long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
+// carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+// }
+// }
+// }
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// LedShow ledShow = new LedShow();
+// ledShow.setLedId(ledId);
+// ledShow.setNumber(parkId);
+// ledShow.setStatus(1);
+// ledShow.setType(2);
+// ledShow.setName(barrier.getName());
+// ledShow.setIsDefault(1);
+// ledShow.setPassword("boying_ffpark");
+// ledShow.setTimeStamp(sdf.format(new Date()));
+// ledShow.setColor1(1);
+// ledShow.setColor2(2);
+// ledShow.setColor3(1);
+// ledShow.setColor4(2);
+// ledShow.setContent1(carNo);
+// ledShow.setContent2(carType);
+// ledShow.setContent3("杞︿綅鍓╀綑锛�"+i);
+// ledShow.setContent4(carDay);
+// ledShow.setDisMode1(0);
+// ledShow.setDisMode2(0);
+// ledShow.setDisMode3(1);
+// ledShow.setDisMode4(1);
+// ledShow.setStatus1(0);
+// ledShow.setStatus2(0);
+// ledShow.setStatus3(0);
+// ledShow.setStatus4(0);
+// if(barrier.getIpAddress() != null){
+// ledShow.setIpAddress(barrier.getIpAddress());
+// }
+// if(barrier.getPort() != 0){
+// ledShow.setPort(barrier.getPort());
+// }
+// ledShow.setVoiceContent(carNo+carType+"娆㈣繋杩涘満");
+// return ledShowService.save(ledShow);
+// }
+//
+// public Boolean inLedFullShow(String ledId, String carNo, Integer parkId){
+// String carType = "";
+// String carDay = "";
+// Barrier barrier = barrierService.findByCode(ledId);
+// WhiteList byCarNo = whiteListService.getByCarNo(carNo);
+// if(byCarNo == null){
+// carType = "涓存椂杞�";
+// }else {
+// if (byCarNo.getType() == 0){
+// //鐧藉悕鍗曟案涔呰溅杈�
+// carType = "鏈堢杞�";
+// }else {
+// //鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
+// if(byCarNo.getParkId().equals(barrier.getParkId())){
+// carType = "鏈堢杞�";
+// long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
+// carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+// }
+// }
+// }
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// LedShow ledShow = new LedShow();
+// ledShow.setLedId(ledId);
+// ledShow.setNumber(parkId);
+// ledShow.setStatus(1);
+// ledShow.setType(2);
+// ledShow.setName(barrier.getName());
+// ledShow.setIsDefault(1);
+// ledShow.setPassword("boying_ffpark");
+// ledShow.setTimeStamp(sdf.format(new Date()));
+// ledShow.setColor1(1);
+// ledShow.setColor2(2);
+// ledShow.setColor3(1);
+// ledShow.setColor4(2);
+// ledShow.setContent1(carNo);
+// ledShow.setContent2(carType);
+// ledShow.setContent3("杞︿綅宸叉弧");
+// ledShow.setContent4("璇烽┒绂�");
+// ledShow.setDisMode1(0);
+// ledShow.setDisMode2(0);
+// ledShow.setDisMode3(1);
+// ledShow.setDisMode4(1);
+// ledShow.setStatus1(0);
+// ledShow.setStatus2(0);
+// ledShow.setStatus3(0);
+// ledShow.setStatus4(0);
+// if(barrier.getIpAddress() != null){
+// ledShow.setIpAddress(barrier.getIpAddress());
+// }
+// if(barrier.getPort() != 0){
+// ledShow.setPort(barrier.getPort());
+// }
+// ledShow.setVoiceContent("杞︿綅宸叉弧璇烽┒绂�");
+// return ledShowService.save(ledShow);
+// }
+//
+// public Boolean outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId){
+// Barrier barrier = barrierService.findByCode(ledId);
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// LedShow ledShow = new LedShow();
+// ledShow.setLedId(ledId);
+// ledShow.setNumber(parkId);
+// ledShow.setStatus(1);
+// ledShow.setType(2);
+// ledShow.setName(barrier.getName());
+// ledShow.setIsDefault(1);
+// ledShow.setPassword("boying_ffpark");
+// ledShow.setTimeStamp(sdf.format(new Date()));
+// ledShow.setColor1(1);
+// ledShow.setColor2(2);
+// ledShow.setColor3(1);
+// ledShow.setColor4(2);
+// ledShow.setContent1(carNo);
+// ledShow.setContent2("鍋滆溅"+timeStamp);
+// ledShow.setContent3("浜よ垂"+price+"鍏�");
+// ledShow.setContent4("绂佹闂潌");
+// ledShow.setDisMode1(0);
+// ledShow.setDisMode2(1);
+// ledShow.setDisMode3(1);
+// ledShow.setDisMode4(0);
+// ledShow.setStatus1(0);
+// ledShow.setStatus2(0);
+// ledShow.setStatus3(0);
+// ledShow.setStatus4(0);
+// if(barrier.getIpAddress() != null){
+// ledShow.setIpAddress(barrier.getIpAddress());
+// }
+// if(barrier.getPort() != 0){
+// ledShow.setPort(barrier.getPort());
+// }
+// ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�");
+// return ledShowService.save(ledShow);
+// }
+//
+// public Boolean outLedShow2(String ledId,String carNo,String text,String timeStamp,Integer parkId){
+// Barrier barrier = barrierService.findByCode(ledId);
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// LedShow ledShow = new LedShow();
+// ledShow.setLedId(ledId);
+// ledShow.setNumber(parkId);
+// ledShow.setStatus(1);
+// ledShow.setType(2);
+// ledShow.setName(barrier.getName());
+// ledShow.setIsDefault(1);
+// ledShow.setPassword("boying_ffpark");
+// ledShow.setTimeStamp(sdf.format(new Date()));
+// ledShow.setColor1(1);
+// ledShow.setColor2(2);
+// ledShow.setColor3(1);
+// ledShow.setColor4(2);
+// ledShow.setContent1(carNo);
+// ledShow.setContent2("鍋滆溅"+timeStamp);
+// ledShow.setContent3(text);
+// ledShow.setContent4("绂佹闂潌");
+// ledShow.setDisMode1(0);
+// ledShow.setDisMode2(1);
+// ledShow.setDisMode3(1);
+// ledShow.setDisMode4(0);
+// ledShow.setStatus1(0);
+// ledShow.setStatus2(0);
+// ledShow.setStatus3(0);
+// ledShow.setStatus4(0);
+// if(barrier.getIpAddress() != null){
+// ledShow.setIpAddress(barrier.getIpAddress());
+// }
+// if(barrier.getPort() != 0){
+// ledShow.setPort(barrier.getPort());
+// }
+// ledShow.setVoiceContent(carNo+"鍋滆溅"+timeStamp);
+// return ledShowService.save(ledShow);
+// }
+//
+// public Boolean outLedShowDefault(String ledId,Integer parkId){
+// Barrier barrier = barrierService.findByCode(ledId);
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// LedShow ledShow = new LedShow();
+// ledShow.setLedId(ledId);
+// ledShow.setNumber(parkId);
+// ledShow.setStatus(1);
+// ledShow.setType(2);
+// ledShow.setName(barrier.getName());
+// ledShow.setIsDefault(1);
+// ledShow.setPassword("boying_ffpark");
+// ledShow.setTimeStamp(sdf.format(new Date()));
+// ledShow.setColor1(1);
+// ledShow.setColor2(1);
+// ledShow.setColor3(1);
+// ledShow.setColor4(1);
+// ledShow.setContent1("娆㈣繋鍏変复");
+// ledShow.setContent2("涓�杞︿竴鏉�");
+// ledShow.setContent3("鍑忛�熸參琛�");
+// ledShow.setContent4("瀹夊叏琛岄┒");
+// ledShow.setDisMode1(0);
+// ledShow.setDisMode2(0);
+// ledShow.setDisMode3(0);
+// ledShow.setDisMode4(0);
+// ledShow.setStatus1(0);
+// ledShow.setStatus2(0);
+// ledShow.setStatus3(0);
+// ledShow.setStatus4(0);
+// if(barrier.getIpAddress() != null){
+// ledShow.setIpAddress(barrier.getIpAddress());
+// }
+// if(barrier.getPort() != 0){
+// ledShow.setPort(barrier.getPort());
+// }
+// ledShow.setVoiceContent("");
+// return ledShowService.save(ledShow);
+// }
+//
+//}
diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index 1d17a39..302f3a5 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -17,6 +17,8 @@
import com.sun.media.jfxmedia.track.Track;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -46,7 +48,10 @@
@RequiredArgsConstructor
public class PlateServlet2 extends HttpServlet {
private static final long serialVersionUID = 1L;
- private final SystemConfigProperties systemConfigProperties;
+ @Value("${ffpark.logPath}")
+ private String logPath;
+// @Autowired
+// private final SystemConfigProperties systemConfigProperties;
private final StringRedisTemplate redisTemplate;
private final ParkService parkService;
private final OutParkService outParkService;
@@ -294,7 +299,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
try
{
- FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true);
+ FileWriter f = new FileWriter(logPath+sdf.format(new Date())+".txt",true);
BufferedWriter bw=new BufferedWriter(f);
bw.write(txt);
bw.newLine();
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index d8761fa..fc8ce0c 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -60,6 +60,7 @@
private final WhiteListService whiteListService;
private final FileInfoService fileInfoService;
private final TicketBlackService ticketBlackService;
+ private final OutParkLogService outParkLogService;
private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
/**
@@ -196,6 +197,10 @@
outPark.setStatus2(1);
outParkService.saveOrUpdate(outPark);
easyOpen(request,response);
+ easyOpen(request,response);
+ OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+ byOutPark.setOpenTime(LocalDateTime.now());
+ outParkLogService.saveOrUpdate(byOutPark);
enterParkService.deleteByCarNo(outPark.getCarNo(), barrier.getParkId());
}
if(barrier.getType() == 1){
@@ -615,6 +620,10 @@
System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
String s= "1."+barrier.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
writeTxt2(s);
+ OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+ byOutPark.setOutTime(outPark.getCreateTime());
+ byOutPark.setParkId(outPark.getParkId());
+ outParkLogService.saveOrUpdate(byOutPark);
outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1);
}
barrierService.saveOrUpdate(barrier);
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 2253d66..9c4c681 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -141,6 +141,25 @@
if(StringUtils.isNotBlank(ticket.getLng())&&StringUtils.isNotBlank(ticket.getLat())){
saveLogo(ticket.getAddress(),ticket.getLng(),ticket.getLat());
}
+ if(ticket.getType() == 2){
+ try {
+ ticket.setPayStatus(1);
+ QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(TicketBlack::getCarNo,ticket.getCarNo());
+ List<TicketBlack> list = ticketBlackService.list(wrapper);
+ if(list.size()>0){
+ for (TicketBlack ticketBlack : list) {
+ ticketBlackService.removeById(ticketBlack.getId());
+ }
+ }
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
return R.ok(ticket);
}
@@ -202,6 +221,15 @@
Ticket ticket =ticketService.getById(id);
ticket.setStatus(3);
ticketService.saveOrUpdate(ticket);
+ QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(TicketBlack::getCarNo,ticket.getCarNo());
+ List<TicketBlack> list = ticketBlackService.list(wrapper);
+ if(list.size()>0){
+ for (TicketBlack ticketBlack : list) {
+ ticketBlackService.removeById(ticketBlack.getId());
+ }
+ }
return R.ok("鎿嶄綔鎴愬姛");
}
@@ -213,7 +241,7 @@
ticket.setMoneyStr(s.toString());
}
if(ticket.getMoney() == 0){
- if(StringUtils.isNotBlank(ticket.getNumber())){
+ if(StringUtils.isBlank(ticket.getNumber())){
ticket = ticketService.getNumber(ticket);
ticket.setPush(0);
ticketService.uploadInfo(ticket);
diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 349ba82..368f811 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -59,6 +59,7 @@
private final WhiteListService whiteListService;
private final EnterParkService enterParkService;
private final WXService wxService;
+ private final OutParkLogService outParkLogService;
/**
* 鏌ヨ璁㈠崟鎺ュ彛
@@ -187,6 +188,9 @@
if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 0){
String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+outPark.getCarNo()+",鐢宠缂磋垂2------銆媆n";
writeTxt(logs);
+ OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+ byOutPark.setPayStartTime(LocalDateTime.now());
+ outParkLogService.saveOrUpdate(byOutPark);
return R.ok(null,"璺宠浆閭㈠彴閾惰鏀粯");
}else if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 1){
return R.failed("宸茬即璐�");
@@ -204,6 +208,9 @@
}else {
outPark.setPrice(outPark.getPrice()-enterPark.getPrice());
outParkService.updateById(outPark);
+ OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+ byOutPark.setPayStartTime(LocalDateTime.now());
+ outParkLogService.saveOrUpdate(byOutPark);
}
}
}
@@ -452,6 +459,9 @@
if(byPayCode.getStatus() == 1){
return R.ok(null,"璁㈠崟宸叉敮浠�");
}else {
+ OutParkLog byOutPark = outParkLogService.getByOutPark(byPayCode.getCarNo(), byPayCode.getId());
+ byOutPark.setPayEndTime(LocalDateTime.now());
+ outParkLogService.saveOrUpdate(byOutPark);
updateOrderRecord((long)byPayCode.getId(),"03");
List<EnterPark> byCarNo = enterParkService.findByCarNo(byPayCode.getCarNo(),byPayCode.getParkId());
if(byCarNo.size()>0){
@@ -666,7 +676,7 @@
//鏇存柊鍑哄満
public void updateOutPark(Integer outParkId, String status){
OutPark outPark = outParkService.getById(outParkId);
- if(outPark!=null){
+ if(outPark!=null && outPark.getEnterTime() !=null){
if(status.equals("03")){
outPark.setStatus(1);
outParkService.saveOrUpdate(outPark);
diff --git a/src/main/java/com/boying/entity/Ticket.java b/src/main/java/com/boying/entity/Ticket.java
index e95d49f..1226013 100644
--- a/src/main/java/com/boying/entity/Ticket.java
+++ b/src/main/java/com/boying/entity/Ticket.java
@@ -23,8 +23,8 @@
@TableName("ticket")
@javax.persistence.Table(name = "ticket")
@Entity
-@org.hibernate.annotations.Table(appliesTo = "ticket", comment = "绁ㄦ嵁琛�")
-@ApiModel(value = "琛楅亾琛�")
+@org.hibernate.annotations.Table(appliesTo = "ticket", comment = "缃氬崟琛�")
+@ApiModel(value = "缃氬崟琛�")
public class Ticket extends BaseEntity<Ticket> {
/**
diff --git a/src/main/java/com/boying/job/EticketScheduled.java b/src/main/java/com/boying/job/EticketScheduled.java
index eb28bd6..a1ac40a 100644
--- a/src/main/java/com/boying/job/EticketScheduled.java
+++ b/src/main/java/com/boying/job/EticketScheduled.java
@@ -52,10 +52,10 @@
taskFlag = true;
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(OrderRecord::getStatus,1)
- .eq(OrderRecord::getType,1)
- .eq(OrderRecord::getTicketStatus,0)
- .orderByDesc(OrderRecord::getCreateTime);
+// .eq(OrderRecord::getStatus,1)
+// .eq(OrderRecord::getType,1)
+// .eq(OrderRecord::getTicketStatus,0)
+ .orderByDesc(OrderRecord::getCreateTime).eq(OrderRecord::getId,25230);
List<OrderRecord> list = orderRecordService.list(wrapper);
if(list.size() > 0){
if(list.size() > 50){
@@ -86,8 +86,8 @@
info.setOrdernum(1);
info.setAmt(orderRecord.getMoney());
info.setAmount(1);
- info.setIncitemcode("072101");
- info.setIncitemname("鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�");
+ info.setIncitemcode("050114");
+ info.setIncitemname("浜ら�氱綒娌�");
infos.add(info);
//list杞琷son
Gson gson = new Gson();
@@ -130,7 +130,7 @@
writeTxt(txt);
orderRecordService.saveOrUpdate(orderRecord);
}else {
- // System.out.println(entity.getBody());
+ System.out.println(entity.getBody());
txt += entity.getBody()+",\n";
writeTxt(txt);
}
diff --git a/src/main/java/com/boying/job/GetEticketScheduled.java b/src/main/java/com/boying/job/GetEticketScheduled.java
index 1461264..7d8bbde 100644
--- a/src/main/java/com/boying/job/GetEticketScheduled.java
+++ b/src/main/java/com/boying/job/GetEticketScheduled.java
@@ -50,9 +50,7 @@
// .eq(OrderRecord::getTicketStatus, 0)
// .isNotNull(OrderRecord::getEinvoicecode)
// .orderByDesc(OrderRecord::getCreateTime);
- .in(OrderRecord::getPayCode,"13040623000000055070","13040623000000062406","13040623000000232508","13040623000000363081","13040623000000242992","13040623000000319574","13040623000000362919","13040623000000154458","13040623000000151150",
- "13040623000000155450","13040623000000241009","13040623000000363014","13040623000000220187","13040623000000231732","13040623000000362898","13040623000000362900","13040623000000362951","13040623000000153156","13040623000000150991",
- "13040623000000327435","13040623000000226482");
+ .in(OrderRecord::getPayCode, "13040623000000327435","13040623000000462573");
List<OrderRecord> list = orderRecordService.list(wrapper);
if (list.size() > 0) {
if (list.size() > 50) {
@@ -88,7 +86,7 @@
writeTxt(txt);
doTicketGet(mapTypes,orderRecord);
}else {
- // System.out.println(entity.getBody());
+ System.out.println(entity.getBody());
txt += "鏌ヨ鏈夎锛�"+entity.getBody()+"\n";
writeTxt(txt);
}
diff --git a/src/main/java/com/boying/job/YCEticketScheduled.java b/src/main/java/com/boying/job/YCEticketScheduled.java
index 32f6305..2bd09b6 100644
--- a/src/main/java/com/boying/job/YCEticketScheduled.java
+++ b/src/main/java/com/boying/job/YCEticketScheduled.java
@@ -52,11 +52,12 @@
return;
}
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(OrderRecord::getTicketStatus, 2)
- .eq(OrderRecord::getType,1)
- .isNotNull(OrderRecord::getEinvoicecode)
- .orderByDesc(OrderRecord::getCreateTime);
+// wrapper.lambda()
+// .eq(OrderRecord::getTicketStatus, 2)
+// .eq(OrderRecord::getType,1)
+// .isNotNull(OrderRecord::getEinvoicecode)
+// .orderByDesc(OrderRecord::getCreateTime);
+ wrapper.lambda().eq(OrderRecord::getId,16501);
List<OrderRecord> list = orderRecordService.list(wrapper);
if (list.size() > 0) {
if (list.size() > 50) {
@@ -65,6 +66,9 @@
//寮�鍙栧彂绁�
for (OrderRecord orderRecord : list) {
// System.out.println("姝ｅ湪鐢宠寮�绁ㄦ枃浠讹細" + orderRecord);
+ if(orderRecord.getFileId() != null){
+ continue;
+ }
doTicket(orderRecord);
}
}
diff --git a/src/main/java/com/boying/job/YCGetEticketScheduled.java b/src/main/java/com/boying/job/YCGetEticketScheduled.java
index 6de0746..ba7746d 100644
--- a/src/main/java/com/boying/job/YCGetEticketScheduled.java
+++ b/src/main/java/com/boying/job/YCGetEticketScheduled.java
@@ -44,10 +44,11 @@
return;
}
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(OrderRecord::getTicketStatus, 2)
- .eq(OrderRecord::getType,1)
- .orderByDesc(OrderRecord::getCreateTime);
+// wrapper.lambda()
+// .eq(OrderRecord::getTicketStatus, 2)
+// .eq(OrderRecord::getType,1)
+// .orderByDesc(OrderRecord::getCreateTime);
+ wrapper.lambda().eq(OrderRecord::getId,16501);
List<OrderRecord> list = orderRecordService.list(wrapper);
if (list.size() > 0) {
if (list.size() > 50) {
@@ -99,7 +100,8 @@
directTicket.setChecker("涔斿畞");
directTicket.setPayinfo(json);
directTicket.setState(1);
- directTicket.setBilltypeid("1252");
+ directTicket.setBilltypeid("1252"); // 鐢宠缂存鐮佷负1252锛岀即娆剧爜涓�1230
+ //directTicket.setBilltypeid("1230");
String jsonStr = JSON.toJSONString(directTicket, SerializerFeature.WriteDateUseDateFormat);
Map<String, Object> map = JSON.parseObject(jsonStr, new TypeReference<Map<String, Object>>() {});
--
Gitblit v1.9.1