fix: 优化逻辑

This commit is contained in:
tangwei 2026-07-03 11:43:18 +08:00
parent 6437bcf55e
commit 60bace53df
2 changed files with 11 additions and 0 deletions

View File

@ -3,6 +3,7 @@ package com.yfd.platform.config;
import cn.hutool.crypto.digest.DigestUtil;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
@ -80,6 +81,13 @@ public class RedisConfig {
objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
objectMapper.registerModule(new JavaTimeModule());
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
// 关键启用默认类型信息必须添加
objectMapper.activateDefaultTyping(
objectMapper.getPolymorphicTypeValidator(),
ObjectMapper.DefaultTyping.NON_FINAL,
JsonTypeInfo.As.PROPERTY
);
return new GenericJackson2JsonRedisSerializer(objectMapper);
}

View File

@ -25,6 +25,7 @@ import com.yfd.platform.qgc_env.zq.service.ZqMonitorService;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
import com.yfd.platform.utils.SecurityUtils;
import jakarta.annotation.Resource;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -89,11 +90,13 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
private MsOperationLogDetailMapper msOperationLogDetailMapper;
@Override
@Cacheable(cacheNames = "zqCache#7200", keyGenerator = "cacheKeyGenerator")
public DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest) {
return getMsstbprptListInternal(dataSourceRequest, false);
}
@Override
@Cacheable(cacheNames = "zqCache#7200", keyGenerator = "cacheKeyGenerator")
public DataSourceResult getEngMsstbprptList(DataSourceRequest dataSourceRequest) {
DataSourceRequest request = dataSourceRequest == null ? new DataSourceRequest() : dataSourceRequest;
request.setSelect(Arrays.asList("stcd", "stnm", "wtDeviceType", "dtinType", "mway"));