站点工具类

smart-steward-common/src/main/java/com/smartSteward/common/config/serializer/FieldSerializer.java

@@ -10,6 +10,7 @@ import com.smartSteward.common.annotation.Station;
 import com.smartSteward.common.core.redis.RedisCache;
 import com.smartSteward.common.core.text.Convert;
 import com.smartSteward.common.utils.DictUtils;
+import com.smartSteward.common.utils.StationUtil;
 import com.smartSteward.common.utils.StringUtils;
 import com.smartSteward.common.utils.spring.SpringUtils;
 import org.slf4j.Logger;
@@ -40,8 +41,7 @@ public class FieldSerializer extends JsonSerializer<Object> {
 
     private final MinioUtil minioUtil = new MinioUtil();
 
-    // 使用线程安全的缓存
-    private final Map<String, String> stationCache = new ConcurrentHashMap<>();
+
     private final Map<String, String> dictCache = new ConcurrentHashMap<>();
 
     @Override
@@ -124,7 +124,7 @@ public class FieldSerializer extends JsonSerializer<Object> {
             return;
         }
 
-        String stationName = getStationNameSafely(valueStr);
+        String stationName = StationUtil.getStationNameSafely(valueStr);
         gen.writeStringField(STATION_NAME_FIELD, stationName);
     }
 
@@ -200,34 +200,7 @@ public class FieldSerializer extends JsonSerializer<Object> {
         });
     }
 
-    /**
-     * 获取站点名称
-     */
-    private String getStationNameSafely(String stationCode) {
-        if (stationCode == null || stationCode.isEmpty()) {
-            return EMPTY_STRING;
-        }
-
-        // 优先从缓存获取
-        if (!stationCache.isEmpty()) {
-            return stationCache.getOrDefault(stationCode, EMPTY_STRING);
-        }
-
-        // 缓存为空时从Redis加载
-        try {
-            RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
-            if (redisCache.hasKey(STATION_MAP_KEY)) {
-                Map<String, String> redisStationMap = redisCache.getCacheMap(STATION_MAP_KEY);
-                stationCache.putAll(redisStationMap);
-                return stationCache.getOrDefault(stationCode, EMPTY_STRING);
-            }
-        } catch (Exception e) {
-            logger.warn("Failed to get station name for code: {}", stationCode, e);
-            return ERROR_VALUE;
-        }
 
-        return EMPTY_STRING;
-    }
 
     /**
      * 解析字典值

smart-steward-common/src/main/java/com/smartSteward/common/utils/StationUtil.java

@@ -0,0 +1,85 @@
+package com.smartSteward.common.utils;
+
+import com.smartSteward.common.core.redis.RedisCache;
+import com.smartSteward.common.utils.spring.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * 站点工具类
+ * @author smart_Steward
+ */
+@Slf4j
+public class StationUtil {
+    // 使用线程安全的缓存
+    private static final Map<String, String> STATION_CACHE = new ConcurrentHashMap<>();
+    private static final String EMPTY_STRING = "";
+    private static final String STATION_MAP_KEY = "stationMap";
+
+    private static final String DEFAULT_SEPARATOR = ",";
+    /**
+     * 获取单个站点名称
+     */
+    public static String getStationNameSafely(String stationCode) {
+        if (stationCode == null || stationCode.isEmpty()) {
+            return EMPTY_STRING;
+        }
+
+        // 优先从缓存获取
+        if (!STATION_CACHE.isEmpty()) {
+            return STATION_CACHE.getOrDefault(stationCode, EMPTY_STRING);
+        }
+
+        // 缓存为空时从Redis加载
+        try {
+            RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
+            if (redisCache.hasKey(STATION_MAP_KEY)) {
+                Map<String, String> redisStationMap = redisCache.getCacheMap(STATION_MAP_KEY);
+                STATION_CACHE.putAll(redisStationMap);
+                return STATION_CACHE.getOrDefault(stationCode, EMPTY_STRING);
+            }
+        } catch (Exception e) {
+            log.warn("Failed to load station map from Redis for code: {}", stationCode, e);
+            return EMPTY_STRING;
+        }
+
+        return EMPTY_STRING;
+    }
+
+    /**
+     * 获取多个站点名称，中间逗号分割
+     */
+    public static String getStationNamesSafely(String stationCodes) {
+        if (stationCodes == null || stationCodes.isEmpty()) {
+            return EMPTY_STRING;
+        }
+
+        // 优先从缓存获取
+        if (!STATION_CACHE.isEmpty()) {
+            return Arrays.stream(stationCodes.split(DEFAULT_SEPARATOR))
+                    .map(code -> STATION_CACHE.getOrDefault(code, EMPTY_STRING))
+                    .collect(Collectors.joining(DEFAULT_SEPARATOR));
+        }
+
+        // 缓存为空时从 Redis 加载
+        try {
+            RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
+            if (redisCache.hasKey(STATION_MAP_KEY)) {
+                Map<String, String> redisStationMap = redisCache.getCacheMap(STATION_MAP_KEY);
+                STATION_CACHE.putAll(redisStationMap);
+                return Arrays.stream(stationCodes.split(DEFAULT_SEPARATOR))
+                        .map(code -> STATION_CACHE.getOrDefault(code, EMPTY_STRING))
+                        .collect(Collectors.joining(DEFAULT_SEPARATOR));
+            }
+        } catch (Exception e) {
+            log.warn("Failed to load station map from Redis for codes: {}", stationCodes, e);
+            return EMPTY_STRING;
+        }
+
+        return EMPTY_STRING;
+    }
+}

