fix：新增手动抬杆记录

kongdeqiang

2024-04-09 fb050c0dafa5363a73540dd9e52b78487e25ba0a

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

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
import com.boying.common.SystemConfigProperties;

import com.boying.entity.*;
import com.boying.service.*;
@@ -17,6 +16,8 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -42,7 +43,13 @@

    private final TicketService ticketService;

    private final SystemConfigProperties systemConfigProperties;
    @Value("${ffpark.uploadPath}")
    private String uploadImgPath;
    @Value("${ffpark.ip2}")
    private String ip2;

//    @Autowired
//    private final SystemConfigProperties systemConfigProperties;

    private final UserService userService;

@@ -61,7 +68,7 @@
    public void getAwardAsByteArray(HttpServletResponse response, HttpServletRequest request) throws IOException {
        String result = request.getParameter("result");
        InputStream in = null;
        in = FileUtils.openInputStream(new File(systemConfigProperties.getUploadImgPath()+result));
        in = FileUtils.openInputStream(new File(uploadImgPath+result));
        response.setContentType(MediaType.IMAGE_PNG_VALUE);
        ServletOutputStream out = response.getOutputStream();
        try {
@@ -96,7 +103,7 @@
            if(multipartFile != null){
                String fileExtension = FilenameUtils.getExtension(multipartFile.getOriginalFilename());//获取后缀
                String newFileName = System.currentTimeMillis() + "." + fileExtension;//图片名称
                String newFilePath = systemConfigProperties.getUploadImgPath() + newFileName;//上传路径
                String newFilePath = uploadImgPath + newFileName;//上传路径
                File destFile = new File(newFilePath);
                FileUtils.writeByteArrayToFile(destFile, multipartFile.getBytes());
                if(i != imgs.size()-1){
@@ -127,12 +134,31 @@

        ticketService.saveOrUpdate(ticket);
        if(StringUtils.isBlank(ticket.getQrUrl())){
            ticket.setQrUrl(systemConfigProperties.getIp2()+"#/index?id="+ticket.getId());
            ticket.setQrUrl(ip2+"#/index?id="+ticket.getId());
            ticketService.saveOrUpdate(ticket);
        }

        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);
    }
@@ -155,7 +181,7 @@
        updateBlackTicket(ticket);

        ticketService.saveOrUpdate(ticket);
        ticket.setQrUrl(systemConfigProperties.getIp2()+"#/index?id="+ticket.getId());
        ticket.setQrUrl(ip2+"#/index?id="+ticket.getId());
        ticket.setType(1);
        ticketService.saveOrUpdate(ticket);
        return R.ok(ticket);
@@ -174,15 +200,15 @@
        String shouQianMing = byId.getShouQianMing();
        String zfQianMing1 = byId.getZfQianMing1();
        String zfQianMing2 = byId.getZfQianMing2();
        if(shouQianMing != null){
        if(StringUtils.isNotBlank(shouQianMing)){
            String get = FileUtil.netSourceToBase64(shouQianMing, "GET");
            byId.setShouQianMing("data:image/png;base64,"+get);
        }
        if(zfQianMing1 != null){
        if(StringUtils.isNotBlank(zfQianMing1)){
            String get = FileUtil.netSourceToBase64(zfQianMing1, "GET");
            byId.setZfQianMing1("data:image/png;base64,"+get);
        }
        if(zfQianMing2 != null){
        if(StringUtils.isNotBlank(zfQianMing2)){
            String get = FileUtil.netSourceToBase64(zfQianMing2, "GET");
            byId.setZfQianMing2("data:image/png;base64,"+get);
        }
@@ -195,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("操作成功");
    }

@@ -205,33 +240,33 @@
            String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
            ticket.setMoneyStr(s.toString());
        }
        if(ticket.getMoney() == 0){
            if(StringUtils.isBlank(ticket.getNumber())){
                ticket = ticketService.getNumber(ticket);
                ticket.setPush(0);
                ticketService.uploadInfo(ticket);
            }
        }
        if(StringUtils.isBlank(ticket.getZfName1())){
            ticket.setZfName1("王俊详");
            ticket.setZfName1("张净雷");
            ticket.setZfName1("王俊祥");
            ticket.setZfName2("张净雷");
            ticket.setZfNum1("03041699001");
            ticket.setZfNum2("03041618001");
            ticket.setZfQianMing1("http://183.196.93.178:8089/ffzf/fileinfo/showImg/wangjunxiang.png");
            ticket.setZfQianMing2("http://183.196.93.178:8089/ffzf/fileinfo/showImg/zhangjinglei.png");
            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");
        }
        if(StringUtils.isBlank(ticket.getNumber())){
            ticket = ticketService.getNumber(ticket);
            ticket.setPush(0);
            ticketService.uploadInfo(ticket);
        }else {
            ticketService.updateById(ticket);
            ticket.setNumber("--");
        }
        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){