修改

kongdeqiang

2023-09-22 4dfd3b17483445db01c894c253a1b692f01c0067

 src/main/java/com/boying/controller/phone/TicketController.java

@@ -10,6 +10,7 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -76,7 +77,7 @@
    public Object findPage(Page page, Ticket ticket){
        QueryWrapper<Ticket> wrapper =  new QueryWrapper<>();
        wrapper.lambda()
                .eq(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
                .like(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
                .eq(ticket.getType() != null,Ticket::getType,ticket.getType())
                .eq(ticket.getViolationTypeId() != null,Ticket::getViolationTypeId,ticket.getViolationTypeId())
                .eq(ticket.getPayStatus() != null,Ticket::getPayStatus,ticket.getPayStatus())
@@ -170,6 +171,21 @@
    public R getById(@PathVariable("id" ) Integer id) {
        Ticket byId = ticketService.getById(id);
        byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
        String shouQianMing = byId.getShouQianMing();
        String zfQianMing1 = byId.getZfQianMing1();
        String zfQianMing2 = byId.getZfQianMing2();
        if(StringUtils.isNotBlank(shouQianMing)){
            String get = FileUtil.netSourceToBase64(shouQianMing, "GET");
            byId.setShouQianMing("data:image/png;base64,"+get);
        }
        if(StringUtils.isNotBlank(zfQianMing1)){
            String get = FileUtil.netSourceToBase64(zfQianMing1, "GET");
            byId.setZfQianMing1("data:image/png;base64,"+get);
        }
        if(StringUtils.isNotBlank(zfQianMing2)){
            String get = FileUtil.netSourceToBase64(zfQianMing2, "GET");
            byId.setZfQianMing2("data:image/png;base64,"+get);
        }
        return R.ok(byId);
    }

@@ -189,23 +205,30 @@
            String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
            ticket.setMoneyStr(s.toString());
        }
        if(StringUtils.isBlank(ticket.getNumber())){
            ticket = ticketService.getNumber(ticket);
            ticket.setPush(0);
            ticketService.uploadInfo(ticket);
        if(ticket.getMoney() == 0){
            if(StringUtils.isNotBlank(ticket.getNumber())){
                ticket = ticketService.getNumber(ticket);
                ticket.setPush(0);
                ticketService.uploadInfo(ticket);
            }
        }
        if(StringUtils.isBlank(ticket.getZfName1())){
            ticket.setZfName1("王俊祥");
            ticket.setZfName2("张净雷");
            ticket.setZfNum1("03041699001");
            ticket.setZfNum2("03041618001");
            ticket.setZfQianMing1("http://127.0.0.1:8089/ffzf/fileinfo/showImg/wangjunxiang.png");
            ticket.setZfQianMing2("http://127.0.0.1:8089/ffzf/fileinfo/showImg/zhangjinglei.png");
        }
        ticketService.updateById(ticket);
        return R.ok();
    }

    //与执法对接
    @GetMapping("/getResult")
    public Object getResult(Ticket ticket){
        if(StringUtils.isNotBlank(ticket.getShouQianMing())){
            ticketService.updateById(ticket);
            return R.ok();
        }else {
            return R.failed("更新失败");
        }
        ticketService.updateById(ticket);
        return R.ok();
    }

    public void saveLogo(String name,String lng,String lat){
@@ -230,6 +253,7 @@
            tb.setCarType(ticket.getCarType());
            tb.setColor(ticket.getColor());
            tb.setViolationCount(1);
            tb.setIsActive(0);
            ticketBlackService.saveOrUpdate(tb);
        }else {
            TicketBlack ticketBlack = all.get(0);