From f5b953a5f3415784a41cd12b60cc8d7574e4b7aa Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期五, 09 六月 2023 13:56:38 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/phone/TicketController.java | 1
src/main/java/com/boying/controller/FileInfo2Controller.java | 64 ++++++++++++++++++++++++++++++++
src/main/java/com/boying/controller/StreetController.java | 5 +-
src/main/java/com/boying/controller/phone/PayController.java | 2 +
4 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/FileInfo2Controller.java b/src/main/java/com/boying/controller/FileInfo2Controller.java
new file mode 100644
index 0000000..1fceedb
--- /dev/null
+++ b/src/main/java/com/boying/controller/FileInfo2Controller.java
@@ -0,0 +1,64 @@
+package com.boying.controller;
+
+import com.boying.entity.FileInfo;
+import com.boying.service.FileInfoService;
+import io.lettuce.core.dynamic.annotation.Param;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("ffzf/fileInfo")
+@RequiredArgsConstructor
+public class FileInfo2Controller {
+
+ private final FileInfoService fileInfoService;
+
+ /**
+ * @Description:涓嬭浇
+ * @Param downloadPath 鏂囦欢璺緞
+ */
+ @GetMapping("/download/downloadZip")
+ public void downloadZip(@Param("downloadPath") String downloadPath, HttpServletRequest request, HttpServletResponse response) {
+ //涓嬭浇鍥剧墖
+ String down = fileInfoService.downloadPathFile(downloadPath, request, response);
+ }
+
+ @PostMapping("/download/downloadZips")
+ public void downloadZips(String fileIds, HttpServletRequest request, HttpServletResponse response) {
+ List<FileInfo> fileInfoList = new ArrayList<>();
+ if(fileIds.contains(",")){
+ String[] split = fileIds.split(",");
+ for (String s : split) {
+ FileInfo byId = fileInfoService.getById(Integer.parseInt(s));
+ fileInfoList.add(byId);
+ }
+ }else {
+ FileInfo byId = fileInfoService.getById(Integer.parseInt(fileIds));
+ fileInfoList.add(byId);
+ }
+
+ //涓嬭浇鍘嬬缉鍖�
+ fileInfoService.downForZip(fileInfoList, request, response);
+ }
+ @PostMapping("/download/downloadPng")
+ public void downloadPng(String fileId, HttpServletRequest request, HttpServletResponse response) {
+ FileInfo byId = fileInfoService.getById(Integer.parseInt(fileId));
+ fileInfoService.downloadPng(byId,request,response);
+ }
+
+ @GetMapping("/showImg")
+ public void showImg( String path,HttpServletResponse response) {
+ fileInfoService.getFile(path,response);
+ }
+
+ @GetMapping("/showImgById/{fileId}")
+ public void showImgById(@PathVariable Long fileId,HttpServletResponse response) {
+ fileInfoService.getFileById(fileId,response);
+ }
+
+}
diff --git a/src/main/java/com/boying/controller/StreetController.java b/src/main/java/com/boying/controller/StreetController.java
index b6a8390..8f8382e 100644
--- a/src/main/java/com/boying/controller/StreetController.java
+++ b/src/main/java/com/boying/controller/StreetController.java
@@ -12,6 +12,7 @@
import com.boying.service.StreetService;
import com.boying.util.LngLatUtil;
import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -80,7 +81,7 @@
return R.ok();
}
- @PostMapping("/findById")
+ @GetMapping("/findById")
public Object findById(Long id,int type) {
if(type==0){
QueryWrapper<StreetReRoad> roadQueryWrapper = new QueryWrapper<>();
@@ -108,7 +109,7 @@
}
}
- @PostMapping("/findList")
+ @GetMapping("/findList")
public Object findAll() {
Map<String,Object> map = new HashMap<>();
QueryWrapper<Street> wrapper = new QueryWrapper<>();
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index d861d8e..f774b51 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -406,6 +406,7 @@
*/
@PostMapping("zhifa")
public Object zhifa(Long id){
+ System.out.println(id+"寮�濮嬬即璐�");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
logs += "缃氬崟琛╥d涓猴細"+id+",\n";
@@ -482,6 +483,7 @@
addOrderRecord2(ticket);
return payurl+eticketnum;
}else {
+ System.out.println("鏀粯鐢宠缂存鐮佽繑鍥炰负锛�"+entity);
return null;
}
}
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index aafa702..4bfa776 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -119,6 +119,7 @@
}
ticket.setStatus(1);//宸插鐞�
+ ticket.setPayStatus(0);
ticketService.saveOrUpdate(ticket);
if(StringUtils.isBlank(ticket.getQrUrl())){
--
Gitblit v1.9.1