From 4f27e2a21aa7c0cbd07447b43fc3b83fd1525f88 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期一, 10 七月 2023 15:07:25 +0800 Subject: [PATCH] 修改 --- src/main/java/com/boying/controller/phone/TicketController.java | 7 ++ src/main/java/com/boying/entity/TicketBlack.java | 6 ++ src/main/java/com/boying/controller/TicketBlackController.java | 96 ++++++++++++++++++++++++++++++++ src/main/java/com/boying/util/FileUtil.java | 37 ++++++++++++ 4 files changed, 146 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/boying/controller/TicketBlackController.java b/src/main/java/com/boying/controller/TicketBlackController.java new file mode 100644 index 0000000..4dc166f --- /dev/null +++ b/src/main/java/com/boying/controller/TicketBlackController.java @@ -0,0 +1,96 @@ +package com.boying.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.*; +import com.boying.util.DateUtilOther; +import com.boying.util.FileUtil; +import com.boying.util.NumberToCN; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.util.*; + +@RestController +@RequestMapping("ffzf/ticketblack") +@RequiredArgsConstructor +public class TicketBlackController { + + + private final TicketService ticketService; + + private final ViolationTypeService violationTypeService; + + private final TicketBlackService ticketBlackService; + + + @PostMapping("findPage") + public Object findPage(Page page, TicketBlack ticket){ + QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(StringUtils.isNotBlank(ticket.getCarNo()),TicketBlack::getCarNo,ticket.getCarNo()) + .eq(ticket.getIsActive() != null,TicketBlack::getIsActive,ticket.getIsActive()) + .orderByDesc(TicketBlack::getCreateTime); + return R.ok(ticketBlackService.page(page, wrapper)); + } + + @PostMapping("/save") + public Object save(TicketBlack ticket) throws IOException{ + QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(TicketBlack::getCarNo,ticket.getCarNo()); + List<TicketBlack> list = ticketBlackService.list(wrapper); + if(list.size()>0){ + return R.failed("姝よ溅杈嗗凡瀛樺湪榛戝悕鍗�"); + } + ticket.setIsActive(1); + ticket.setViolationCount(0); + ticketBlackService.save(ticket); + return R.ok(); + } + + /** + * 閫氳繃id鏌ヨ绁ㄦ嵁琛� + * @param id id + * @return R + */ + @ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ") + @GetMapping("/{id}" ) + public R getById(@PathVariable("id" ) Integer id) { + TicketBlack byId = ticketBlackService.getById(id); + return R.ok(byId); + } + + + @PostMapping("/delete") + public Object delete(Long id){ + TicketBlack ticket =ticketBlackService.getById(id); + ticketBlackService.saveOrUpdate(ticket); + return R.ok("鎿嶄綔鎴愬姛"); + } + + @PostMapping("/updateById") + public Object updateById(TicketBlack ticket){ + return R.ok( ticketBlackService.updateById(ticket)); + } + + +} diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java index 3b8aea8..5d26b5f 100644 --- a/src/main/java/com/boying/controller/phone/TicketController.java +++ b/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; @@ -170,6 +171,11 @@ public R getById(@PathVariable("id" ) Integer id) { Ticket byId = ticketService.getById(id); byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent()); + String shouQianMing = byId.getShouQianMing(); + if(shouQianMing != null){ + String get = FileUtil.netSourceToBase64(shouQianMing, "GET"); + byId.setShouQianMing(get); + } return R.ok(byId); } @@ -230,6 +236,7 @@ tb.setCarType(ticket.getCarType()); tb.setColor(ticket.getColor()); tb.setViolationCount(1); + tb.setIsActive(0); ticketBlackService.saveOrUpdate(tb); }else { TicketBlack ticketBlack = all.get(0); diff --git a/src/main/java/com/boying/entity/TicketBlack.java b/src/main/java/com/boying/entity/TicketBlack.java index 5800a53..eabb73d 100644 --- a/src/main/java/com/boying/entity/TicketBlack.java +++ b/src/main/java/com/boying/entity/TicketBlack.java @@ -52,4 +52,10 @@ * 榛戝悕鍗曪紙0锛氫笉鏄� 1锛氭槸锛� */ private int blackType; + + /** + * 鏄惁涓诲姩娣诲姞锛�0锛氫笉鏄� 1锛氭槸锛� + */ + private Integer isActive; + } diff --git a/src/main/java/com/boying/util/FileUtil.java b/src/main/java/com/boying/util/FileUtil.java index 4708cbd..7affa1d 100644 --- a/src/main/java/com/boying/util/FileUtil.java +++ b/src/main/java/com/boying/util/FileUtil.java @@ -10,8 +10,11 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Encoder; import java.io.*; +import java.net.HttpURLConnection; +import java.net.URL; import java.util.Objects; import java.util.UUID; @@ -109,4 +112,38 @@ } } + public static String netSourceToBase64(String srcUrl,String requestMethod) { + ByteArrayOutputStream outPut = new ByteArrayOutputStream(); + byte[] data = new byte[1024 * 8]; + try { + // 鍒涘缓URL + URL url = new URL(srcUrl); + // 鍒涘缓閾炬帴 + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod(requestMethod); + conn.setConnectTimeout(10 * 1000); + + if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) { + //杩炴帴澶辫触/閾炬帴澶辨晥/鏂囦欢涓嶅瓨鍦� + return null; + } + InputStream inStream = conn.getInputStream(); + int len = -1; + while (-1 != (len = inStream.read(data))) { + outPut.write(data, 0, len); + } + inStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + // 瀵瑰瓧鑺傛暟缁凚ase64缂栫爜 + BASE64Encoder encoder = new BASE64Encoder(); + return encoder.encode(outPut.toByteArray()); + } + + public static void main(String[] args) { + String get = netSourceToBase64("http://192.168.0.121:9999/admin/sys-file/platform/20230704154745.png", "GET"); + System.out.println(get); + } + } -- Gitblit v1.9.1