提交更新

kongdeqiang

2023-11-02 d6a127f4da8a9662e77364be002054870a5fcc4b

提交更新

 src/main/java/com/boying/common/SystemConfigProperties.java

@@ -1,11 +1,14 @@
package com.boying.common;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;


@Configuration
@Component
@Data
public class SystemConfigProperties {


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

@@ -55,6 +55,7 @@
    @PostMapping("/findPage")
    public Object findPage(Page page, String  carNo,Long parkId,String  payCode,String date) throws ParseException {
        List<OutPark> list = outParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId,payCode, date);
        System.out.println(list);
        long count = outParkService.getCount(carNo,parkId,payCode, date);
        for (OutPark record : list) {
            record.setParkName(parkService.getById(record.getParkId()).getName());
@@ -82,6 +83,7 @@
       QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
       wrapper.lambda()
               .eq(Barrier::getCode2,code);
        System.out.println("code   :" +code);
        List<Barrier> all = barrierService.list(wrapper);
        if(all.size()==0){
            return R.failed("未找到该设备");
@@ -107,6 +109,7 @@
    //道闸code
    @PostMapping("/findByBarrierCode2")
    public Object findById2(String code2) {
        System.out.println("code2     :"+code2);
        QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Barrier::getCode2,code2);

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

@@ -16,6 +16,7 @@
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +51,7 @@
    private final TicketService ticketService;
    private final TicketBlackService ticketBlackService;
    private final OutParkService outParkService;
    @Autowired
    private final SystemConfigProperties systemConfigProperties;
    private final ParkService parkService;
    private final WhiteListService whiteListService;
@@ -540,7 +542,7 @@
            if(status.equals("03")){
                ticket.setPayStatus(1);
                dealCar(ticket.getCarNo());
                if(StringUtils.isNotBlank(ticket.getNumber())){
                if(StringUtils.isBlank(ticket.getNumber()) || "--".equals(ticket.getNumber())){
                    ticket = ticketService.getNumber(ticket);
                    ticket.setPush(0);
                    ticketService.uploadInfo(ticket);

 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,7 +134,7 @@

        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);
        }

@@ -155,7 +162,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);
@@ -220,6 +227,9 @@
            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.setNumber("--");
        }
        ticketService.updateById(ticket);
        return R.ok();
    }

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

@@ -16,6 +16,7 @@
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

@@ -52,6 +53,7 @@
    private final OrderRecordService orderRecordService;
    private final TicketService ticketService;
    private final TicketBlackService ticketBlackService;

    private final SystemConfigProperties systemConfigProperties;
    private final WhiteListService whiteListService;
    private final EnterParkService enterParkService;
@@ -149,6 +151,7 @@
    public Object parkXT(Long id){
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
        OutPark outPark =  outParkService.getById(id);
        System.out.println("id:"+id);
        if(outPark.getPrice()==0){
            updateOutPark(outPark.getId(),"03");
            return R.failed("本次停车无需支付费用");
@@ -296,6 +299,7 @@
     */
    @PostMapping("payByWX")
    public Object payByWX(Long id,String openId){
        System.out.println("开始支付");
        OutPark outPark =  outParkService.getById(id);
        String xtyhpay = systemConfigProperties.getXTYHPAY();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");

 src/main/java/com/boying/job/PayResult2Scheduled.java

@@ -49,6 +49,7 @@
                .ne(Ticket::getStatus,3)
                .eq(Ticket::getPayStatus,0)
                .ne(Ticket::getMoney,0)
                .ne(Ticket::getPayCode,"")
                .isNotNull(Ticket::getPayCode)
                .orderByDesc(Ticket::getCreateTime);
        List<Ticket> list = ticketService.list(wrapper);

 src/main/java/com/boying/job/YCEticketScheduled.java

@@ -45,7 +45,7 @@
    private SystemConfigProperties systemConfigProperties;
    private Boolean taskFlag = false;

    @Scheduled(cron = "0 0/1 * * * ?")
    //@Scheduled(cron = "0 0/1 * * * ?")
    public void execute() throws Exception {
        if (taskFlag == true) {
            System.out.println("正在运行，强制退出-------》");

 src/main/java/com/boying/job/YCGetEticketScheduled.java

@@ -37,7 +37,7 @@
    private SystemConfigProperties systemConfigProperties;
    private Boolean taskFlag = false;

    @Scheduled(cron = "0 0/1 * * * ?")
    //@Scheduled(cron = "0 0/1 * * * ?")
    public void execute() throws Exception {
        if (taskFlag == true) {
            System.out.println("正在运行，强制退出-------》");

 src/main/java/com/boying/service/impl/WXServiceImpl.java

@@ -43,6 +43,8 @@
                        String openId = jsonObject.getString("openid");
                        //拉取用户信息
                        //getUserMsg(access_token, openId);
                        System.out.println("codeOpen:"+code);
                        System.out.println("openid:"+openId);
                        return openId;
                    } catch (Exception e) {
                        e.printStackTrace();