From 3593c619ef18b1e0ef4d4ef3e8c7e9a667879df3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 09 十二月 2025 13:35:30 +0800
Subject: [PATCH] 钥匙柜酒精检测开关
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 10 +++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 5 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 9 ++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/JkCabinetMapper.java | 3 ++-
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 3726846..5bb835b 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import lombok.extern.slf4j.Slf4j;
import net.sourceforge.pinyin4j.PinyinHelper;
import org.apache.commons.lang3.StringUtils;
@@ -18,7 +19,7 @@
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
+@Slf4j
public class Constants {
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_USER_KEY = "user_token_list_";
@@ -1577,9 +1578,12 @@
}
- public static boolean betweenTimeConfig(String timeConfigData){
+ public static boolean betweenTimeConfig(String timeConfigData,String now){
+ log.error("閽ュ寵鏌滆幏鍙栦繚娲佹椂闂撮厤缃」"+timeConfigData);
if(StringUtils.isNotBlank(timeConfigData)){
- Integer nowTime = Integer.valueOf(DateUtil.getFormattedDateUtil(new Date(),"HH:mm").replace(":",""));
+ log.error("閽ュ寵鏌滆幏鍙栦繚娲佹椂闂� - 褰撳墠鏃堕棿淇℃伅"+now);
+ Integer nowTime = Integer.valueOf(now.substring(11,16).replace(":",""));
+
List<String> cleanConfigList = Arrays.asList(StringUtils.split(timeConfigData,","));
for (String config:cleanConfigList) {
String [] timeArr = config.split("-");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/JkCabinetMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/JkCabinetMapper.java
index b1b73e2..a5fc607 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/JkCabinetMapper.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/JkCabinetMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.JkCabinet;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
/**
* @author 姹熻箘韫�
* @date 2025/09/28 09:01
*/
-public interface JkCabinetMapper extends BaseMapper<JkCabinet> {
+public interface JkCabinetMapper extends MPJJoinMapper<JkCabinet> {
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
index 4c7fafe..7347419 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -170,4 +170,9 @@
@ApiModelProperty(value = "婵�娲绘枃浠�")
@TableField(exist = false)
private Multifile activateFile;
+
+
+ @ApiModelProperty(hidden = true)
+ @TableField(exist = false)
+ private String now;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 4f627d6..7d2f487 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -610,7 +610,10 @@
|| Objects.isNull(dto.getType())){
return jkCabinetGridList;
}else{
- JkCabinet jkCabinet = jkCabinetMapper.selectById(dto.getCabinetId());
+ JkCabinet jkCabinet = jkCabinetMapper.selectJoinOne(JkCabinet.class,new MPJLambdaWrapper<JkCabinet>()
+ .selectAll(JkCabinet.class)
+ .select("now()",JkCabinet::getNow)
+ .eq(JkCabinet::getId,dto.getCabinetId()));
if(Objects.isNull(jkCabinet)){
return jkCabinetGridList;
}
@@ -667,7 +670,7 @@
//鍒ゆ柇褰撳墠鏃堕棿鏄惁澶勪簬淇濇磥鏃舵鍐�
String cleanConfig = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.CLEAN_TIME).getCode();
String earlyConfig = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.EARLY_CONFIG).getCode();
- Boolean isCleanTime = Constants.betweenTimeConfig(cleanConfig);
+ Boolean isCleanTime = Constants.betweenTimeConfig(cleanConfig,jkCabinet.getNow());
List<Integer> girdIdList = new ArrayList<>();
//鏌ヨ鏍规嵁浠诲姟鍙互棰嗗彇鐨勬暟鎹�
jkCabinetGridList = jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class,
@@ -1220,7 +1223,7 @@
List<SyncGridDTO> gridSyncList = gridDTOList.stream().filter(i->StringUtils.isNotBlank(i.getBoardCode())&&
StringUtils.isNotBlank(i.getChannelCode())&&StringUtils.isNotBlank(i.getActualLable())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
&& i.getChannelCode().equals(jkCabinetGrid.getChannelCode())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(gridDTOList)){
+ if(CollectionUtils.isEmpty(gridSyncList)){
continue;
}
SyncGridDTO syncGridDTO = gridSyncList.get(Constants.ZERO);
--
Gitblit v1.9.3