jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/DOSSpectrum.java

@@ -69,9 +69,9 @@ public class DOSSpectrum extends AbstractSpectrumHandler{
     }
 
     protected void checkAirSamplerFlowBlock(){
-        if(super.mailContent.indexOf("#DoseRate") == -1){
+        if(super.mailContent.indexOf("#DoseRare") == -1){
             ErrorLogManager.getInstance().write(new SpectrumErrorEvent(new Date(), ErrorType.AIR_SAMPLER_FLOW_ERROR,super.spectrumFile.getName(),super.getMsgId()));
-            throw new AirSamplerFlowException("this is no DoseRate data");
+            throw new AirSamplerFlowException("this is no DoseRare data");
         }
     }
 
@@ -128,7 +128,7 @@ public class DOSSpectrum extends AbstractSpectrumHandler{
             throw new PHD_ReadException("THE PHDFile has some blocks can't be read:"+super.spectrumFile.getAbsolutePath());
         }
         if(sourceData.dr_record_count <= 0 || sourceData.dr_start_date.size() < 0 || sourceData.dr_start_time.size() < 0){
-            throw new AirSamplerFlowException("DoseRate data error");
+            throw new AirSamplerFlowException("DoseRare data error");
         }
         this.sourceData = sourceData;
     }

jeecg-module-station-operation/src/main/java/org/jeecg/common/StationTypeUtil.java

@@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component
@@ -27,7 +26,11 @@ public class StationTypeUtil {
         for (StationType stationType:stationTypeList) {
             if (StringUtils.isNotBlank(stationType.getMinId()) && StringUtils.isNotBlank(stationType.getMaxId())){
                 if (stationId>Integer.valueOf(stationType.getMinId()) && stationId<=Integer.valueOf(stationType.getMaxId())){
-                    if (Objects.equals(category, stationType.getCategory())) {
+                    if (category == 3) {
+                        type = "Car";
+                    } else if (category == 4) {
+                        type = "Ship";
+                    } else {
                         type = stationType.getName();
                     }
                 }

jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/StationType.java

@@ -19,8 +19,6 @@ public class StationType implements Serializable {
 
     private String maxId;
 
-    private Integer category;
-
     private List<StationType> types = new ArrayList<>();
 
 }

jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java

@@ -60,9 +60,6 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
     @Autowired
     private StationTypeUtil stationTypeUtil;
 
-    @Autowired
-    private StationType stationType;
-
     private final SpatialContext spatialContext = SpatialContext.GEO;
 
     @Override
@@ -136,8 +133,8 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
     @Override
     public Result findInfo(String stationId, String type) {
         Result result = new Result();
-        List<String> stationTypes = stationType.getTypes().stream().map(StationType::getName).collect(Collectors.toList());
-        if (stationTypes.contains(type)){
+        if (type.equals("IMS STATION(P)") || type.equals("IMS STATION(G)") || type.equals("NRL")
+                || type.equals("Car")|| type.equals("Ship")){
             HashMap<String, GardsStations> stationInfoMap = (HashMap<String, GardsStations>) redisUtil.get("stationInfoMap");
             GardsStations stations = stationInfoMap.get(stationId);
             if (Objects.nonNull(stations)){