From 621b26cd05fae058797c9b736e2721db055b37a8 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 16:32:21 +0800
Subject: [PATCH] 1、获取时限方法修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java | 2
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 27 +++++++++++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java | 13 ------
dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java | 26 ------------
4 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
index 4e37cc7..6cb637b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
@@ -142,7 +142,7 @@
public void addCaseSupervise(CaseSupervise caseSupervise, String userId){
try{
List<QuiltUnitDTO> quiltUnitDTOList = caseSupervise.getQuiltUnitDTOList();
- Integer timeTerm = sysClient.getTimeLimit("dyh_case_supervise", SyTimeEnum.SY_TIME_5.getIndex());
+ Integer timeTerm = sysClient.getTimeLimitHour(SyTimeEnum.SY_TIME_5.getIndex());
List<CaseSupervise> caseSuperviseList = new ArrayList<>();
List<FileRelateDTO> fileRelateDTOList = sysClient.listFileRelateByOwnerId(caseSupervise.getId());
int count = 0;
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
index 4864ebc..4828a57 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/SysClient.java
@@ -39,24 +39,13 @@
ReturnBO listInfoByOwnerIdList(@RequestBody Map<String, Object> term);
/**
- * 附件中心-根据多个所属编号查询附件
- * @url {ctx}/api/v1/fileInfo/listInfoByOwnerIdList?ownerIds=
- * @param limitTable 表名
- * @param limitType 时限类型
- * @return ReturnBO
- */
- @GetMapping("/api/client/syTimeLimit/getTimeLimit")
- ReturnBO getTimeLimit(@RequestParam String limitTable, @RequestParam(value = "limitType") String limitType);
-
- /**
* 获取时限
* @url {ctx}/api/client/syTimeLimit/getExpireTime?ownerIds=
- * @param computeTime
* @param limitType
* @return
*/
@GetMapping("/api/client/syTimeLimit/getExpireTime")
- ReturnBO getExpireTime(@RequestParam(value = "computeTime") Date computeTime, @RequestParam(value = "limitType") String limitType);
+ ReturnBO getExpireTime(@RequestParam(value = "limitType") String limitType);
/**
* 根据条件删除附件关系
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
index d4abeca..f173cce 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java
@@ -94,13 +94,32 @@
* @param limitType 时限类型
* @return List
*/
- public Integer getTimeLimit(String limitTable, String limitType){
+ public Integer getTimeLimitHour(String limitType){
int timeTerm = 0;
try{
- ReturnBO returnBo = sysClient.getTimeLimit(limitTable, limitType);
+ ReturnBO returnBo = sysClient.getExpireTime(limitType);
if (ReturnConsts.OK == returnBo.getCode()){
if (ObjectUtils.isNotEmpty(returnBo.getData())){
- timeTerm = (int)returnBo.getData();
+ SyTimeLimitDTO syTimeLimitDTO = objectMapper.convertValue(returnBo.getData(), SyTimeLimitDTO.class);
+ if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){
+ if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){
+ if (TimeUnitConsts.TIME_UNIT_1.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()*24*365;
+ }
+ if (TimeUnitConsts.TIME_UNIT_2.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()*24*30;
+ }
+ if (TimeUnitConsts.TIME_UNIT_3.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()*24;
+ }
+ if (TimeUnitConsts.TIME_UNIT_4.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm();
+ }
+ if (TimeUnitConsts.TIME_UNIT_5.equals(syTimeLimitDTO.getTermUnit())){
+ timeTerm = syTimeLimitDTO.getTimeTerm()/60;
+ }
+ }
+ }
}
}
}catch (Exception e){
@@ -119,7 +138,7 @@
public Date getExpireTime(Date computeTime, String limitType){
Date expireTime = null;
try{
- ReturnBO returnBo = sysClient.getExpireTime(computeTime, limitType);
+ ReturnBO returnBo = sysClient.getExpireTime(limitType);
if (ReturnConsts.OK == returnBo.getCode()){
if (ObjectUtils.isNotEmpty(returnBo.getData())){
SyTimeLimitDTO syTimeLimitDTO = objectMapper.convertValue(returnBo.getData(), SyTimeLimitDTO.class);
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 f9b4213..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") String 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