From bd959da23dfa97c60fee8c4818384e99d45fc879 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期四, 18 四月 2024 16:51:25 +0800
Subject: [PATCH] 版本：航锦化工 更新日志 1：聚集离开建筑后取消闪烁，2：聚集后产生大屏告警提示，聚集人员离开后大屏不显示告警提示，后台可查询到。
---
src/main/java/com/hxzk/service/impl/TbHistoryPowerServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/hxzk/service/impl/TbHistoryPowerServiceImpl.java b/src/main/java/com/hxzk/service/impl/TbHistoryPowerServiceImpl.java
index d790890..10fed04 100644
--- a/src/main/java/com/hxzk/service/impl/TbHistoryPowerServiceImpl.java
+++ b/src/main/java/com/hxzk/service/impl/TbHistoryPowerServiceImpl.java
@@ -35,11 +35,16 @@
@Override
public PageInfo<com.hxzk.pojo.TbHistoryPower> findSearch(Integer page, Integer limit, com.hxzk.pojo.TbHistoryPower historyPower) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.like("tagid",historyPower.getTagid());
- queryWrapper.orderByDesc("time");
- PageHelper.startPage(page,limit);
- List<com.hxzk.pojo.TbHistoryPower> cardList = baseMapper.selectList(queryWrapper);
+ List<com.hxzk.pojo.TbHistoryPower> cardList = null;
+ if (historyPower.getTime() == null || historyPower.getTime() == ""){
+ LocalDate currentDate = LocalDate.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+ String formattedDate = currentDate.format(formatter);
+ historyPower.setTime(formattedDate);
+ cardList = tbHistoryPower.findSearch(historyPower);
+ }else{
+ cardList = tbHistoryPower.findSearch(historyPower);
+ }
PageInfo<com.hxzk.pojo.TbHistoryPower> info = new PageInfo<>(cardList);
return info;
}
--
Gitblit v1.9.3