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("-"); 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> { } 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; } 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);
