From dd1a51612fcd3c839d31dfa0df83b3d3071c8145 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 17:50:11 +0800
Subject: [PATCH] feat: 完善无人值守系统后端
---
src/main/java/com/ruoyi/unattended/controller/UnattendedOperationController.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/unattended/controller/UnattendedOperationController.java b/src/main/java/com/ruoyi/unattended/controller/UnattendedOperationController.java
index 3e8ad49..3481300 100644
--- a/src/main/java/com/ruoyi/unattended/controller/UnattendedOperationController.java
+++ b/src/main/java/com/ruoyi/unattended/controller/UnattendedOperationController.java
@@ -39,7 +39,9 @@
@PostMapping("/weighbridgeSystemAdd")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody UnattendedOperation unattendedOperation) {
- return AjaxResult.success(unattendedOperationService.save(unattendedOperation));
+ UnattendedOperation result = unattendedOperationService.autoWeigh(unattendedOperation);
+ unattendedOperationService.save(result);
+ return AjaxResult.success(result);
}
/**
@@ -94,6 +96,45 @@
}
/**
+ * 鏃犱汉鍊煎畧鑷姩绉伴噸锛氳绠楀噣閲嶃�佺孩澶栭槻浣滃紛銆佽鍗曞尮閰嶃�佺敓鎴愮鍗曞彿/浜岀淮鐮佸苟淇濆瓨
+ */
+ @PostMapping("/weighbridgeAutoWeigh")
+ @ApiOperation("鑷姩绉伴噸")
+ public AjaxResult autoWeigh(@RequestBody UnattendedOperation operation) {
+ try {
+ UnattendedOperation result = unattendedOperationService.autoWeigh(operation);
+ unattendedOperationService.save(result);
+ return AjaxResult.success(result);
+ } catch (IllegalArgumentException e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 鎺ㄩ�� ERP
+ */
+ @PostMapping("/weighbridgePushErp/{id}")
+ @ApiOperation("鎺ㄩ�丒RP")
+ public AjaxResult pushErp(@PathVariable Long id) {
+ try {
+ return AjaxResult.success(unattendedOperationService.pushErp(id));
+ } catch (IllegalArgumentException e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ /**
+ * 鎵胯繍鍟嗙哗鏁堝垎鏋�
+ */
+ @GetMapping("/carrierPerformance")
+ @ApiOperation("鎵胯繍鍟嗙哗鏁堝垎鏋�")
+ public AjaxResult carrierPerformance(String startDate, String endDate) {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ return AjaxResult.success(unattendedOperationService.carrierPerformance(
+ LocalDateTime.parse(startDate, formatter), LocalDateTime.parse(endDate, formatter)));
+ }
+
+ /**
*缁熻
* @return
*/
@@ -105,7 +146,5 @@
LocalDateTime endDateTime = LocalDateTime.parse(endDate, dateTimeFormatter);
return AjaxResult.success(unattendedOperationService.weighbridgeDailyReport(startDateTime,endDateTime));
}
-
-
}
--
Gitblit v1.9.3