优化接口

pig-statistics/pig-statistics-api/src/main/java/com/pig4cloud/pig/statistics/api/entity/ConfigItem.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pig.statistics.api.entity;
 
 
 import lombok.Data;
+import java.io.Serializable;
 
 /**
  * @author wcl
@@ -9,9 +10,11 @@ import lombok.Data;
  * @description: 配置
  */
 @Data
-public class ConfigItem {
+public class ConfigItem implements Serializable {
 
-	private String key; // config_key
+	private static final long serialVersionUID = 1L;
+	
+	private String name; // config_key
 	private String value; // config_value
 	private String label; // config_label
 }

pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/Util/ConfigUtils.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -36,41 +37,82 @@ public class ConfigUtils {
 	 * @return 配置项
 	 */
 	public static List<ConfigItem> getConfigValues(String configKey) {
-		String cacheKey = CONFIG_CACHE_PREFIX + configKey;
-		List<ConfigItem> cached = (List<ConfigItem>) redisTemplate.opsForValue().get(cacheKey);
-		if (cached != null) {
-			return cached;
+		try {
+			String cacheKey = CONFIG_CACHE_PREFIX + configKey;
+			
+			// 尝试从缓存获取
+			List<ConfigItem> cached = (List<ConfigItem>) redisTemplate.opsForValue().get(cacheKey);
+			if (cached != null) {
+				log.debug("从缓存获取配置: {}", configKey);
+				return cached;
+			}
+			
+			// 从数据库查询
+			List<ConfigItem> list = sysConfigMapper.selectByConfigKey(configKey);
+			if (list != null && !list.isEmpty()) {
+				try {
+					// 尝试存入缓存
+					redisTemplate.opsForValue().set(cacheKey, list, 1, TimeUnit.HOURS);
+					log.debug("配置已存入缓存: {}", configKey);
+				} catch (Exception e) {
+					log.warn("配置缓存失败，但不影响业务: {}", configKey, e);
+				}
+			}
+			
+			return list != null ? list : new ArrayList<>();
+		} catch (Exception e) {
+			log.error("获取配置失败: {}", configKey, e);
+			// 降级处理：直接查询数据库
+			try {
+				return sysConfigMapper.selectByConfigKey(configKey);
+			} catch (Exception dbEx) {
+				log.error("数据库查询也失败: {}", configKey, dbEx);
+				return new ArrayList<>();
+			}
 		}
-		List<ConfigItem> list = sysConfigMapper.selectByConfigKey(configKey);
-		// 日志
-		log.info("---存入redis~~~~~~");
-		redisTemplate.opsForValue().set(cacheKey, list, 1, TimeUnit.HOURS);
-		log.info("---已存redis~~~~~~");
-		return list;
 	}
 
 	public static void clearConfigCache(String configKey) {
-		redisTemplate.delete(CONFIG_CACHE_PREFIX + configKey);
+		try {
+			redisTemplate.delete(CONFIG_CACHE_PREFIX + configKey);
+			log.debug("配置缓存已清除: {}", configKey);
+		} catch (Exception e) {
+			log.warn("清除配置缓存失败: {}", configKey, e);
+		}
 	}
 
 	/**
 	 * 获取一条配置
-	 * @param configKey
-	 * @param configValue
-	 * @return
+	 * @param configKey 配置键
+	 * @param configValue 配置值
+	 * @return 配置项
 	 */
-	public static ConfigItem getConfigValue(String configKey , String configValue) {
-
-		ConfigItem configItem = new ConfigItem();
-		List<ConfigItem> configValues = getConfigValues(configKey);
-
-		for (ConfigItem item : configValues) {
-			if (item.getValue().equals(configValue)) {
-				configItem = item;
-				break;
+	public static ConfigItem getConfigValue(String configKey, String configValue) {
+		try {
+			List<ConfigItem> configValues = getConfigValues(configKey);
+			
+			if (configValues != null && !configValues.isEmpty()) {
+				for (ConfigItem item : configValues) {
+					if (item.getValue() != null && item.getValue().equals(configValue)) {
+						return item;
+					}
+				}
 			}
+			
+			// 如果没有找到匹配的配置，返回默认值
+			ConfigItem defaultItem = new ConfigItem();
+			defaultItem.setName(configKey);
+			defaultItem.setValue(configValue);
+			defaultItem.setLabel("未知配置");
+			return defaultItem;
+		} catch (Exception e) {
+			log.error("获取配置值失败: key={}, value={}", configKey, configValue, e);
+			// 返回默认值
+			ConfigItem defaultItem = new ConfigItem();
+			defaultItem.setName(configKey);
+			defaultItem.setValue(configValue);
+			defaultItem.setLabel("配置获取失败");
+			return defaultItem;
 		}
-
-		return configItem;
 	}
 }

pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/mapper/SysConfigMapper.java

@@ -16,6 +16,6 @@ import java.util.List;
 @Mapper
 public interface SysConfigMapper {
 
-	@Select("SELECT config_key as key , config_value as value, config_label as label FROM sys_config WHERE config_key = #{configKey} AND enable = 1 ORDER BY sort ASC")
+	@Select("SELECT config_key as name, config_value as value, config_label as label FROM sys_config WHERE config_key = #{configKey} AND enable = 1 ORDER BY sort ASC")
 	List<ConfigItem> selectByConfigKey(@Param("configKey") String configKey);
 }

pig-statistics/pig-statistics-biz/src/main/java/com/pig4cloud/pig/statistics/service/impl/UninstallAnalyseServiceImpl.java

@@ -231,7 +231,10 @@ public class UninstallAnalyseServiceImpl implements UninstallAnalyseService {
 
 		Map<String, LocalDate> timeRangeMap = getTimeRangeMap(StringUtils.isEmpty(dto.getType()) ? "week" : dto.getType());
 		QueryWrapper<MktDeviceTime> wrapper = new QueryWrapper<>();
-		wrapper.eq("type", dto.getType());
+		if (!StringUtils.isEmpty(dto.getType())) {
+			wrapper.eq("type", dto.getType());
+		}
+
 		// 添加时间范围查询
 		wrapper.between("stat_date", timeRangeMap.get("startDate"), timeRangeMap.get("endDate"));
 		// 动态添加其他查询条件