From 45d5b8bdbe5407b88cc324fdbcbcbaa51b7ab64c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 16:36:49 +0800
Subject: [PATCH] 点位时间优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 10 ++++++++++
ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java | 8 ++++++++
ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java | 9 ++++++++-
pom.xml | 2 +-
4 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 614ed78..903f2e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
- <version>${spring-boot.version}</version>
+ <version>4.1.3</version>
</dependency>
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
similarity index 91%
rename from ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java
rename to ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
index 824b018..fedc6b1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractController.java
@@ -32,10 +32,17 @@
@RestController
@RequestMapping("/system/contract")
@AllArgsConstructor
-public class TContractController extends BaseController {
+public class ContractController extends BaseController {
private final ITContractService tContractService;
+ @PreAuthorize("@ss.hasPermi('system:contract:time')")
+ @GetMapping("/time/{unitId}")
+ @ApiOperation("鑾峰彇璇ュ崟浣嶇殑鍚堝悓鏃堕棿鑼冨洿")
+ public Result timeRange(@PathVariable("unitId") Integer unitId) {
+ return tContractService.timeRange(unitId);
+ }
+
@PreAuthorize("@ss.hasPermi('system:contract:list')")
@GetMapping("/list")
public Result page(ContractQuery query) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
index aaf5b80..b1b8e6f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
@@ -53,4 +53,12 @@
* @return 鏁版嵁
*/
List<TContract> selectUsingContract();
+
+ /**
+ * 鑾峰彇杩愮淮鍗曚綅鐨勫悎鍚屾椂闂磋寖鍥�
+ *
+ * @param unitId
+ * @return
+ */
+ Result timeRange(Integer unitId);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
index 346b141..747dd0e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -216,4 +216,14 @@
.ge(TContract::getEndTime, DateUtils.getDate())
.list();
}
+
+ @Override
+ public Result timeRange(Integer unitId) {
+ List<TContract> unitContractList = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(TContract::getId, TContract::getName, TContract::getStartTime, TContract::getEndTime)
+ .eq(TContract::getUnitId, unitId)
+ .ge(TContract::getEndTime, new Date())
+ .list();
+ return Result.ok().data(unitContractList);
+ }
}
--
Gitblit v1.8.0