From d2bcf26953cc4342f6c0a048d520eb5f96ac3e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 19 Jul 2024 13:51:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E5=A4=84=E7=90=86=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9A=84=E8=BF=87=E6=9C=9F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/controller/AssetsController.java | 52 +++++++++++-------- .../com/gxwebsoft/oa/param/AssetsParam.java | 2 - 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java b/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java index 6e58b6c..7f646b7 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/AssetsController.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.utils.BtUtil; +import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.BatchParam; @@ -15,14 +16,19 @@ import com.gxwebsoft.oa.entity.AssetsUser; import com.gxwebsoft.oa.param.AssetsParam; import com.gxwebsoft.oa.service.AssetsService; import com.gxwebsoft.oa.service.AssetsUserService; +import com.gxwebsoft.shop.entity.Order; +import com.gxwebsoft.shop.entity.OrderInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static com.gxwebsoft.common.core.constants.AppUserConstants.ADMINISTRATOR; @@ -43,6 +49,8 @@ public class AssetsController extends BaseController { private AssetsUserService assetsUserService; @Resource private BtUtil btUtil; + @Resource + private RedisUtil redisUtil; @ApiOperation("统计信息") @GetMapping("/data") @@ -72,6 +80,18 @@ public class AssetsController extends BaseController { data.put("totalNum1", totalNum1); data.put("totalNum2", totalNum2); data.put("totalNum3", totalNum3); + + // 处理已过期主机 + String key = "Assets:update:".concat(loginUser.getTenantId().toString()); + if(redisUtil.get(key) == null){ + final List list = assetsService.list(new LambdaQueryWrapper().lt(Assets::getEndTime, LocalDateTime.now())); + list.forEach(d -> { + d.setStatus("已到期"); + }); + if (assetsService.updateBatchById(list)) { + redisUtil.set(key,1,1L, TimeUnit.DAYS); + } + } return success(data); } // 非管理员 @@ -95,6 +115,7 @@ public class AssetsController extends BaseController { .eq(Assets::getStatus, "已销毁") .in(Assets::getAssetsId,collect) ); + data.put("totalNum", totalNum); data.put("totalNum1", totalNum1); data.put("totalNum2", totalNum2); @@ -107,28 +128,18 @@ public class AssetsController extends BaseController { public ApiResult> page(AssetsParam param) { final User loginUser = getLoginUser(); final Integer userId = loginUser.getUserId(); - final List collect1 = loginUser.getRoles().stream().map(Role::getRoleCode).collect(Collectors.toList()); - if (param.getStatus() != null) { - if (param.getStatus().equals("运行中")) { - param.setStartTime(LocalDateTime.now()); - param.setStatus(null); + final List collect1 = loginUser.getRoles().stream().map(Role::getRoleCode).collect(Collectors.toList()); + if (collect1.contains("superAdmin") || collect1.contains("admin")) { + // 返回查询结果 + return success(assetsService.pageRel(param)); } - if (param.getStatus().equals("已到期")) { - param.setEndTime(LocalDateTime.now()); - param.setStatus(null); - } - } - if (collect1.contains("superAdmin") || collect1.contains("admin")) { - // 返回查询结果 - return success(assetsService.pageRel(param)); - } - final List list = assetsUserService.list(new LambdaQueryWrapper().eq(AssetsUser::getUserId, userId)); - final Set collect = list.stream().map(AssetsUser::getAssetsId).collect(Collectors.toSet()); - if(!CollectionUtils.isEmpty(collect)){ - param.setAssetsIds(collect); - } - return success(assetsService.pageRel(param)); + final List list = assetsUserService.list(new LambdaQueryWrapper().eq(AssetsUser::getUserId, userId)); + final Set collect = list.stream().map(AssetsUser::getAssetsId).collect(Collectors.toSet()); + if(!CollectionUtils.isEmpty(collect)){ + param.setAssetsIds(collect); + } + return success(assetsService.pageRel(param)); } @ApiOperation("查询全部服务器资产记录表") @@ -224,5 +235,4 @@ public class AssetsController extends BaseController { } return fail("删除失败"); } - } diff --git a/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java b/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java index c9ec585..b8e04c8 100644 --- a/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java +++ b/src/main/java/com/gxwebsoft/oa/param/AssetsParam.java @@ -103,11 +103,9 @@ public class AssetsParam extends BaseParam { private String content; @ApiModelProperty(value = "购买时间") - @QueryField(type = QueryType.GE) private LocalDateTime startTime; @ApiModelProperty(value = "到期时间") - @QueryField(type = QueryType.LE) private LocalDateTime endTime; @ApiModelProperty(value = "置顶状态")