shilin 1 рік тому
батько
коміт
a29fc7ab31
35 змінених файлів з 1055 додано та 3383 видалено
  1. 10 8
      alarm-service/src/main/java/com/gyee/alarm/websocket/WebSocket.java
  2. 1 1
      alarm-stat/src/main/java/com/gyee/alarm/mapper/auto/AlarmTsMapper.java
  3. 3 0
      alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReport.java
  4. 4 0
      alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportAlarm.java
  5. 3 0
      alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportConclusio.java
  6. 3 0
      alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportWt.java
  7. 3 0
      alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyWarnScore.java
  8. 127 40
      alarm-stat/src/main/java/com/gyee/alarm/service/EarlyReportService.java
  9. 26 1
      alarm-stat/src/main/java/com/gyee/alarm/service/auto/impl/AlarmTsServiceImpl.java
  10. 1 1
      alarm-stat/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyReportConclusioServiceImpl.java
  11. 2 2
      alarm-stat/src/main/java/com/gyee/alarm/task/SaticScheduleTask.java
  12. 2 2
      alarm-stat/src/main/resources/application-jn.yml
  13. 8 78
      alarm-stat/src/test/java/com/gyee/AalarmStatTest.java
  14. 862 3250
      log/ota.log
  15. BIN
      log/ota.log.2023-09-20.0.gz
  16. BIN
      log/ota.log.2023-09-20.1.gz
  17. BIN
      log/ota.log.2023-09-20.10.gz
  18. BIN
      log/ota.log.2023-09-20.11.gz
  19. BIN
      log/ota.log.2023-09-20.110.gz
  20. BIN
      log/ota.log.2023-09-20.12.gz
  21. BIN
      log/ota.log.2023-09-20.13.gz
  22. BIN
      log/ota.log.2023-09-20.14.gz
  23. BIN
      log/ota.log.2023-09-20.15.gz
  24. BIN
      log/ota.log.2023-09-20.16.gz
  25. BIN
      log/ota.log.2023-09-20.2.gz
  26. BIN
      log/ota.log.2023-09-20.3.gz
  27. BIN
      log/ota.log.2023-09-20.4.gz
  28. BIN
      log/ota.log.2023-09-20.5.gz
  29. BIN
      log/ota.log.2023-09-20.6.gz
  30. BIN
      log/ota.log.2023-09-20.7.gz
  31. BIN
      log/ota.log.2023-09-20.8.gz
  32. BIN
      log/ota.log.2023-09-20.9.gz
  33. BIN
      log/ota.log.2023-09-20.913.gz
  34. BIN
      log/ota.log.2023-09-26.0.gz
  35. BIN
      log/ota.log.2023-09-27.0.gz

+ 10 - 8
alarm-service/src/main/java/com/gyee/alarm/websocket/WebSocket.java

