修改代码

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/service/BaseService.java

@@ -357,26 +357,4 @@ public class BaseService {
 		}
 		return triggerStateName;
 	}
-	/**
-	 * 插入系统告警信息
-	 *
-	 * @param type      类型
-	 * @param name      名称
-	 * @param describe  描述
-	 * @param errorInfo 错误日志
-	 * @param solution  处理办法（插入的时候如果有处理建议，请给这个传值，比如（处理建议：联系运维人员处理））
-	 * @param stationCode 所属场站
-	 */
-	@Transactional(propagation = Propagation.REQUIRED)
-	public void saveSysAlarm(@NotNull AlarmTypeEnum type,
-							 @NotNull String name, @NotNull String describe, String errorInfo, String solution,String stationCode) {
-		SysAlarm sysAlarm = new SysAlarm();
-		sysAlarm.setAlarmTypeEnum(type);
-		sysAlarm.setName(name);
-		sysAlarm.setDescribe(describe);
-		sysAlarm.setAlarmStatusEnum(AlarmStatusEnum.E1);
-		sysAlarm.setErrorInfo(errorInfo);
-		sysAlarm.setSolution(solution);
-		sysAlarmRepository.save(sysAlarm);
-	}
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/ReceiveDataService.java

@@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
+import com.jiayue.ipfcst.common.data.constant.enums.AlarmStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.AlarmTypeEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.EquipmentTypeEnum;
 import com.jiayue.ipfcst.common.data.entity.*;
 import com.jiayue.ipfcst.common.data.repository.*;
 import com.jiayue.ipfcst.common.data.service.BaseService;
 import com.jiayue.ipfcst.console.util.RedisUtils;
+import com.sun.istack.internal.NotNull;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -67,7 +69,8 @@ public class ReceiveDataService extends BaseService {
   PowerStationStatusDataRepository powerStationStatusDataRepository;
   @Autowired
   PowerStationDataPackerContainer powerStationDataPackerContainer;
-
+  @Autowired
+  SysAlarmService sysAlarmService;
   @Value("${receive.ip}")
   private String ip;
   @Value("${receive.port}")
@@ -255,7 +258,7 @@ public class ReceiveDataService extends BaseService {
       String name = "接数程序异常";
       String describe = "";
       String solution = "";
-      super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricField.getStationCode());
+      sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricField.getStationCode());
       e.printStackTrace();
     }
   }
@@ -282,20 +285,22 @@ public class ReceiveDataService extends BaseService {
       HttpEntity responseEntity = response.getEntity();
       body = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8);
     }catch (RuntimeException | IOException e){
-      e.printStackTrace();
-      log.info("请求异常");
+      String errorInfo = "请求异常";
+      log.info(errorInfo);
       log.info("所用线程"+Thread.currentThread().getName());
       log.info("停止请求数据");
       // 进行告警
-      String errorInfo = "请求异常";
-      String name = "请求异常";
       String describe = "";
       String solution = "停止请求数据";
-      super.saveSysAlarm(AlarmTypeEnum.E5, name, describe, errorInfo, solution,electricField.getStationCode());
+      sysAlarmService.saveSysAlarm(AlarmTypeEnum.E5, errorInfo, describe, errorInfo, solution,electricField.getStationCode());
+
       Thread.currentThread().stop();
+
+
     }
     return body;
   }
+
   public void savePowerStationStatusData(ElectricField electricField) {
     try {
       log.info("开始计算实际功率");

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/SysAlarmService.java

@@ -1,8 +1,10 @@
 package com.jiayue.ipfcst.console.service;
 
+import com.jiayue.ipfcst.common.data.constant.enums.AlarmStatusEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.AlarmTypeEnum;
 import com.jiayue.ipfcst.common.data.entity.SysAlarm;
 import com.jiayue.ipfcst.common.data.repository.SysAlarmRepository;
+import com.sun.istack.internal.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.*;
@@ -20,6 +22,28 @@ import java.util.List;
 public class SysAlarmService {
     private final SysAlarmRepository sysAlarmRepository;
 
+  /**
+   * 插入系统告警信息
+   *
+   * @param type      类型
+   * @param name      名称
+   * @param describe  描述
+   * @param errorInfo 错误日志
+   * @param solution  处理办法（插入的时候如果有处理建议，请给这个传值，比如（处理建议：联系运维人员处理））
+   * @param stationCode 所属场站
+   */
+  public void saveSysAlarm(@NotNull AlarmTypeEnum type,
+                           @NotNull String name, @NotNull String describe, String errorInfo, String solution,String stationCode) {
+    SysAlarm sysAlarm = new SysAlarm();
+    sysAlarm.setAlarmTypeEnum(type);
+    sysAlarm.setName(name);
+    sysAlarm.setDescribe(describe);
+    sysAlarm.setAlarmStatusEnum(AlarmStatusEnum.E1);
+    sysAlarm.setErrorInfo(errorInfo);
+    sysAlarm.setSolution(solution);
+    sysAlarm.setStationCode(stationCode);
+    sysAlarmRepository.save(sysAlarm);
+  }
     @Autowired
     public SysAlarmService(SysAlarmRepository sysAlarmRepository) {
         this.sysAlarmRepository = sysAlarmRepository;

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/E63UploadFileService.java

@@ -12,6 +12,7 @@ import com.jiayue.ipfcst.common.data.repository.*;
 import com.jiayue.ipfcst.common.data.service.uploadfilerule.E63UploadFileRuleService;
 import com.jiayue.ipfcst.console.service.ForecastPowerShortTermService;
 import com.jiayue.ipfcst.console.service.ForecastPowerUltraShortTermService;
+import com.jiayue.ipfcst.console.service.SysAlarmService;
 import com.jiayue.ipfcst.console.util.RedisUtils;
 import com.jiayue.ipfcst.fileupload.util.FileUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -73,7 +74,9 @@ public class E63UploadFileService extends BaseUploadFileService {
 
   private final RedisUtils redisUtils;
 
-  public E63UploadFileService(VelocityEngine velocityEngine, ForecastPowerShortTermService forecastPowerShortTermService, ForecastPowerUltraShortTermService forecastPowerUltraShortTermService, E63UploadFileRuleService e63UploadFileRuleService, WeatherStationInfoRepository weatherStationInfoRepository, WindTurbineInfoRepository windTurbineInfoRepository, WeatherStationStatusDataRepository weatherStationStatusDataRepository, WindTowerInfoRepository windTowerInfoRepository, WindTowerStatusDataRepository windTowerStatusDataRepository, NwpRepository nwpRepository, InverterInfoRepository inverterInfoRepository, WindTurbineStatusDataRepository windTurbineStatusDataRepository, InverterStatusDataRepository inverterStatusDataRepository, PowerStationStatusDataRepository powerStationStatusDataRepository, RedisUtils redisUtils) {
+  private final SysAlarmService sysAlarmService;
+
+  public E63UploadFileService(VelocityEngine velocityEngine, ForecastPowerShortTermService forecastPowerShortTermService, ForecastPowerUltraShortTermService forecastPowerUltraShortTermService, E63UploadFileRuleService e63UploadFileRuleService, WeatherStationInfoRepository weatherStationInfoRepository, WindTurbineInfoRepository windTurbineInfoRepository, WeatherStationStatusDataRepository weatherStationStatusDataRepository, WindTowerInfoRepository windTowerInfoRepository, WindTowerStatusDataRepository windTowerStatusDataRepository, NwpRepository nwpRepository, InverterInfoRepository inverterInfoRepository, WindTurbineStatusDataRepository windTurbineStatusDataRepository, InverterStatusDataRepository inverterStatusDataRepository, PowerStationStatusDataRepository powerStationStatusDataRepository, RedisUtils redisUtils, SysAlarmService sysAlarmService) {
     this.velocityEngine = velocityEngine;
     this.forecastPowerShortTermService = forecastPowerShortTermService;
     this.forecastPowerUltraShortTermService = forecastPowerUltraShortTermService;
@@ -89,6 +92,7 @@ public class E63UploadFileService extends BaseUploadFileService {
     this.inverterStatusDataRepository = inverterStatusDataRepository;
     this.powerStationStatusDataRepository = powerStationStatusDataRepository;
     this.redisUtils = redisUtils;
+    this.sysAlarmService = sysAlarmService;
   }
 
   /**
@@ -172,7 +176,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成短期异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }
@@ -251,7 +255,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成可用短期异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }
@@ -337,7 +341,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成超短期异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }
@@ -425,7 +429,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成可用超短期异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }
@@ -476,7 +480,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成气象站或者测风塔文件异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }
@@ -926,7 +930,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成逆变器或风机文件异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }
@@ -1359,7 +1363,7 @@ public class E63UploadFileService extends BaseUploadFileService {
         String name = "生成理论功率文件异常";
         String describe = "";
         String solution = "";
-        super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
+        sysAlarmService.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,electricFieldInfo.getStationCode());
       }
     }
   }

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/FtpUploadService.java

@@ -15,6 +15,7 @@ import com.jiayue.ipfcst.common.data.entity.UploadURL;
 import com.jiayue.ipfcst.common.data.repository.UploadFileLogDetailRepository;
 import com.jiayue.ipfcst.common.data.repository.UploadFileLogRepository;
 import com.jiayue.ipfcst.common.data.repository.UploadURLRepository;
+import com.jiayue.ipfcst.console.service.SysAlarmService;
 import com.jiayue.ipfcst.fileupload.config.AppenderFactory;
 import com.jiayue.ipfcst.fileupload.util.FileConstant;
 import lombok.extern.slf4j.Slf4j;
@@ -46,8 +47,10 @@ public class FtpUploadService extends BaseUploadFileService{
   AppenderFactory appenderFactory;
   final
   UploadURLRepository uploadURLRepository;
+  final
+  SysAlarmService sysAlarmService;
 
-  public FtpUploadService(UploadFileChannelService uploadFileChannelService, UploadFileLogRepository uploadFileLogRepository, UploadFileLogDetailRepository uploadFileLogDetailRepository, UploadObjectService uploadObjectService, FtpUploadTransactionService ftpUploadTransactionService, AppenderFactory appenderFactory, UploadURLRepository uploadURLRepository) {
+  public FtpUploadService(UploadFileChannelService uploadFileChannelService, UploadFileLogRepository uploadFileLogRepository, UploadFileLogDetailRepository uploadFileLogDetailRepository, UploadObjectService uploadObjectService, FtpUploadTransactionService ftpUploadTransactionService, AppenderFactory appenderFactory, UploadURLRepository uploadURLRepository, SysAlarmService sysAlarmService) {
     this.uploadFileChannelService = uploadFileChannelService;
     this.uploadFileLogRepository = uploadFileLogRepository;
     this.uploadFileLogDetailRepository = uploadFileLogDetailRepository;
@@ -55,6 +58,7 @@ public class FtpUploadService extends BaseUploadFileService{
     this.ftpUploadTransactionService = ftpUploadTransactionService;
     this.appenderFactory = appenderFactory;
     this.uploadURLRepository = uploadURLRepository;
+    this.sysAlarmService = sysAlarmService;
   }
 
   /**
@@ -143,7 +147,7 @@ public class FtpUploadService extends BaseUploadFileService{
                 String name = "上报文件异常";
                 String describe = "";
                 String solution = "";
-                super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,"");
+                sysAlarmService.saveSysAlarm(AlarmTypeEnum.E2, name, describe, errorInfo, solution,"");
 
                 returnData.close();
                 r.close();
@@ -211,7 +215,7 @@ public class FtpUploadService extends BaseUploadFileService{
                 String name = "上报文件异常";
                 String describe = "";
                 String solution = "";
-                super.saveSysAlarm(AlarmTypeEnum.E1, name, describe, errorInfo, solution,"");
+                sysAlarmService.saveSysAlarm(AlarmTypeEnum.E2, name, describe, errorInfo, solution,"");
                 returnData.close();
                 r.close();
                 process.getInputStream().close();