kongdeqiang
2023-03-02 ee83188936c8ac306144f6c8cd119b6d7574dfc6
默认变更列表
14个文件已修改
382 ■■■■ 已修改文件
src/main/java/com/boying/Application.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/ParkController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/car/PlateServlet.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/car/PlateServlet2.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/controller/car/PlateServlet3.java 309 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/job/EticketScheduled.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/job/PayResultScheduled.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/service/impl/BarrierServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/service/impl/CostRuleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/util/DateUtilOther.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/util/MD5Util.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/util/ObjectToMapUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/util/StringUtil.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/boying/Application.java
@@ -1,10 +1,16 @@
package com.boying;
import cn.hutool.core.io.resource.ClassPathResource;
import net.sf.jni4net.Bridge;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
import java.io.File;
import java.io.IOException;
/**
 * @author kdq
@@ -19,4 +25,12 @@
    public static void main(String[] args) {
        SpringApplication.run(Application.class, args);
    }
    @Bean
    public static void getBean() throws IOException {
        Bridge.setVerbose(true);
        Bridge.init();
        File loadDll = new File("LedShow.j4n.dll");
        Bridge.LoadAndRegisterAssemblyFrom(loadDll);
    }
}
src/main/java/com/boying/controller/ParkController.java
@@ -109,7 +109,17 @@
            return R.ok(list);
        }
    }
    @PostMapping("/getById")
    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);
            byId.setCarNum(Integer.parseInt(s));
            return R.ok(byId,"查询成功");
        }
    }
    @PostMapping("/editParkCarNum")
    public Object editParkCarNum(Park park) {
        Park byId = parkService.getById(park.getId());
src/main/java/com/boying/controller/car/PlateServlet.java
@@ -37,7 +37,7 @@
 * Servlet implementation class PlateServlet
 */