@@ -120,16 +120,13 @@ public class WebSocket {
     /**
      * 向客户端发送消息
      */
-    public void sendMessage(Object message) throws IOException, EncodeException {
+    public synchronized  void sendMessage(Object message) throws IOException, EncodeException {
 
         if(StringUtils.notEmp(this.session))
         {
-            synchronized (this.session) {
-                if(this.session.isOpen())
-                {
-                    this.session.getBasicRemote().sendObject(message);
-                }
-
+            if(this.session.isOpen())
+            {
+                this.session.getBasicRemote().sendObject(message);
             }
         }
 
@@ -143,7 +140,12 @@ public class WebSocket {
         logger.info("服务端发送消息到{},消息:{}",userId,message);
 
         if(StringUtils.isNotBlank(userId)&&webSocketMap.containsKey(userId)){
-            webSocketMap.get(userId).sendMessage(message);
+
+            synchronized ( webSocketMap.get(userId)) {
+                webSocketMap.get(userId).sendMessage(message);
+
+            }
+
         }else{
             logger.error("用户{}不在线",userId);
         }

+ 1 - 1
alarm-stat/src/main/java/com/gyee/alarm/mapper/auto/AlarmTsMapper.java

@@ -112,6 +112,6 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
             " group by deviceid,components,stationid,alarmid,description ",
             " order by deviceid  ",
             "</script>"})
-    List<ProBasicFeatureStat> findCtFeatureStatCustom( @Param("begin")long begin, @Param("end") long end, @Param("stationid") String stationid, @Param("modelId")String modelId, @Param("components") List<String> components, @Param("alarmid") List<String> alarmid);
+    List<ProBasicFeatureStat> findCtFeatureStatCustom( @Param("begin")long begin, @Param("end") long end, @Param("stationid") String stationid, @Param("modelId")String modelId, @Param("components") String components, @Param("alarmid") String alarmid);
 
 }

+ 3 - 0
alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReport.java

@@ -1,6 +1,8 @@
 package com.gyee.alarm.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -26,6 +28,7 @@ public class ProEconEarlyReport extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     /**

+ 4 - 0
alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportAlarm.java

@@ -1,6 +1,9 @@
 package com.gyee.alarm.model.auto;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,6 +25,7 @@ public class ProEconEarlyReportAlarm extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     /**

+ 3 - 0
alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportConclusio.java

@@ -1,5 +1,7 @@
 package com.gyee.alarm.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -21,6 +23,7 @@ public class ProEconEarlyReportConclusio extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     /**

+ 3 - 0
alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyReportWt.java

@@ -1,6 +1,8 @@
 package com.gyee.alarm.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +26,7 @@ public class ProEconEarlyReportWt extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     /**

+ 3 - 0
alarm-stat/src/main/java/com/gyee/alarm/model/auto/ProEconEarlyWarnScore.java

@@ -1,6 +1,8 @@
 package com.gyee.alarm.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -25,6 +27,7 @@ public class ProEconEarlyWarnScore extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     /**

+ 127 - 40
alarm-stat/src/main/java/com/gyee/alarm/service/EarlyReportService.java

@@ -1,6 +1,7 @@
 package com.gyee.alarm.service;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.alarm.init.CacheContext;
 import com.gyee.alarm.model.auto.*;
 import com.gyee.alarm.model.vo.AlarmCustomType;
@@ -32,6 +33,10 @@ public class EarlyReportService  {
     @Resource
     private IAlarmTsService alarmTsService;
 
+    @Resource
+    private  IProEconEarlyReportWtService proEconEarlyReportWtService;
+    @Resource
+    private  IProEconEarlyReportAlarmService proEconEarlyReportAlarmService;
 
 
     //时间间隔(天),即从当日0点,向前间隔天数,为计算区间
@@ -40,50 +45,116 @@ public class EarlyReportService  {
     @Value("${limit}")
     private  int limit;
 
-    public boolean createEarlyReport() {
+    public boolean createEarlyReport(Date recordDate) {
 
         boolean result=false;
         //报告时间
-        Date reportDate = DateUtils.truncate(new Date());
+        Date reportDate = DateUtils.truncate(recordDate);
         //获取计算开始时间
         Date statStartTime = DateUtils.addDays(DateUtils.today(), - interval_day);
         //获取计算结束时间
-        Date statEndTime = DateUtils.today();
+        Date statEndTime = DateUtils.truncate(recordDate);
 
 
         List<ProEconAlarmType> fjtypels=CacheContext.alarmTypeMap.get(AlarmType.FJBJ.getCode());
 
         List<ProEconAlarmType> gftypels=CacheContext.alarmTypeMap.get(AlarmType.GFBJ.getCode());
 
+        QueryWrapper<ProEconEarlyReport> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("report_date",recordDate);
+        //判断是否有重复记录,先删除重复记录
+        List<String> idls = proEconEarlyReportService.list(queryWrapper).stream()
+                .map(ProEconEarlyReport::getId)
+                .collect(Collectors.toList());
+
+        for(int i=0;i<idls.size();i++)
+        {
+
+            List<ProEconEarlyReportWt> wtls= proEconEarlyReportWtService.findByReportId(idls.get(i));
+            if(!wtls.isEmpty())
+            {
+                List<String> wtidls = wtls.stream().map(ProEconEarlyReportWt::getId).collect(Collectors.toList());
+                proEconEarlyReportService.removeByIds(wtidls);
+
+                for(int j=0;j<wtidls.size();j++)
+                {
+                    List<ProEconEarlyReportAlarm> alarmls= proEconEarlyReportAlarmService.findByWindturbineReportId(wtidls.get(j));
+
+                    if(!alarmls.isEmpty())
+                    {
+                        List<String> alarmidls = alarmls.stream().map(ProEconEarlyReportAlarm::getId).collect(Collectors.toList());
+                        proEconEarlyReportAlarmService.removeByIds(alarmidls);
+
+                    }
+                }
+
+            }
+        }
+
+        List<String> tempids=new ArrayList<>();
+
+        for(int i=0;i<idls.size();i++)
+        {
+            tempids.add(idls.get(i));
+            if(tempids.size()==100)
+            {
+                proEconEarlyReportService.removeByIds(tempids);
+                tempids=new ArrayList<>();
+            }
+        }
+
+        if(!tempids.isEmpty())
+        {
+            proEconEarlyReportService.removeByIds(tempids);
+        }
+
        for(ProBasicEquipment wt: CacheContext.wtls)
        {
 
-           ProEconEarlyReport report = new ProEconEarlyReport();
-           report.setId(String.valueOf(SnowflakeGenerator.generateId()));
-           report.setReportDate(new Date());
-           report.setStationId(wt.getWindpowerstationId());
-          if(CacheContext.wpmap.containsKey(wt.getWindpowerstationId()))
-          {
-              report.setStationName(CacheContext.wpmap.get(wt.getWindpowerstationId()).getName());
-          }
+
           if(wt.getWindpowerstationId().contains("FDC"))
           {
               for(ProEconAlarmType fjtype:fjtypels)
               {
-                  report.setRelatedParts(fjtype.getNemCode());
-                  StringBuilder sb=new StringBuilder();
-                  sb.append(wt.getNemCode()).append(wt.getName()).append(fjtype.getName()).append("诊断报告");
-                  report.setReportName(String.valueOf(sb));
-                  report.setStatStartDate(statStartTime);
-                  report.setStatEndDate(statEndTime);
-                  report.setProEconEarlyReportWtList(new ArrayList<>());
-                  report.setReportDate(reportDate);
-                  report.setStatStartDate(new Date());
+                  if(!fjtype.getNemCode().equals("BJXT") && !fjtype.getNemCode().equals("FDJ"))
+                  {
+
+                      continue;
+                  }
+                      ProEconEarlyReport report = new ProEconEarlyReport();
+                      report.setId(String.valueOf(SnowflakeGenerator.generateId()));
+                      report.setReportDate(new Date());
+                      report.setStationId(wt.getWindpowerstationId());
+                      if(CacheContext.wpmap.containsKey(wt.getWindpowerstationId()))
+                      {
+                          report.setStationName(CacheContext.wpmap.get(wt.getWindpowerstationId()).getName());
+                      }
+                      report.setRelatedParts(fjtype.getNemCode());
+                      StringBuilder sb=new StringBuilder();
+                      sb.append(wt.getNemCode()).append(wt.getName()).append(fjtype.getName()).append("诊断报告");
+                      report.setReportName(String.valueOf(sb));
+                      report.setStatStartDate(statStartTime);
+                      report.setStatEndDate(statEndTime);
+                      report.setProEconEarlyReportWtList(new ArrayList<>());
+                      report.setReportDate(reportDate);
+                      report.setStatStartDate(new Date());
+
+                      result = isResult(statStartTime, statEndTime, wt, report);
+
+
               }
           }else
           {
               for(ProEconAlarmType gftype:gftypels)
               {
+                  ProEconEarlyReport report = new ProEconEarlyReport();
+                  report.setId(String.valueOf(SnowflakeGenerator.generateId()));
+                  report.setReportDate(new Date());
+                  report.setStationId(wt.getWindpowerstationId());
+                  if(CacheContext.wpmap.containsKey(wt.getWindpowerstationId()))
+                  {
+                      report.setStationName(CacheContext.wpmap.get(wt.getWindpowerstationId()).getName());
+                  }
                   report.setRelatedParts(gftype.getNemCode());
                   StringBuilder sb=new StringBuilder();
                   sb.append(wt.getNemCode()).append(wt.getName()).append(gftype.getName()).append("诊断报告");
@@ -93,36 +164,52 @@ public class EarlyReportService  {
                   report.setProEconEarlyReportWtList(new ArrayList<>());
                   report.setReportDate(reportDate);
                   report.setStatStartDate(new Date());
+
+                  result = isResult(statStartTime, statEndTime, wt, report);
               }
           }
 
+       }
+        return result;
+    }
 
-           try {
-               //获取本次报告最差的风机信息集合
-               List<ProEconEarlyReportWt> nowWindturbineInfoList = getNowWindturbineInfo(wt,wt.getModelId(), report.getId(),report.getRelatedParts(), statStartTime, statEndTime, limit);
+    private boolean isResult(Date statStartTime, Date statEndTime, ProBasicEquipment wt, ProEconEarlyReport report) {
 
-               report.getProEconEarlyReportWtList().addAll(nowWindturbineInfoList);
-               // 获取上次报告
-               List<ProEconEarlyReport> earlyReport = proEconEarlyReportService.findEarlyReportByDate(wt.getId(), DateUtils.addDays(statEndTime, -60), statEndTime);
-               earlyReport=earlyReport.stream().filter(s->s.getRelatedParts().equals(report.getRelatedParts())).collect(Collectors.toList());
-               List<ProEconEarlyReport> collect = earlyReport.stream().sorted(Comparator.comparing(ProEconEarlyReport::getId, Comparator.reverseOrder())).collect(Collectors.toList());
+        boolean result;
 
-               if (collect.size() > 0) {
-                   //已经进行了排序,因此获取第一个,即为最近一次报告
-                   List<ProEconEarlyReportWt> reportWindturbineInfoList = collect.get(0).getProEconEarlyReportWtList().stream().filter(s -> s.getCompared() == false && !s.getWindturbineId().equals("全场平均")).collect(Collectors.toList());
-                   List<ProEconEarlyReportWt> compareWindturbineInfoList = getCompareWindturbineInfo(wt,reportWindturbineInfoList, wt.getModelId(), report.getId(),report.getRelatedParts(), statStartTime, statEndTime);
-                   report.getProEconEarlyReportWtList().addAll(compareWindturbineInfoList);
-               }
+        //获取本次报告最差的风机信息集合
+        List<ProEconEarlyReportWt> nowWindturbineInfoList = getNowWindturbineInfo(wt, wt.getModelId(), report.getId(), report.getRelatedParts(), statStartTime, statEndTime, limit);
 
-               //执行写入操作
-               result = proEconEarlyReportService.save(report);
+        report.getProEconEarlyReportWtList().addAll(nowWindturbineInfoList);
+        // 获取上次报告
+        List<ProEconEarlyReport> earlyReport = proEconEarlyReportService.findEarlyReportByDate(wt.getId(), DateUtils.addDays(statEndTime, -60), statEndTime);
+        earlyReport=earlyReport.stream().filter(s->s.getRelatedParts().equals(report.getRelatedParts())).collect(Collectors.toList());
+        List<ProEconEarlyReport> collect = earlyReport.stream().sorted(Comparator.comparing(ProEconEarlyReport::getId, Comparator.reverseOrder())).collect(Collectors.toList());
 
-           } catch (RuntimeException ex) {
+        if (collect.size() > 0) {
+            //已经进行了排序,因此获取第一个,即为最近一次报告
+            List<ProEconEarlyReportWt> reportWindturbineInfoList = collect.get(0).getProEconEarlyReportWtList().stream().filter(s -> s.getCompared() == false && !s.getWindturbineId().equals("全场平均")).collect(Collectors.toList());
+            List<ProEconEarlyReportWt> compareWindturbineInfoList = getCompareWindturbineInfo(wt,reportWindturbineInfoList, wt.getModelId(), report.getId(), report.getRelatedParts(), statStartTime, statEndTime);
+            report.getProEconEarlyReportWtList().addAll(compareWindturbineInfoList);
+        }
 
-           } finally {
+        if(!report.getProEconEarlyReportWtList().isEmpty())
+        {
+            for(ProEconEarlyReportWt earlyReportWt:report.getProEconEarlyReportWtList())
+            {
+                if(!earlyReportWt.getAlarmInfoList().isEmpty())
+                {
+                    for(ProEconEarlyReportAlarm earlyReportAlarm: earlyReportWt.getAlarmInfoList())
+                    {
+                        proEconEarlyReportAlarmService.save(earlyReportAlarm);
+                    }
+                    proEconEarlyReportWtService.save(earlyReportWt);
+                }
+            }
 
-           }
-       }
+        }
+        //执行写入操作
+        result = proEconEarlyReportService.save(report);
         return result;
     }
 

+ 26 - 1
alarm-stat/src/main/java/com/gyee/alarm/service/auto/impl/AlarmTsServiceImpl.java

@@ -170,7 +170,32 @@ public class AlarmTsServiceImpl extends ServiceImpl<AlarmTsMapper, AlarmTs> impl
     {
         List<ProBasicFeatureStat> ls = new ArrayList<>();
         if (StringUtils.notEmp(begin) && StringUtils.notEmp(end) && StringUtils.notEmp(stationid) && StringUtils.notEmp(modelId)) {
-            ls = alarmTsMapper.findCtFeatureStatCustom(begin, end,stationid, modelId, components,alarmid);
+
+            String componentsstr=null;
+            StringBuilder componentssb=new StringBuilder();
+            if(!components.isEmpty())
+            {
+               for(String c:components)
+                {
+
+                    componentssb.append("'").append(c).append("',");
+                    componentsstr=componentssb.substring(0,componentssb.length()-1);
+                }
+            }
+
+            String alarmidstr=null;
+            StringBuilder alarmidsb=new StringBuilder();
+            if(!components.isEmpty())
+            {
+
+                for(String c:alarmid)
+                {
+                    alarmidsb.append("'").append(c).append("',");
+                    alarmidstr=alarmidsb.substring(0,alarmidsb.length()-1);
+                }
+            }
+
+            ls = alarmTsMapper.findCtFeatureStatCustom(begin, end,stationid, modelId, componentsstr,alarmidstr);
         }
 
         return ls;

+ 1 - 1
alarm-stat/src/main/java/com/gyee/alarm/service/auto/impl/ProEconEarlyReportConclusioServiceImpl.java

@@ -27,7 +27,7 @@ public class ProEconEarlyReportConclusioServiceImpl extends ServiceImpl<ProEconE
 
     public List<ProEconEarlyReportConclusio> getListByPart(List<String> partList) {
         List<ProEconEarlyReportConclusio> collect=new ArrayList<>();
-        if (partList == null || partList.size() <= 0) {
+        if (partList != null &&  !partList.isEmpty()) {
             QueryWrapper<ProEconEarlyReportConclusio> qw = new QueryWrapper<>();
             qw.in("part",partList);
             collect = list(qw);

+ 2 - 2
alarm-stat/src/main/java/com/gyee/alarm/task/SaticScheduleTask.java

@@ -44,12 +44,12 @@ public class SaticScheduleTask {
         XxlJobHelper.log("报警按模块统计调度程序执行开始!........");
 
         try {
-//            Calendar c = Calendar.getInstance();
+            Calendar c = Calendar.getInstance();
 //
 ////            Date begin = DateUtils.truncate(c.getTime());
 ////            Date end = DateUtils.addDays(begin, 1);
 //            EarlyReportParam reportParam=new EarlyReportParam();
-            earlyReportService.createEarlyReport();
+            earlyReportService.createEarlyReport(c.getTime());
         } catch (Exception e) {
 
             e.printStackTrace();

+ 2 - 2
alarm-stat/src/main/resources/application-jn.yml

@@ -139,8 +139,8 @@ db:
 
 
 #参与计算的场站
-#runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
-runWindpowerstation: SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_TL_GDC_STA
+runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
+#runWindpowerstation: SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_TL_GDC_STA
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次

+ 8 - 78
alarm-stat/src/test/java/com/gyee/AalarmStatTest.java

@@ -3,6 +3,7 @@ package com.gyee;
 
 import com.gyee.alarm.AlarmMain;
 
+import com.gyee.alarm.service.EarlyReportService;
 import com.gyee.alarm.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -13,88 +14,17 @@ public class AalarmStatTest
     public static void main(String[] args) throws Exception {
         SpringApplication.run(AlarmMain.class, args);
 
-//        FeatureStatService featureStatService= SpringUtils.getBean("featureStatService");
-//
-//
-//        Calendar c = Calendar.getInstance();
-//
-//
-//        featureStatService.findFeatureStatList(c.getTime());
-//
+        EarlyReportService earlyReportService= SpringUtils.getBean("earlyReportService");
 
 
-        System.out.println("完成!");
+        Calendar c = Calendar.getInstance();
 
-//
-//        alarmService.createTable("test1", "alarmid01", "windturbine",
-//               "紧急停机","bj",
-//                false, "桨叶1的91度限位开关故障",
-//                "SXJ_KGDL_HSM_F_WT_0001_EQ", "红石峁01号风机",
-//                "windturbine", true,
-//               "SXJ_KGDL_HSMF01_LN", "红石峁一号集电线路",
-//                "UP77", "SXJ_KGDL_HSMF01_EG",
-//                "红石峁一期项目", 3,
-//                true, "SXJ_KGDL_HSM_FDC_STA",
-//                "平鲁红石峁风电场", "",
-//                "", "",
-//                0, "DI0001");
-//
-//        Alarm test1=new Alarm();
-//        test1.setTbName("test1");
-//        test1.setTs(new Timestamp(new java.util.Date().getTime()));
-//        test1.setOval(0);
-//        test1.setVal(1);
-//        alarmService.insertOne(test1);
-//
-//        alarmService.createTable("test2", "alarmid02", "windturbine",
-//               "紧急停机","bj",
-//                false, "桨叶1的91度限位开关故障",
-//                "SXJ_KGDL_HSM_F_WT_0002_EQ", "红石峁02号风机",
-//                "windturbine", true,
-//               "SXJ_KGDL_HSMF01_LN", "红石峁一号集电线路",
-//                "UP77", "SXJ_KGDL_HSMF01_EG",
-//                "红石峁一期项目", 3,
-//                true, "SXJ_KGDL_HSM_FDC_STA",
-//                "平鲁红石峁风电场", "",
-//                "", "tagid2",
-//                0, "DI0001","");
-//
-//
-//        alarmService.createTable("test3", "alarmid03", "windturbine",
-//                "紧急停机","bj",
-//                false, "桨叶1的91度限位开关故障",
-//                "SXJ_KGDL_HSM_F_WT_0003_EQ", "红石峁03号风机",
-//                "windturbine", true,
-//                "SXJ_KGDL_HSMF01_LN", "红石峁一号集电线路",
-//                "UP77", "SXJ_KGDL_HSMF01_EG",
-//                "红石峁一期项目", 3,
-//                true, "SXJ_KGDL_HSM_FDC_STA",
-//                "平鲁红石峁风电场", "",
-//                "", "tagid3",
-//                0, "DI0001","");
-//
-//
-//
-//        alarmService.createTable("test4", "alarmid04", "windturbine",
-//                "紧急停机","bj",
-//                false, "桨叶1的91度限位开关故障",
-//                "SXJ_KGDL_HSM_F_WT_0004_EQ", "红石峁04号风机",
-//                "windturbine", true,
-//                "SXJ_KGDL_HSMF01_LN", "红石峁一号集电线路",
-//                "UP77", "SXJ_KGDL_HSMF01_EG",
-//                "红石峁一期项目", 3,
-//                true, "SXJ_KGDL_HSM_FDC_STA",
-//                "平鲁红石峁风电场", "",
-//                "", "tagid4",
-//                0, "DI0001","");
-//
-//
 
-//        List<Alarm> ls=alarmService.selectByName("test1");
+        earlyReportService.createEarlyReport(c.getTime());
 //
-//        if(ls.isEmpty())
-//        {
-//            System.out.println(ls.get(0).toString());
-//        }
+
+
+        System.out.println("完成!");
+
     }
 }

Різницю між файлами не показано, бо вона завелика
+ 862 - 3250
log/ota.log


BIN
log/ota.log.2023-09-20.0.gz


BIN
log/ota.log.2023-09-20.1.gz


BIN
log/ota.log.2023-09-20.10.gz


BIN
log/ota.log.2023-09-20.11.gz


BIN
log/ota.log.2023-09-20.110.gz


BIN
log/ota.log.2023-09-20.12.gz


BIN
log/ota.log.2023-09-20.13.gz


BIN
log/ota.log.2023-09-20.14.gz


BIN
log/ota.log.2023-09-20.15.gz


BIN
log/ota.log.2023-09-20.16.gz


BIN
log/ota.log.2023-09-20.2.gz


BIN
log/ota.log.2023-09-20.3.gz


BIN
log/ota.log.2023-09-20.4.gz


BIN
log/ota.log.2023-09-20.5.gz


BIN
log/ota.log.2023-09-20.6.gz


BIN
log/ota.log.2023-09-20.7.gz


BIN
log/ota.log.2023-09-20.8.gz


BIN
log/ota.log.2023-09-20.9.gz


BIN
log/ota.log.2023-09-20.913.gz


BIN
log/ota.log.2023-09-26.0.gz


BIN
log/ota.log.2023-09-27.0.gz