jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/EmailDto.java

@@ -36,6 +36,4 @@ public class EmailDto implements Serializable {
     private String username; // 邮箱用户名
 
     private Integer isQiye; // 是否企业邮箱
-
-    private Integer emailServerType;
 }

jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml

@@ -36,7 +36,6 @@
             e.is_qiye,
             e.enabled,
             e.email_server_address,
-            e.email_server_type,
             COUNT (l.id) AS alarms
         FROM
             sys_email e

jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/MetSpectrumServiceImpl.java

@@ -9,7 +9,6 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.NumberFormatUtil;
 import org.jeecg.modules.base.entity.configuration.GardsStations;
 import org.jeecg.modules.base.entity.original.GardsMetData;
-import org.jeecg.modules.base.entity.original.GardsSohData;
 import org.jeecg.modules.file.FileOperation;
 import org.jeecg.modules.mapper.GardsMetDataMapper;
 import org.jeecg.modules.mapper.GardsStationsMapper;
@@ -23,7 +22,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 处理气象谱
@@ -38,7 +36,6 @@ public class MetSpectrumServiceImpl extends ServiceImpl<GardsMetDataMapper, Gard
 
     /**
      * 保存气象谱数据
-     *
      * @param struct
      * @param fileName
      * @return
@@ -53,13 +50,6 @@ public class MetSpectrumServiceImpl extends ServiceImpl<GardsMetDataMapper, Gard
         final GardsStations station = stationsService.check(struct.station_code,fileName);
         List<GardsMetData> list = Lists.newArrayList();
         if(struct.record_count > 0){
-            String finalFileName = FileOperation.separatorConvert(fileName);
-            LambdaQueryWrapper<GardsMetData> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.select(GardsMetData::getMetId);
-            queryWrapper.eq(GardsMetData::getInputFileName, finalFileName);
-            GardsMetData metDataOne=   this.getOne(queryWrapper,false);
-            if (Objects.isNull(metDataOne)) {
-
             for(int i=0;i<struct.record_count;i++){
                 GardsMetData metData = new GardsMetData();
                 metData.setStationId(station.getStationId());
@@ -81,8 +71,6 @@ public class MetSpectrumServiceImpl extends ServiceImpl<GardsMetDataMapper, Gard
                     this.save(metData);
                 });
             }
-
-            }
         }
         return list;
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/SOHSpectrumServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import lombok.val;
 import org.apache.commons.compress.utils.Lists;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.NumberFormatUtil;
@@ -23,7 +22,6 @@ import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 健康谱数据处理
@@ -57,11 +55,6 @@ public class SOHSpectrumServiceImpl extends ServiceImpl<GardsSohDataMapper, Gard
 
         List<GardsSohData> list = Lists.newArrayList();
         if(struct.af_record_count > 0){
-            String finalFileName = FileOperation.separatorConvert(fileName);
-            LambdaQueryWrapper<GardsSohData> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(GardsSohData::getInputFileName,finalFileName);
-            GardsSohData sohDataOne=   this.getOne(queryWrapper,false);
-            if(Objects.isNull(sohDataOne)){
             for(int i=0;i<struct.af_record_count;i++){
                 GardsSohData sohData = new GardsSohData();
                 sohData.setStationId(station.getStationId());
@@ -81,7 +74,6 @@ public class SOHSpectrumServiceImpl extends ServiceImpl<GardsSohDataMapper, Gard
                 });
             }
         }
-        }
         return list;
     }
 }