@Controller
@RequestMapping("/car2")
@RequestMapping("/car1")
@RequiredArgsConstructor
public class PlateServlet extends HttpServlet {
    private static final long serialVersionUID = 1L;
src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -42,7 +42,7 @@
 * Servlet implementation class PlateServlet
 */
@Controller
@RequestMapping("/car")
@RequestMapping("/car2")
@RequiredArgsConstructor
public class PlateServlet2 extends HttpServlet {
    private static final long serialVersionUID = 1L;
src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -7,13 +7,14 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
import com.boying.entity.led.LedBean;
import com.boying.entity.led.ResultData;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
import com.boying.util.StringUtil;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import ledshow.CodeUtil;
import ledshow.LedBean;
import ledshow.ResultData;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Controller;
@@ -119,6 +120,14 @@
        out.close();
    }
    protected void easyNoOpen(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);
@@ -185,6 +194,8 @@
                }
            }
        }else {
            easyNoOpen(request,response);
        }
    }
    /**
@@ -250,9 +261,9 @@
                System.out.println("查询到道闸为:"+barrier);
                if(barrier==null){
                    s+="查询道闸为空\n";
                    easyNoOpen(request,response);
                }else{
                    if(barrier.getType()==0){
                        //noOpen(request,response);
                        outPark(license, barrier.getId(), barrier.getParkId(),request,response);
                        s+=license+"-保存出场记录\n";
                    }else{
@@ -281,6 +292,7 @@
            System.out.println("无入场记录");
            s+=" ,查询场内记录异常";
            writeTxt(s);
            easyNoOpen(request,response);
        }
    }
@@ -307,21 +319,21 @@
    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);
            }
        }
//        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);
@@ -338,9 +350,9 @@
        }
        enterParkService.saveOrUpdate(enterPark);
        Barrier barrier = barrierService.getById(barrierId);
        barrier.setType2(1);
        barrierService.saveOrUpdate(barrier);
//        Barrier barrier = barrierService.getById(barrierId);
//        barrier.setType2(1);
//        barrierService.saveOrUpdate(barrier);
    }
    public double outPark(String carNo,Integer barrierId,Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -478,42 +490,26 @@
        }
        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(1);
        ledBean.setDisMode2(1);
        ledBean.setDisMode3(1);
        ledBean.setDisMode4(1);
        ledBean.setVoiceContent(carType+","+carNo+","+carDay);
        String s = JSON.toJSONString(ledBean);
        String s1= HttpRequest.post(LEDURL)
                .timeout(5000)
                .body(s)
                .execute()
                .body();
        ResultData resultData = JSON.parseObject(s1,ResultData.class);
        String[] split = resultData.getDatas().split("-");
        String[] dataX = new String[resultData.getLenth()];
        System.arraycopy(split,0,dataX,0,resultData.getLenth());
        String s2 = StringUtil.toStr(dataX);
        byte[] bytes = StringUtil.HexString2Bytes(s2);
        for (byte aByte : bytes) {
            System.out.print(aByte+" ");
        }
        System.out.println();
        String data1 = new String("gb2312");
        data1 = Base64.getMimeEncoder().encodeToString(bytes);
       // String data2 = data1.replace("\n", "");
        String data3  = data1.replaceAll("\r\n", "");
        System.out.println();
        System.out.println(data3);
        open(request,response,data3);//入场开闸
        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);//入场开闸
    }
    public void inLedFullShow(String ledId, String carNo, Integer parkId,HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -538,28 +534,22 @@
        }
        LedBean ledBean = new LedBean();
        ledBean.setColor1(0);
        ledBean.setColor2(0);
        ledBean.setColor3(0);
        ledBean.setColor4(0);
        ledBean.setContent1(carNo);
        ledBean.setContent2(carType);
        ledBean.setContent3("车位已满");
        ledBean.setContent4("请驶离");
        ledBean.setDisMode1(1);
        ledBean.setDisMode2(1);
        ledBean.setDisMode3(1);
        ledBean.setDisMode4(1);
        ledBean.setVoiceContent("车位已满,请驶离");
        String s = JSON.toJSONString(ledBean);
        String s1= HttpRequest.post(LEDURL)
                .timeout(5000)
                .body(s)
                .execute()
                .body();
        ResultData resultData = JSON.parseObject(s1,ResultData.class);
        byte[] dataX = new byte[resultData.getLenth()];
        System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
        ledBean.setcolor1(0);
        ledBean.setcolor2(0);
        ledBean.setcolor3(0);
        ledBean.setcolor4(0);
        ledBean.setcontent1(carNo);
        ledBean.setcontent2(carType);
        ledBean.setcontent3("车位已满");
        ledBean.setcontent4("请驶离");
        ledBean.setdisMode1(0);
        ledBean.setdisMode2(0);
        ledBean.setdisMode3(0);
        ledBean.setdisMode4(0);
        ledBean.setvoiceContent("车位已满,请驶离");
        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", "");
@@ -569,28 +559,22 @@
    public void outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException {
        String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
        LedBean ledBean = new LedBean();
        ledBean.setColor1(0);
        ledBean.setColor2(0);
        ledBean.setColor3(0);
        ledBean.setColor4(0);
        ledBean.setContent1(carNo);
        ledBean.setContent2("停车"+timeStamp);
        ledBean.setContent3("交费"+price+"元");
        ledBean.setContent4("禁止闯杆");
        ledBean.setDisMode1(1);
        ledBean.setDisMode2(1);
        ledBean.setDisMode3(1);
        ledBean.setDisMode4(1);
        ledBean.setVoiceContent(carNo+"停车"+timeStamp+"交费"+price+"元");
        String s = JSON.toJSONString(ledBean);
        String s1= HttpRequest.post(LEDURL)
                .timeout(5000)
                .body(s)
                .execute()
                .body();
        ResultData resultData = JSON.parseObject(s1,ResultData.class);
        byte[] dataX = new byte[resultData.getLenth()];
        System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
        ledBean.setcolor1(0);
        ledBean.setcolor2(0);
        ledBean.setcolor3(0);
        ledBean.setcolor4(0);
        ledBean.setcontent1(carNo);
        ledBean.setcontent2("停车"+timeStamp);
        ledBean.setcontent3("交费"+price+"元");
        ledBean.setcontent4("禁止闯杆");
        ledBean.setdisMode1(0);
        ledBean.setdisMode2(1);
        ledBean.setdisMode3(1);
        ledBean.setdisMode4(0);
        ledBean.setvoiceContent(carNo+"停车"+timeStamp+"交费"+price+"元");
        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(type == 0){
@@ -614,28 +598,22 @@
    public void outLedShowYueZu(String carNo,String text,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException{
        String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
        LedBean ledBean = new LedBean();
        ledBean.setColor1(0);
        ledBean.setColor2(0);
        ledBean.setColor3(0);
        ledBean.setColor4(0);
        ledBean.setContent1(carNo);
        ledBean.setContent2(text);
        ledBean.setContent3("减速慢行");
        ledBean.setContent4("欢迎下次光临");
        ledBean.setDisMode1(1);
        ledBean.setDisMode2(1);
        ledBean.setDisMode3(1);
        ledBean.setDisMode4(1);
        ledBean.setVoiceContent(text+carNo+"欢迎下次光临");
        String s = JSON.toJSONString(ledBean);
        String s1= HttpRequest.post(LEDURL)
                .timeout(5000)
                .body(s)
                .execute()
                .body();
        ResultData resultData = JSON.parseObject(s1,ResultData.class);
        byte[] dataX = new byte[resultData.getLenth()];
        System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
        ledBean.setcolor1(0);
        ledBean.setcolor2(0);
        ledBean.setcolor3(0);
        ledBean.setcolor4(0);
        ledBean.setcontent1(carNo);
        ledBean.setcontent2(text);
        ledBean.setcontent3("减速慢行");
        ledBean.setcontent4("欢迎下次光临");
        ledBean.setdisMode1(0);
        ledBean.setdisMode2(0);
        ledBean.setdisMode3(0);
        ledBean.setdisMode4(1);
        ledBean.setvoiceContent(text+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", "");
        if(type == 0){
@@ -657,28 +635,22 @@
    public void outLedShowDefault(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
        LedBean ledBean = new LedBean();
        ledBean.setColor1(0);
        ledBean.setColor2(0);
        ledBean.setColor3(0);
        ledBean.setColor4(0);
        ledBean.setContent1("一车一杆");
        ledBean.setContent2("减速慢行");
        ledBean.setContent3("无需取卡");
        ledBean.setContent4("扫码缴费");
        ledBean.setDisMode1(1);
        ledBean.setDisMode2(1);
        ledBean.setDisMode3(1);
        ledBean.setDisMode4(1);
        ledBean.setVoiceContent("");
        String s = JSON.toJSONString(ledBean);
        String s1= HttpRequest.post(LEDURL)
                .timeout(5000)
                .body(s)
                .execute()
                .body();
        ResultData resultData = JSON.parseObject(s1,ResultData.class);
        byte[] dataX = new byte[resultData.getLenth()];
        System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
        ledBean.setcolor1(0);
        ledBean.setcolor2(0);
        ledBean.setcolor3(0);
        ledBean.setcolor4(0);
        ledBean.setcontent1("一车一杆");
        ledBean.setcontent2("减速慢行");
        ledBean.setcontent3("无需取卡");
        ledBean.setcontent4("扫码缴费");
        ledBean.setdisMode1(0);
        ledBean.setdisMode2(0);
        ledBean.setdisMode3(0);
        ledBean.setdisMode4(0);
        ledBean.setvoiceContent("");
        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);
@@ -686,37 +658,38 @@
    public void inLedShowDefault(Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
        String num = redisTemplate.opsForValue().get("car_park_" +  parkId);
        String con3 = "";
        String con4 = "";
        if(num == null){
            num = "0";
        }
        Park byId = parkService.getById(parkId);
        int i = byId.getNum() - Integer.parseInt(num);
        if(i<0){
        if(i<=0){
            i = 0;
            con3 = "车位已满";
            con4 = "请驶离";
        }else {
            con3 = "排队等候";
            con4 = "余位:"+i;
        }
        LedBean ledBean = new LedBean();
        ledBean.setColor1(0);
        ledBean.setColor2(0);
        ledBean.setColor3(0);
        ledBean.setColor4(0);
        ledBean.setContent1("一车一杆");
        ledBean.setContent2("减速慢行");
        ledBean.setContent3("排队等候");
        ledBean.setContent4("余位:"+i);
        ledBean.setDisMode1(1);
        ledBean.setDisMode2(1);
        ledBean.setDisMode3(1);
        ledBean.setDisMode4(1);
        ledBean.setVoiceContent("");
        String s = JSON.toJSONString(ledBean);
        String s1= HttpRequest.post(LEDURL)
                .timeout(5000)
                .body(s)
                .execute()
                .body();
        ResultData resultData = JSON.parseObject(s1,ResultData.class);
        byte[] dataX = new byte[resultData.getLenth()];
        System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
        ledBean.setcolor1(0);
        ledBean.setcolor2(0);
        ledBean.setcolor3(0);
        ledBean.setcolor4(0);
        ledBean.setcontent1("一车一杆");
        ledBean.setcontent2("减速慢行");
        ledBean.setcontent3(con3);
        ledBean.setcontent4(con4);
        ledBean.setdisMode1(0);
        ledBean.setdisMode2(0);
        ledBean.setdisMode3(0);
        ledBean.setdisMode4(0);
        ledBean.setvoiceContent("");
        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);
src/main/java/com/boying/job/EticketScheduled.java
@@ -115,7 +115,7 @@
                txt += map+",\n";
                if(entity.getBody().getCode() ==1 ){
                    //申请成功,去获取开票文件
                    System.out.println(entity.getBody());
                   // System.out.println(entity.getBody());
                    txt += entity.getBody()+",\n";
                    Object o = entity.getBody().getData().get(0);
                    String s = JSON.toJSONString(o);
@@ -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);
                }
src/main/java/com/boying/job/PayResultScheduled.java
@@ -92,7 +92,7 @@
        for (int i = 0; i < 10; i++) {
            String s= i+"";
            ThreadUtil.execute(() -> {
                System.out.println(s);
              //  System.out.println(s);
            });
        }
    }
src/main/java/com/boying/service/impl/BarrierServiceImpl.java
@@ -7,12 +7,15 @@
import com.boying.entity.Barrier;
import com.boying.entity.EnterPark;
import com.boying.entity.OutPark;
import com.boying.entity.Park;
import com.boying.mapper.BarrierMapper;
import com.boying.mapper.EnterParkMapper;
import com.boying.mapper.OutParkMapper;
import com.boying.mapper.ParkMapper;
import com.boying.service.BarrierService;
import com.boying.service.EnterParkService;
import lombok.AllArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.time.ZoneId;
@@ -31,6 +34,8 @@
public class BarrierServiceImpl extends ServiceImpl<BarrierMapper, Barrier> implements BarrierService {
    private EnterParkMapper enterParkMapper;
    private OutParkMapper outParkMapper;
    private StringRedisTemplate redisTemplate;
    private ParkMapper parkMapper;
    @Override
    public Barrier findByCode(String code) {
        QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
@@ -53,10 +58,21 @@
                .last(" limit 1");
        EnterPark enterPark = enterParkMapper.selectOne(wrapper);
        long dif = DateUtil.between(Date.from( enterPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
        if(dif >= 5 && dif <= 10){
        if(dif >= 5 && dif <= 7){
            return true;
        }else {
            return false;
            //判断停车场是否有了车位
            String num = redisTemplate.opsForValue().get("car_park_" +  enterPark.getParkId());
            if(num == null){
                num = "0";
            }
            Park byId = parkMapper.selectById(enterPark.getParkId());
            int i = byId.getNum() - Integer.parseInt(num);
            if(i<=0){
                return false;
            }else {
                return true;
            }
        }
    }
@@ -70,7 +86,7 @@
                .last(" limit 1");
        OutPark outPark = outParkMapper.selectOne(wrapper);
        long dif = DateUtil.between(Date.from( outPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
        if(dif >= 20 && dif <= 30){
        if(dif >= 20 && dif <= 23){
            return true;
        }else {
            return false;
src/main/java/com/boying/service/impl/CostRuleServiceImpl.java
@@ -513,6 +513,6 @@
    public static void main(String[] args) {
        System.out.println(((30*1.0)/30)>(30/30));
      //  System.out.println(((30*1.0)/30)>(30/30));
    }
}
src/main/java/com/boying/util/DateUtilOther.java
@@ -257,7 +257,7 @@
    }
    public static void main(String[] args) {
        System.out.println(millisToDayHrMinSec(1450));
       // System.out.println(millisToDayHrMinSec(1450));
    }
}
src/main/java/com/boying/util/MD5Util.java
@@ -62,7 +62,7 @@
            resultString = byteArrayToHexString(md.digest(resultString
                    .getBytes()));
        } catch (Exception ex) {
            System.out.println(ex);
            //System.out.println(ex);
        }
        return resultString;
    }
@@ -137,8 +137,8 @@
    public static void main(String[] args) {
        String s ="amt=1.00&notifyUrl=http://test/payNotify&payKey=3ed6f127559e4f2f80e5e1cb0231b76b&payerName=tom&payerNum=54c51b276a9a47329b295662122968e1&payerTypeCode=130000451000011&paySecret=492f497a17cc41d19a757ae9d5809238";
        System.out.println(encode(s));
        //System.out.println(encode(s));
        String s2="amt=1.00&notifyUrl=http://test/payNotify&payKey=3ed6f127559e4f2f80e5e1cb0231b76b&paySecret=492f497a17cc41d19a757ae9d5809238&payerName=峰峰&payerNum=3aa0f6499acb45f686b6442229d23b31&payerTypeCode=130000451000012";
        System.out.println(DigestUtils.md5DigestAsHex(s.toString().getBytes()));
        //System.out.println(DigestUtils.md5DigestAsHex(s.toString().getBytes()));
    }
}
src/main/java/com/boying/util/ObjectToMapUtil.java
@@ -15,7 +15,7 @@
        Class<?> aClass = obj.getClass();
        for (Field field : aClass.getDeclaredFields()) {
            field.setAccessible(true);
            System.out.println(field);
         //   System.out.println(field);
            String name = field.getName();
            Object o = field.get(obj);
            if (o == null)
src/main/java/com/boying/util/StringUtil.java
@@ -51,7 +51,6 @@
            }
            System.out.print(hex.toUpperCase() + " ");
        }
        System.out.println("");
    }
    /**
src/main/resources/application.yml
@@ -5,7 +5,7 @@
  datasource:
    url: jdbc:mysql://localhost:3306/ffparknew?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
    username: root
    password: rootroot
    password: 2009Boying!@#
    driverClassName: com.mysql.cj.jdbc.Driver
    #连接池
    hikari: