From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java | 26 +-------------------------
1 files changed, 1 insertions(+), 25 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java
index 5accb8c..83b47f7 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java
@@ -192,36 +192,12 @@
/**
* 获取时限
- * @url {ctx}/api/web/syTimeLimit/getTimeLimit
- * @param limitTable 时限对应表
- * @param limitType 时限类型
- * @return Object
- */
- @GetMapping("/getTimeLimit")
- public Object getTimeLimit(@RequestParam(value = "limitTable") int limitTable, @RequestParam(value = "limitType") String limitType) {
- try {
- QueryWrapper<SyTimeLimit> syTimeLimitQueryWrapper = new QueryWrapper<>();
- syTimeLimitQueryWrapper.eq("limit_table", limitTable).eq("limit_type", limitType);
- SyTimeLimit syTimeLimit = service.getOne(syTimeLimitQueryWrapper);
- int timeTerm = 0;
- if (ObjectUtils.isNotEmpty(syTimeLimit)){
- timeTerm = syTimeLimit.getTimeTerm();
- }
- return ReturnSucUtils.getRepInfo(timeTerm);
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 获取时限
* @url {ctx}/api/web/syTimeLimit/getExpireTime
- * @param computeTime 计算时间
* @param limitType 时限类型
* @return Object
*/
@GetMapping("/getExpireTime")
- public Object getExpireTime(@RequestParam(value = "computeTime") Date computeTime, @RequestParam(value = "limitType") String limitType) {
+ public Object getExpireTime(@RequestParam(value = "limitType") String limitType) {
try {
QueryWrapper<SyTimeLimit> syTimeLimitQueryWrapper = new QueryWrapper<>();
syTimeLimitQueryWrapper.eq("limit_type", limitType);
--
Gitblit v1.8.0