修改规则和出场日志

kongdeqiang

2022-09-18 3343bf1c7b1b9369ff4e56b7929c0eeac4b9ab63

修改规则和出场日志

 src/main/java/com/boying/controller/OutParkController.java

@@ -215,6 +215,8 @@

    @PostMapping("outPark2")
    public Object outPark(String carNo,Long barrierId,Long parkId,String code2) {
        String s = "开始执行出场接口------>";
        System.out.println(s);
        Barrier barrier1 = findBarrier(code2);
        barrierId = barrier1.getId();
        parkId = barrier1.getParkId();
@@ -227,15 +229,21 @@
        EnterPark enterPark = enterParkService.findByCarNo(carNo);

        if(enterPark==null){
            String s1 = "未发现入场车辆："+carNo;
            System.out.println(s1);
            return error("无进场记录或手机号进出输入不一致",null);
        }else{
            String s1 = "发现入场车辆: "+enterPark.getCarNo()+",道闸id为："+enterPark.getBarrierId()+",停车场id："+enterPark.getParkId()+",违章标识："+enterPark.getStatus();
            System.out.println(s1);
            outPark.setEnterTime(enterPark.getCreateTime());
        }
        long l = outPark.getCreateTime().getTime() - enterPark.getCreateTime().getTime();
        System.out.println("场内时长为："+l+"毫秒,合计为: "+l/(1000*60)+"秒");
        outPark.setTime(l/(1000*60));
        double money = 0;
        try {
            money = costRuleService.getMoney(parkId, enterPark.getCreateTime(), outPark.getCreateTime(), 1);
            System.out.println("金额为："+money);
        } catch (ParseException e) {
            e.printStackTrace();
        }

 src/main/java/com/boying/service/CostRuleService.java

@@ -274,10 +274,16 @@
    public double money(long l,Double cost,Integer maxCost){
        l=l/1000/60;
        int time = 0;
        if(((l*1.0)/60)>(l/60)){//判断停车时间是否要加1
            time = Long.valueOf(l / 60 + 1).intValue();
//        if(((l*1.0)/60)>(l/60)){//判断停车时间是否要加1
//            time = Long.valueOf(l / 60 + 1).intValue();
//        }else{
//            time = Long.valueOf(l / 60).intValue();
//        }

        if(((l*1.0)/30)>(l/30)){//判断停车时间是否要加1
            time = Long.valueOf(l / 30 + 1).intValue();
        }else{
            time = Long.valueOf(l / 60).intValue();
            time = Long.valueOf(l / 30).intValue();
        }
        if(maxCost!=null){
            if(time*cost>maxCost){//大于封顶价格