From 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 10:52:29 +0800
Subject: [PATCH] Merge branch 'master2'
---
src/main/java/com/boying/controller/phone/TicketController.java | 132 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 124 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 4bfa776..6e17f23 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -5,17 +5,21 @@
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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
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;
@@ -28,17 +32,27 @@
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@RequestMapping("ffzf/ticket")
@RequiredArgsConstructor
+@Tag(description = "ffzf/ticket" , name = "鎵嬫寔寮�缃氬崟鎺ュ彛" )
public class TicketController{
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;
@@ -54,10 +68,11 @@
//鍥剧墖鍥炴樉
@RequestMapping(value = "/showImg", method = RequestMethod.GET)
+ @Operation(summary = "鍥剧墖鍥炴樉" , description = "鍥剧墖鍥炴樉" )
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 {
@@ -70,10 +85,11 @@
}
@PostMapping("findPage")
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
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())
@@ -83,6 +99,7 @@
}
@PostMapping("/save")
+ @Operation(summary = "淇濆瓨缃氬崟" , description = "淇濆瓨缃氬崟" )
public Object save(Ticket ticket,HttpServletRequest request) throws IOException{
String imgStr = "";
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -92,7 +109,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){
@@ -123,17 +140,37 @@
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);
}
@PostMapping("/save2")
+ @Operation(summary = "淇濆瓨缃氬崟锛堝簾寮冿級" , description = "淇濆瓨缃氬崟锛堝簾寮冿級" )
public Object save2(Ticket ticket) throws IOException{
if(ticket.getUserId()!=null){
User user = userService.getById(ticket.getUserId());
@@ -151,7 +188,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);
@@ -164,29 +201,83 @@
*/
@ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
@GetMapping("/{id}" )
+ @Operation(summary = "閫氳繃id鏌ヨ缃氬崟" , description = "閫氳繃id鏌ヨ缃氬崟" )
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);
}
@PostMapping("/delete")
+ @Operation(summary = "鍒犻櫎缃氬崟" , description = "鍒犻櫎缃氬崟" )
public Object delete(Long id){
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("鎿嶄綔鎴愬姛");
}
@PostMapping("/updateById")
+ @Operation(summary = "鏇存柊缃氬崟鐘舵��" , description = "鏇存柊缃氬崟鐘舵��" )
public Object updateById(Ticket ticket){
if(ticket.getMoney() >0){
BigDecimal numberOfMoney = new BigDecimal(ticket.getMoney()+"");
String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
ticket.setMoneyStr(s.toString());
}
- return R.ok(ticketService.updateById(ticket));
+ 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.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");
+ }
+ if(StringUtils.isBlank(ticket.getNumber())){
+ ticket.setNumber("--");
+ }
+ ticketService.updateById(ticket);
+ return R.ok();
+ }
+
+ //涓庢墽娉曞鎺�
+ @GetMapping("/getResult")
+ @Operation(summary = "涓庢墽娉曞钩鍙板鎺ワ紝鑾峰彇绛惧瓧缁撴灉" , description = "涓庢墽娉曞钩鍙板鎺ワ紝鑾峰彇绛惧瓧缁撴灉" )
+ public Object getResult(Ticket ticket){
+ ticketService.updateById(ticket);
+ return R.ok();
}
public void saveLogo(String name,String lng,String lat){
@@ -211,6 +302,7 @@
tb.setCarType(ticket.getCarType());
tb.setColor(ticket.getColor());
tb.setViolationCount(1);
+ tb.setIsActive(0);
ticketBlackService.saveOrUpdate(tb);
}else {
TicketBlack ticketBlack = all.get(0);
@@ -221,6 +313,7 @@
}
@PostMapping("/getZhiFa")
+ @Operation(summary = "鏍规嵁鐘舵�佹煡璇㈢綒鍗�" , description = "鏍规嵁鐘舵�佹煡璇㈢綒鍗�" )
public Object getZhiFa(Integer status,Page page){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
@@ -232,6 +325,7 @@
}
@PostMapping("/getCar")
+ @Operation(summary = "鑾峰彇榛戝悕鍗曡溅杈�" , description = "鑾峰彇榛戝悕鍗曡溅杈�" )
public Object getCar(String carNo,Page page,int type){
QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -242,6 +336,7 @@
}
@PostMapping("/getCarList")
+ @Operation(summary = "鏍规嵁杞︾墝鍒嗛〉鑾峰彇缃氬崟" , description = "鏍规嵁杞︾墝鍒嗛〉鑾峰彇缃氬崟" )
public Object getCarList(String carNo,Page page){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -252,6 +347,7 @@
@PostMapping("/noFound")
+ @Operation(summary = "鏇存柊缃氬崟鐘舵�侊紝澧炲姞澶囨敞" , description = "鏇存柊缃氬崟鐘舵�侊紝澧炲姞澶囨敞" )
public Object noFound(Long ticketId,String remark){
Ticket ticket = ticketService.getById(ticketId);
ticket.setStatus(2);
@@ -261,6 +357,7 @@
}
@PostMapping("/getStatisticByYear")
+ @Operation(summary = "缁熻骞村害缃氬崟" , description = "缁熻骞村害缃氬崟" )
public Object getStatistic(int year){
Map<String,Object> map = new HashMap<>();
List<Object> list = new ArrayList<>();
@@ -297,6 +394,7 @@
}
@PostMapping("/getOrderList")
+ @Operation(summary = "鏍规嵁骞村拰鏈堢粺璁＄綒鍗�" , description = "鏍规嵁骞村拰鏈堢粺璁＄綒鍗�" )
public Object getOrderList(int year,int month){
Date yearFirst = DateUtilOther.getFirstDayOfMonth(year,month);
@@ -310,6 +408,7 @@
}
@PostMapping("findById")
+ @Operation(summary = "鏍规嵁id鏌ヨ" , description = "鏍规嵁id鏌ヨ" )
public Object findById(Long id){
Ticket ticket = ticketService.getById(id);
if(ticket.getViolationTypeId()!=null){
@@ -327,6 +426,7 @@
*/
@ApiOperation(value = "鎵嬪姩缂磋垂", notes = "鎵嬪姩缂磋垂")
@PostMapping("/jiaofei" )
+ @Operation(summary = "鎵嬪姩缂磋垂鏇存柊浜岀淮鐮�" , description = "鎵嬪姩缂磋垂鏇存柊浜岀淮鐮�" )
public R jiaofei(Integer id) {
Ticket byId = ticketService.getById(id);
if(byId.getPayStatus() == 1){
@@ -342,4 +442,20 @@
return R.ok("璇锋壂鐮佺即璐�");
}
}
+
+ /**
+ * 娴嬭瘯瀵规帴
+ * @param
+ * @return R
+ */
+ @ApiOperation(value = "娴嬭瘯瀵规帴", notes = "娴嬭瘯瀵规帴")
+ @GetMapping("/test" )
+ @Operation(summary = "娴嬭瘯瀵规帴鎵ф硶骞冲彴" , description = "娴嬭瘯瀵规帴鎵ф硶骞冲彴" )
+ public R test() {
+ Ticket byId = ticketService.getById(13);
+ byId = ticketService.getNumber(byId);
+ byId.setPush(0);
+ ticketService.uploadInfo(byId);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1