From 7ed2a032d0724e68aec8af940f2ce0023a9f0eb7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 15 四月 2026 09:27:51 +0800
Subject: [PATCH] 修改调度单年月日
---
api/src/main/java/com/ruoyi/api/third/controller/CarWxController.java | 89 +++++++++++++-------------------------------
1 files changed, 26 insertions(+), 63 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..65413f8 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
@@ -6,10 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.PdfTemplateUtil;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
@@ -57,18 +54,9 @@
@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;
+ OssUtils ossUtils;
- @Autowired
- private ITmsDriverService tmsDriverService;
/**
* 鐧诲綍鏂规硶[pda]
@@ -99,7 +87,10 @@
* @return
*/
@GetMapping("/assignedItineraryLogList")
- public AjaxResult assignedItineraryLogList(){
+ public AjaxResult assignedItineraryLogList(Integer pageNum, Integer pageSize){
+ if (pageNum != null && pageSize != null) {
+ return AjaxResult.success(tmsDispatchOrderService.assignedItineraryLogListPage(pageNum, pageSize));
+ }
return tmsDispatchOrderService.assignedItineraryLogList();
}
@@ -112,7 +103,7 @@
}
/**
- * 琛岀▼鍘嗗彶
+ * 琛岀▼鍘嗗彶锛堟棫鎺ュ彛锛屼繚鎸佸吋瀹癸級
*/
@GetMapping("/tmsTripList/{dispatchId}")
public AjaxResult tmsTripList(@PathVariable Integer dispatchId){
@@ -120,11 +111,25 @@
}
/**
+ * 琛岀▼鍘嗗彶锛堝垎椤碉紝鎸夋椂闂村�掑簭锛宒ispatchId 鍙�� - 涓嶄紶鏌ュ叏閮級
+ */
+ @GetMapping("/tmsTripListPage")
+ public AjaxResult tmsTripListPage(Integer dispatchId, Integer pageNum, Integer pageSize){
+ if (pageNum == null) pageNum = 1;
+ if (pageSize == null) pageSize = 10;
+ return AjaxResult.success(tmsTripService.tmsTripListPage(dispatchId, pageNum, pageSize));
+ }
+
+ /**
* 鑾峰彇鍨粯鍒楄〃
* @return
*/
@GetMapping("/getTmsFinanceDetailList")
- public AjaxResult getTmsFinanceDetailList(Integer dispatchId){
+ public AjaxResult getTmsFinanceDetailList(Integer dispatchId, Integer pageNum, Integer pageSize){
+ // 浼犱簡鍒嗛〉鍙傛暟璧板垎椤碉紝鍚﹀垯鍏煎鏃ч�昏緫
+ if (pageNum != null && pageSize != null) {
+ return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailListPage(dispatchId, pageNum, pageSize));
+ }
return AjaxResult.success(tmsFinanceDetailService.getTmsFinanceDetailList(dispatchId));
}
@@ -151,7 +156,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 +212,10 @@
}
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);
-
- }
-
+ @GetMapping("/getOssToken")
+ public AjaxResult getOssToken(){
+ return AjaxResult.success(ossUtils.getToken());
}
}
--
Gitblit v1.8.0