From ca412ade3b178fbc8ba0a4b6215a040acdede954 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 10:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java | 60 +-----------------------------------------------------------
1 files changed, 1 insertions(+), 59 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
index 441280f..d385490 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java
@@ -57,18 +57,6 @@
@Value("${custom.upload.network-path}")
private String networkPath;
- @Value("${custom.driver.template1}")
- private String template1;
-
- @Value("${custom.driver.template2}")
- private String template2;
- @Value("${custom.driver.font}")
- private String fontPath;
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ITmsDriverService tmsDriverService;
/**
* 鐧诲綍鏂规硶[pda]
@@ -151,7 +139,7 @@
* 涓婁紶琛岀▼
*/
@PostMapping("/uploadTrip")
- public AjaxResult uploadTrip(@RequestBody TmsTrip tmsTrip){
+ public AjaxResult uploadTrip(@RequestBody TmsTrip tmsTrip) throws Exception {
tmsTrip.setDataSource("1");
return AjaxResult.success(tmsTripService.insertTmsTrip(tmsTrip));
}
@@ -207,52 +195,6 @@
}
return AjaxResult.success(data);
}
- @GetMapping("/resource/jkcns")
- public void jkcns( HttpServletResponse response) throws Exception {
- Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
- if (deviceId == null){
- return;
- }
- TmsDriver byId = tmsDriverService.getById(deviceId);
- if (byId != null){
- HashMap<String, String> objectObjectHashMap = new HashMap<>();
- objectObjectHashMap.put("date", DateUtils.getDate());
- objectObjectHashMap.put("name", byId.getDriverName());
- objectObjectHashMap.put("idCard", byId.getLicenseNumber());
-
- // 涓嬭浇鍚嶇О
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
- FileUtils.setAttachmentResponseHeader(response, "璐ц溅鍙告満鍑鸿溅鍓嶅仴搴锋壙璇轰功_"+byId.getDriverName()+"pdf");
- FileUtils.writeBytes(template1, response.getOutputStream());
- PdfTemplateUtil.fillPdf(template2, response.getOutputStream(),objectObjectHashMap , fontPath);
-
- }
-
-
-
-
- }
-
- @GetMapping("/resource/zjsfcns")
- public void zjsfcns( HttpServletResponse response) throws Exception {
- // 涓嬭浇鍚嶇О
-
- Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
- if (deviceId == null){
- return;
- }
- TmsDriver byId = tmsDriverService.getById(deviceId);
- if (byId != null){
- HashMap<String, String> objectObjectHashMap = new HashMap<>();
- objectObjectHashMap.put("date", DateUtils.getDate());
- // 涓嬭浇鍚嶇О
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
- FileUtils.setAttachmentResponseHeader(response, "閬电邯瀹堟硶鎵胯涔"+byId.getDriverName()+"pdf");
- PdfTemplateUtil.fillPdf(template2, response.getOutputStream(),objectObjectHashMap , fontPath);
-
- }
-
- }
}
--
Gitblit v1.8.0