From 5decddf6a5dd2cda32880c07c545b8246ceada2d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 十二月 2025 11:54:20 +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 2f683d5..5597485 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
@@ -178,7 +178,7 @@
for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
TelecomJkCabinetLogVO telecomJkCabinetLogVO = new TelecomJkCabinetLogVO();
BeanUtil.copyProperties(jkCabinetLog,telecomJkCabinetLogVO);
- telecomJkCabinetLogVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ZERO:Constants.ONE);
+ telecomJkCabinetLogVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ONE:Constants.ZERO);
telecomJkCabinetLogVOList.add(telecomJkCabinetLogVO);
}
}
@@ -260,11 +260,14 @@
);
warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i -> i.getName()).collect(Collectors.toList()), ",")
);
- // todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
- // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
- // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
- // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
- // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+
+ if(Constants.equalsInteger(warningRule.getMemberNotice(),Constants.ONE)){
+ // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
+ // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
+// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ }
+ impl.sendDeviceNotice(warningRule);
warningPushMapper.insert(warningPush);
falg = true;
}catch (Exception e){
--
Gitblit v1.9.3