From f7167562105604f1e7656983d120f145db6edd12 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 28 十一月 2025 13:42:31 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
index 8470d37..1639a1a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
@@ -252,15 +252,14 @@
.last(" limit 1 ")
);
}
-
- String content = "銆愯溅杈�-"+jkCabinetLog.getCarCode()+"閽ュ寵銆戠敱+"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
-
+ String content = "銆愯溅杈�-"+jkCabinetLog.getKeyInfo()+"閽ュ寵銆戠敱"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
//瀛樺偍鎶ヨ寮傚父璁板綍
WarningEvent warningEvent = new WarningEvent();
warningEvent.setCreateDate(new Date());
warningEvent.setCreator(Objects.nonNull(systemUser)?systemUser.getId():null);
warningEvent.setWarningId(warning.getId());
warningEvent.setTitle(warningConfig.getInfo());
+ warningEvent.setIsdeleted(Constants.ZERO);
warningEvent.setContent(content );
warningEvent.setStatus(Constants.ZERO);
warningEvent.setRegion( StringUtils.isNotBlank(jkCabinetLog.getLocation())?jkCabinetLog.getLocation():"鏈煡浣嶇疆");
@@ -295,6 +294,10 @@
warningPushMapper.insert(warningPush);
warningEvent.setStatus(Constants.ONE);
warningEventMapper.updateById(warningEvent);
+ jkCabinetLogMapper.update(null,new UpdateWrapper<JkCabinetLog>().lambda()
+ .set(JkCabinetLog::getIsNotice,Constants.ONE)
+ .eq(JkCabinetLog::getId,jkCabinetLog.getId())
+ );
}catch (Exception e){
warningEvent.setStatus(Constants.TWO);
warningEventMapper.updateById(warningEvent);
@@ -356,7 +359,7 @@
@Override
public List<InterestedListVO> getKeyUseStatistics(Integer type){
- List<String> weekDays = DateUtil.getBeforDaysByFormat(new Date(),Objects.isNull(type)||Constants.equalsInteger(type,Constants.ZERO)?7:15,"MM鏈坉d鏃�");
+ List<String> weekDays = DateUtil.getBeforDaysByFormat(new Date(),Objects.isNull(type)||Constants.equalsInteger(type,Constants.ZERO)?7:15,"MM-dd");
MPJLambdaWrapper<JkCabinetLog> wrapper = new MPJLambdaWrapper<JkCabinetLog>()
.selectAll(JkCabinetLog.class)
.selectAs(Member::getName,JkCabinetLog::getMemberName)
@@ -386,11 +389,11 @@
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jkCabinetLogs)) {
vo.setNum(
jkCabinetLogs.stream().filter(i->Constants.equalsInteger(i.getKeyStatus(),Constants.TWO)
- &&DateUtil.dateToString(i.getCreateDate(),"MM鏈坉d鏃�").equals(days))
+ &&DateUtil.dateToString(i.getCreateDate(),"MM-dd").equals(days))
.collect(Collectors.toList()).size()
);
vo.setNextNum(jkCabinetLogs.stream().filter(i->Constants.equalsInteger(i.getKeyStatus(),Constants.ONE)
- &&DateUtil.dateToString(i.getCreateDate(),"MM鏈坉d鏃�").equals(days))
+ &&DateUtil.dateToString(i.getCreateDate(),"MM-dd").equals(days))
.collect(Collectors.toList()).size());
}
--
Gitblit v1.9.3