smart-steward-entity/src/main/java/com/smartSteward/entity/database/schedule/ScheduleShiftManagement.java

@@ -73,11 +73,15 @@ public class ScheduleShiftManagement extends BaseEntity
    private String isCommon;
 
    /** 适用油站(存储油站ID,逗号分隔) */
-   @Excel(name = "适用油站(存储油站ID,逗号分隔)")
    @ApiModelProperty("适用油站(存储油站ID,逗号分隔)")
    private String applicableStations;
 
    /** 逻辑删除标识 */
    @ApiModelProperty("逻辑删除标识")
    private Long delFlag;
+
+   /** 适用油站(存储油站ID,逗号分隔) */
+   @Excel(name = "适用油站(存储油站ID,逗号分隔)")
+   @ApiModelProperty("适用油站(存储油站ID,逗号分隔)")
+   private String applicableStationsName;
 }

smart-steward-mapper/src/main/resources/mapper/schedule/ScheduleDutyMapper.xml

@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="dutyPosition != null "> and duty_position = #{dutyPosition}</if>
+            <if test="startTime != null and startTime != ''"> and duty_date >= #{startTime}</if>
+            <if test="endTime != null and endTime != ''"> and duty_date <![CDATA[<=]]> #{endTime}</if>
             <!-- 如果有station_id字段，则增加站点集合查询条件 -->
             <if test="stationCollection != null and stationCollection.size() > 0">
                 and station_id in

smart-steward-service/src/main/java/com/smartSteward/service/schedule/impl/ScheduleShiftManagementServiceImpl.java

@@ -3,6 +3,8 @@ import java.util.Date;
 import java.util.List;
 import com.smartSteward.common.core.SecurityUtils;
 import com.smartSteward.common.utils.DateUtils;
+import com.smartSteward.common.utils.StationUtil;
+import com.smartSteward.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.smartSteward.mapper.schedule.ScheduleShiftManagementMapper;
@@ -29,7 +31,14 @@ public class ScheduleShiftManagementServiceImpl implements IScheduleShiftManagem
     @Override
     public ScheduleShiftManagement selectScheduleShiftManagementById(Long id)
     {
-        return scheduleShiftManagementMapper.selectScheduleShiftManagementById(id);
+        ScheduleShiftManagement scheduleShiftManagement = scheduleShiftManagementMapper.selectScheduleShiftManagementById(id);
+        if (scheduleShiftManagement != null) {
+            if(StringUtils.isNotEmpty(scheduleShiftManagement.getApplicableStations()))
+            {
+                scheduleShiftManagement.setApplicableStationsName(StationUtil.getStationNamesSafely(scheduleShiftManagement.getApplicableStations()));
+            }
+        }
+        return scheduleShiftManagement;
     }
 
     /**
@@ -41,7 +50,16 @@ public class ScheduleShiftManagementServiceImpl implements IScheduleShiftManagem
     @Override
     public List<ScheduleShiftManagement> selectScheduleShiftManagementList(ScheduleShiftManagement scheduleShiftManagement)
     {
-        return scheduleShiftManagementMapper.selectScheduleShiftManagementList(scheduleShiftManagement);
+        List<ScheduleShiftManagement> scheduleShiftManagementList = scheduleShiftManagementMapper.selectScheduleShiftManagementList(scheduleShiftManagement);
+        if (scheduleShiftManagementList != null) {
+            for (ScheduleShiftManagement item : scheduleShiftManagementList) {
+                if(StringUtils.isNotEmpty(item.getApplicableStations()))
+                {
+                  item.setApplicableStationsName(StationUtil.getStationNamesSafely(item.getApplicableStations()));
+                }
+            }
+        }
+        return scheduleShiftManagementList;
     }
 
     /**

smart-steward-service/src/main/java/com/smartSteward/service/system/impl/SysDictTypeServiceImpl.java

@@ -1,10 +1,13 @@
 package com.smartSteward.service.system.impl;
 
+import java.text.ParseException;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
+
+import com.smartSteward.common.exception.ParameterException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -124,7 +127,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
             SysDictType dictType = selectDictTypeById(dictId);
             if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
             {
-                throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
+                throw new ParameterException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
             dictTypeMapper.deleteDictTypeById(dictId);
             DictUtils.removeDictCache(dictType.getDictType());