定时任务同步调度平台

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/cache/DataDictionaryCache.java

@@ -0,0 +1,39 @@
+package com.gyee.wisdom.alarm.schedule.cache;
+
+
+
+import com.gyee.wisdom.alarm.schedule.entity.Datadictionary;
+import com.gyee.wisdom.alarm.schedule.service.DatadictionaryService;
+import com.gyee.wisdom.alarm.schedule.util.SpringContextUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @description:
+ * @auther: Wanghs
+ * @date: 2022-09-12
+ */
+public class DataDictionaryCache {
+
+    private static List<Datadictionary> dataDictionaryList = new ArrayList<>();
+
+    public static String getPartName(String code) {
+        if (dataDictionaryList == null || dataDictionaryList.size() <= 0)
+            initList();
+        Optional<Datadictionary> partDataDictionary = dataDictionaryList.stream().filter(s -> s.getCategory().equals("alertrule_category") && s.getCode().equals(code)).findFirst();
+
+        if (partDataDictionary.isPresent())
+            return partDataDictionary.get().getName();
+        else
+            return "";
+    }
+
+    private static void initList() {
+        DatadictionaryService bean = SpringContextUtil.getBean(DatadictionaryService.class);
+        List<Datadictionary> allDatadictionary = bean.list();
+
+        dataDictionaryList = allDatadictionary;
+    }
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/entity/Datadictionary.java

@@ -0,0 +1,23 @@
+package com.gyee.wisdom.alarm.schedule.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("DATADICTIONARY")
+public class Datadictionary {
+    @TableId("ID")
+    private int id;
+    @TableField("CATEGORY")
+    private String category;
+    @TableField("CODE")
+    private String code;
+    @TableField("NAME")
+    private String name;
+    @TableField("ORDERNO")
+    private int orderno;
+    @TableField("ENABLED")
+    private int enabled;
+}

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/AlarmRuleCount.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.alarm.sharding.entity;
+package com.gyee.wisdom.alarm.schedule.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class AlarmRuleCount implements Serializable{
+public class WindturbineAlarmIdCount implements Serializable{
 
     @TableId("ID")
     private Long id;
@@ -16,6 +16,8 @@ public class AlarmRuleCount implements Serializable{
     private Date alarmDate;
     @TableField("PARTS")
     private String parts;
+    @TableField("PARTSNAME")
+    private String partsName;
     @TableField("RULESID")
     private String rulesId;
     @TableField("COUNT")

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/AlarmPartsCount.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.alarm.sharding.entity;
+package com.gyee.wisdom.alarm.schedule.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class AlarmPartsCount implements Serializable{
+public class WindturbineAlarmPartsCount implements Serializable{
 
     @TableId("ID")
     private Long id;
@@ -22,6 +22,8 @@ public class AlarmPartsCount implements Serializable{
     private String windturbineId;
     @TableField("WINDPOWERSTATIONID")
     private String windpowerstationId;
+    @TableField("PARTSNAME")
+    private String partsName;
 
 
 }

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/job/AlarmCountPartsHandler.java

@@ -0,0 +1,157 @@
+package com.gyee.wisdom.alarm.schedule.job;
+
+
+import com.gyee.wisdom.alarm.schedule.cache.DataDictionaryCache;
+import com.gyee.wisdom.alarm.schedule.entity.*;
+import com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmIdCountMapper;
+import com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmPartsCountMapper;
+import com.gyee.wisdom.alarm.schedule.service.*;
+import com.gyee.wisdom.alarm.schedule.util.SnowflakeGenerator;
+import com.gyee.wisdom.common.utils.DateUtil;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author ：xugp
+ * @date ：Created in 2022/9/8 10:15
+ * @description：风机报警 统计根据部件、规则发生报警次数
+ * @modified By：
+ * @version: $
+ */
+@Component
+@Slf4j
+@EnableScheduling
+public class AlarmCountPartsHandler {
+
+    @Autowired
+    private AlarmSnapService alarmSnapService;
+
+    @Autowired
+    private TableNameService tableNameService;
+
+    @Autowired
+    private WindturbineAlarmIdCountMapper windturbineAlarmIdCountMapper;
+
+    @Autowired
+    private WindturbineAlarmPartsCountMapper windturbineAlarmPartsCountMapper;
+
+    @Autowired
+    private Warning2Service warning2Service;
+
+    @Autowired
+    private WindturbineService windturbineService;
+
+
+    @Autowired
+    private AlarmHistoryService alarmHistoryService;
+
+    @XxlJob("AlarmCountParts")
+    public boolean doTask() {
+
+        try {
+            List<AlarmSnap> snapList = alarmSnapService.queryAll(null, null, "windturbine", null, null, null, null, null, null, null);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String strDate = sdf.format(DateUtil.addDays(new Date(),-1));
+            Date dtStart = sdf.parse(strDate);
+            Date dtEnd = DateUtil.addDays(dtStart, 1);
+            Date dtNow = new Date();
+            while (dtEnd.getTime() < dtNow.getTime()) {
+                List<WindturbineAlarmPartsCount> acList = new ArrayList<>();
+                List<WindturbineAlarmIdCount> alarmRuleCounts = new ArrayList<>();
+                Map<String,List<AlarmHistory>> map = new HashMap<>();
+                //根据windturbineid分组
+                Map<String,List<AlarmSnap>> maps = snapList.stream().collect(Collectors.groupingBy(AlarmSnap::getWindturbineId));
+                for (Map.Entry<String,List<AlarmSnap>> listEntry : maps.entrySet()) {
+                    List<AlarmSnap> alarmSnap = listEntry.getValue();
+                    List<AlarmHistory> alarmHistories = new ArrayList<>();
+                    for(AlarmSnap snap : alarmSnap){
+                        String tbName = tableNameService.getAlarmHistoryTableName(snap.getStationId(), dtStart);
+                        List<AlarmHistory> alarmHistories1 = alarmHistoryService.selectAlarmHistory(tbName, snap.getId(), dtStart, dtEnd);
+                        alarmHistories.addAll(alarmHistories1);
+                    }
+                    map.put(listEntry.getKey(),alarmHistories);
+                }
+                //遍历map(key:windturbined,value:history),得到部件
+                for (Map.Entry<String,List<AlarmHistory>> entry : map.entrySet()){
+                    Map<String,String> map1 = new HashMap<>();
+                    List<AlarmHistory> value = entry.getValue();
+                    if (value.size()>0) {
+                        for (AlarmHistory alarmHistory : value) {
+                            AlarmSnap alarmSnap = alarmSnapService.queryById(alarmHistory.getSnapId());
+                            Warning2 warning2 = warning2Service.selectByEdnvalue(alarmSnap.getAlertValue());
+                            if (warning2 != null){
+                                String id = alarmHistory.getId() + "_" + alarmHistory.getSnapId();
+                                map1.put(id, warning2.getRelatedParts());
+                            }
+                        }
+                        //分组转化为key:parts,value:snapId
+                        Map<String, List<Map.Entry<String,String>>> result = map1.entrySet().stream().collect(Collectors.groupingBy(c -> c.getValue()));
+                        for (Map.Entry<String, List<Map.Entry<String,String>>> entry1 : result.entrySet()) {
+                            List<Map.Entry<String, String>> listValue = entry1.getValue();
+                            int count = 0;
+                            List<String> list = new ArrayList<>();
+                            for (Map.Entry<String, String> map2 : listValue) {
+                                String[] split = map2.getKey().split("_");
+                                long l = Long.parseLong(split[1]);
+                                AlarmSnap alarmSnap = alarmSnapService.queryById(l);
+                                Warning2 warning2 = warning2Service.selectByEdnvalue(alarmSnap.getAlertValue());
+                                String tbName = tableNameService.getAlarmHistoryTableName(alarmSnap.getStationId(), dtStart);
+                                count = count + alarmHistoryService.selectAlarmSnapCount(tbName,Long.parseLong(split[0]));
+                                list.add(warning2.getId());
+                            }
+                            Map<String, Integer> mapCount = list.stream().collect(Collectors.toMap(key -> key, values -> 1, (value1, value2) -> value1 + value2));
+                            for (Map.Entry<String, Integer> entryString : mapCount.entrySet()) {
+                                //统计某一种规则的报警次数
+                                WindturbineAlarmIdCount windturbineAlarmIdCount = new WindturbineAlarmIdCount();
+                                windturbineAlarmIdCount.setId(SnowflakeGenerator.generateId());
+                                windturbineAlarmIdCount.setAlarmDate(dtStart);
+                                windturbineAlarmIdCount.setParts(entry1.getKey());
+                                windturbineAlarmIdCount.setRulesId(entryString.getKey());
+                                windturbineAlarmIdCount.setCount(entryString.getValue());
+                                windturbineAlarmIdCount.setWindturbineId(entry.getKey());
+                                windturbineAlarmIdCount.setPartsName(DataDictionaryCache.getPartName(entry1.getKey()));
+                                windturbineAlarmIdCount.setWindpowerstationId(windturbineService.selectWindturbineByWindturbineid(entry.getKey()).getWindpowerstationid());
+                                alarmRuleCounts.add(windturbineAlarmIdCount);
+                            }
+                            if (count > 0) {
+                                //统计部件分类的部件次数
+                                WindturbineAlarmPartsCount windturbineAlarmPartsCount = new WindturbineAlarmPartsCount();
+                                windturbineAlarmPartsCount.setId(SnowflakeGenerator.generateId());
+                                windturbineAlarmPartsCount.setAlarmDate(dtStart);
+                                windturbineAlarmPartsCount.setParts(entry1.getKey());
+                                windturbineAlarmPartsCount.setCount(count);
+                                windturbineAlarmPartsCount.setPartsName(DataDictionaryCache.getPartName(entry1.getKey()));
+                                windturbineAlarmPartsCount.setWindturbineId(entry.getKey());
+                                windturbineAlarmPartsCount.setWindpowerstationId(windturbineService.selectWindturbineByWindturbineid(entry.getKey()).getWindpowerstationid());
+                                acList.add(windturbineAlarmPartsCount);
+                            }
+                        }
+                    }
+                }
+                if (alarmRuleCounts.size() > 0) {
+                    windturbineAlarmIdCountMapper.batchInsert(alarmRuleCounts);
+                }
+                if (acList.size() > 0) {
+                    windturbineAlarmPartsCountMapper.batchInsert(acList);
+                }
+                dtStart = dtEnd;
+                dtEnd = DateUtil.addDays(dtStart, 1);
+            }
+
+        } catch(Exception ex){
+            log.error(ex.getMessage());
+            log.error(ex.getStackTrace().toString());
+            return false;
+        }
+
+        return true;
+    }
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/mapper/AlarmHisotryMapper.java

@@ -53,6 +53,13 @@ public interface AlarmHisotryMapper extends BaseMapper<AlarmHistory> {
                         @Param("starttime") Date startTime,
                         @Param("endtime") Date endTime);
 
+    int selectAlarmSnapCount(@Param("tbName") String tableName,
+                             @Param("id") Long id);
+    List<AlarmHistory> selectAlarmHistory(@Param("tbName") String tableName,
+                                          @Param("snapid") Long snapid,
+                                          @Param("starttime") Date startTime,
+                                          @Param("endtime") Date endTime);
+
 
 
     List<FaultWarning> selectHistoryAlarmSnapAndWarning(

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/mapper/DatadictionaryMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.wisdom.alarm.schedule.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.gyee.wisdom.alarm.schedule.entity.Datadictionary;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+@Mapper
+public interface DatadictionaryMapper extends BaseMapper<Datadictionary> {
+
+    Datadictionary selectBycode(String relatedParts);
+
+    List<Datadictionary> getAllDatadictionary();
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/mapper/WindturbineAlarmIdCountMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.wisdom.alarm.schedule.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmIdCount;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface WindturbineAlarmIdCountMapper extends BaseMapper<WindturbineAlarmIdCount> {
+
+    void batchInsert(  @Param("list") List<WindturbineAlarmIdCount> windturbineAlarmIdCounts);
+
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/mapper/WindturbineAlarmPartsCountMapper.java

@@ -0,0 +1,18 @@
+package com.gyee.wisdom.alarm.schedule.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmPartsCount;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Mapper
+public interface WindturbineAlarmPartsCountMapper extends BaseMapper<WindturbineAlarmPartsCount> {
+
+    void batchInsert(  @Param("list") List<WindturbineAlarmPartsCount> windturbineAlarmPartsCounts);
+
+    List<WindturbineAlarmPartsCount> findByDate(@Param("stationId") String stationId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/service/AlarmHistoryService.java

@@ -25,5 +25,13 @@ public class AlarmHistoryService extends ServiceImpl<AlarmHisotryMapper, AlarmHi
         return  alarmHisotryMapper.selectSnapCount(tableName, snapid, startDate, endDate);
     }
 
+    public List<AlarmHistory> selectAlarmHistory(String tbName, Long id, Date dtStart, Date dtEnd) {
+        return alarmHisotryMapper.selectAlarmHistory(tbName,id,dtStart,dtEnd);
+    }
+
+    public int selectAlarmSnapCount(String tableName, long id) {
+        return  alarmHisotryMapper.selectAlarmSnapCount(tableName, id);
+    }
+
 
 }

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/service/AlarmSnapService.java

@@ -22,6 +22,10 @@ public class AlarmSnapService extends ServiceImpl<AlarmSnapMapper, AlarmSnap> {
     @Autowired
     private AlarmSnapMapper alarmSnapMapper;
 
+    public AlarmSnap queryById(long snapId) {
+        return alarmSnapMapper.selectById(snapId);
+    }
+
 
     public List<AlarmSnap> queryAll(String stationId,
                                     String windturbineId,

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/service/DatadictionaryService.java

@@ -0,0 +1,92 @@
+package com.gyee.wisdom.alarm.schedule.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.wisdom.alarm.schedule.entity.Datadictionary;
+import com.gyee.wisdom.alarm.schedule.mapper.DatadictionaryMapper;
+import com.gyee.wisdom.common.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@Slf4j
+public class DatadictionaryService extends ServiceImpl<DatadictionaryMapper, Datadictionary> {
+
+    @Autowired
+    private DatadictionaryMapper datadictionaryMapper;
+
+    public IPage<Datadictionary> pageQueryAll(Page<Datadictionary> page, String name, String category) {
+        QueryWrapper<Datadictionary> wrapper = new QueryWrapper<>();
+        if (StringUtil.isNotBlank(name))
+            wrapper.like("name", name);
+        if (StringUtil.isNotBlank(category))
+            wrapper.eq("category", category);
+        return datadictionaryMapper.selectPage(page, wrapper);
+    }
+
+    public List<Datadictionary> getAllDatadictionary() {
+        return datadictionaryMapper.getAllDatadictionary();
+    }
+
+    public int saveOrUpdateDatadictionary(Datadictionary datadictionary) {
+        int result = 0;
+        if(datadictionary.getId()<=0){
+            QueryWrapper<Datadictionary> wrapper = new QueryWrapper<>();
+            wrapper.orderByDesc("id");
+            List<Datadictionary> datadictionaries = datadictionaryMapper.selectList(wrapper);
+            datadictionary.setId(datadictionaries.get(0).getId()+1);
+            result = datadictionaryMapper.insert(datadictionary);
+        }else {
+            Datadictionary datadictionary1 = datadictionaryMapper.selectById(datadictionary.getId());
+            if (datadictionary1!=null){
+                result = datadictionaryMapper.updateById(datadictionary);
+            }
+            else {
+                result = datadictionaryMapper.insert(datadictionary);
+            }
+        }
+        return result;
+    }
+
+    public int deleteDatadictionary(String id) {
+        return datadictionaryMapper.deleteById(id);
+    }
+
+    public boolean saveOrUpdateUserSet(String category,String code,boolean b){
+        QueryWrapper<Datadictionary> wrapper=new QueryWrapper();
+        wrapper.eq("CATEGORY",category);
+        wrapper.eq("CODE",code);
+        List<Datadictionary> lst = baseMapper.selectList(wrapper);
+        if(lst.size()==1){
+            Datadictionary datadictionary = lst.get(0);
+            datadictionary.setEnabled(b?1:0);
+            int i = baseMapper.updateById(datadictionary);
+            return  i>0?true:false;
+        }else{
+            return false;
+        }
+    }
+
+    public Datadictionary getUserSet(String category,String code){
+        QueryWrapper<Datadictionary> wrapper=new QueryWrapper();
+        wrapper.eq("CATEGORY",category);
+        wrapper.eq("CODE",code);
+        List<Datadictionary> lst = baseMapper.selectList(wrapper);
+        if(lst.size()==1)
+            return lst.get(0);
+        else
+            return null;
+    }
+
+    public List<Datadictionary> getDatadictionary(String category){
+        List<Datadictionary> lst = datadictionaryMapper.selectList(new QueryWrapper<Datadictionary>().eq("CATEGORY", category));
+        return lst;
+    }
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/service/Warning2Service.java

@@ -1,5 +1,6 @@
 package com.gyee.wisdom.alarm.schedule.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.wisdom.alarm.schedule.entity.Warning2;
 import com.gyee.wisdom.alarm.schedule.mapper.Warning2Mapper;
@@ -15,5 +16,12 @@ import java.util.List;
 @Service
 public class Warning2Service extends ServiceImpl<Warning2Mapper, Warning2> {
 
+    public Warning2 selectByEdnvalue(int ednValue) {
+        QueryWrapper<Warning2> wrapper = new QueryWrapper<>();
+        wrapper.eq("EDNAVALUE", ednValue);
+        Warning2 warning2 = baseMapper.selectOne(wrapper);
+        return warning2;
+    }
+
 
 }

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/service/WindturbineAlarmIdCountService.java

@@ -0,0 +1,17 @@
+package com.gyee.wisdom.alarm.schedule.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmIdCount;
+import com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmIdCountMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+
+@Service
+public class WindturbineAlarmIdCountService extends ServiceImpl<WindturbineAlarmIdCountMapper, WindturbineAlarmIdCount> {
+
+    @Autowired
+    private WindturbineAlarmIdCountMapper windturbineAlarmIdCountMapper;
+
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/service/WindturbineAlarmPartsCountService.java

@@ -0,0 +1,33 @@
+package com.gyee.wisdom.alarm.schedule.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmPartsCount;
+import com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmPartsCountMapper;
+import com.gyee.wisdom.common.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class WindturbineAlarmPartsCountService extends ServiceImpl<WindturbineAlarmPartsCountMapper, WindturbineAlarmPartsCount> {
+
+
+    @Autowired
+    private AlarmSnapService alarmSnapService;
+
+    @Autowired
+    private Warning2Service warning2Service;
+
+    @Autowired
+    private TableNameService tableNameService;
+
+    @Autowired
+    private AlarmHistoryService alarmHistoryService;
+
+    @Autowired
+    private WindturbineAlarmIdCountService windturbineAlarmIdCountService;
+
+}

schedule-job/alarm-schedule/src/main/java/com/gyee/wisdom/alarm/schedule/util/SpringContextUtil.java

@@ -0,0 +1,114 @@
+package com.gyee.wisdom.alarm.schedule.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * Spring的工具类，用来获得配置文件中的bean
+ * 
+ */
+@Component
+public class SpringContextUtil implements ApplicationContextAware, DisposableBean {
+
+	private static ApplicationContext applicationContext = null;
+
+	/***
+	 * 当继承了ApplicationContextAware类之后，那么程序在调用 getBean(String)的时候会自动调用该方法， 不用自己操作
+	 */
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		SpringContextUtil.applicationContext = applicationContext;
+	}
+
+	/**
+	 * 实现DisposableBean接口, 在Context关闭时清理静态变量.
+	 */
+	@Override
+	public void destroy() throws Exception {
+		SpringContextUtil.clearHolder();
+	}
+
+	/**
+	 * 取得存储在静态变量中的ApplicationContext.
+	 */
+	public static ApplicationContext getApplicationContext() {
+		return applicationContext;
+	}
+
+	/***
+	 * 根据一个bean的id获取配置文件中相应的bean
+	 * 
+	 * @param name
+	 * @return
+	 * @throws BeansException
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T getBean(String name) throws BeansException {
+		return (T) applicationContext.getBean(name);
+	}
+
+	/***
+	 * 类似于getBean(String name)只是在参数中提供了需要返回到的类型。
+	 * 
+	 * @param name
+	 * @param requiredType
+	 * @return
+	 * @throws BeansException
+	 */
+	public static <T> T getBean(Class<T> requiredType) throws BeansException {
+		return applicationContext.getBean(requiredType);
+	}
+
+	/**
+	 * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
+	 * 
+	 * @param name
+	 * @return boolean
+	 */
+	public static boolean containsBean(String name) {
+		return applicationContext.containsBean(name);
+	}
+
+	/**
+	 * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。
+	 * 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+	 * 
+	 * @param name
+	 * @return boolean
+	 * @throws NoSuchBeanDefinitionException
+	 */
+	public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+		return applicationContext.isSingleton(name);
+	}
+
+	/**
+	 * @param name
+	 * @return Class 注册对象的类型
+	 * @throws NoSuchBeanDefinitionException
+	 */
+	public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
+		return applicationContext.getType(name);
+	}
+
+	/**
+	 * 如果给定的bean名字在bean定义中有别名，则返回这些别名
+	 * 
+	 * @param name
+	 * @return
+	 * @throws NoSuchBeanDefinitionException
+	 */
+	public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
+		return applicationContext.getAliases(name);
+	}
+
+	/**
+	 * 清除SpringContextHolder中的ApplicationContext为Null.
+	 */
+	public static void clearHolder() {
+		applicationContext = null;
+	}
+}

schedule-job/alarm-schedule/src/main/resources/application.yaml

@@ -9,14 +9,14 @@ spring:
   application:
     name: alarm-schedule
   datasource:
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://123.60.219.66/wisdom_cs?useUnicode=true&characterEncoding=UTF-8
-#    username: root
-#    password: gyeepd@123
-    driver-class-name: oracle.jdbc.OracleDriver
-    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-    username: nxfdprod
-    password: gdnxfd123
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://123.60.219.66/wisdom_cs?useUnicode=true&characterEncoding=UTF-8
+    username: root
+    password: gyeepd@123
+#    driver-class-name: oracle.jdbc.OracleDriver
+#    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+#    username: nxfdprod
+#    password: gdnxfd123
     # ----------------------------------------------------------------
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
@@ -84,8 +84,7 @@ count:
   custom: true
   fault: false
 
-stationname:
-  BY
+stationname: MHS,XS,NSS,QS,SBQ,DWK,HZJ,MCH,PL,XH,XS,BY
 #tablespace: TS_GDSJ_DATA
 tablespace: TS_NXFD_DATA
 
@@ -110,7 +109,7 @@ knife4j:
 xxl:
   job:
     admin:
-      addresses: http://localhost:8081/xxl-job-admin
+      addresses: http://localhost:8080/xxl-job-admin
     accessToken:
     executor:
       appname: alarm-schedule

schedule-job/alarm-schedule/src/main/resources/mappers-oracle/AlarmHistoryMapper.xml

@@ -140,6 +140,16 @@
         order by a.alerttime  desc
     </select>
 
+    <select id="selectAlarmHistory" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.AlarmHistory">
+        select * from ${tbName} where snapid = #{snapid}
+                                  and messagetype = '1'
+                                  and alerttime &gt;= #{starttime,jdbcType=DATE} and alerttime &lt; #{endtime,jdbcType=DATE}
+    </select>
+
+    <select id="selectAlarmSnapCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*) from ${tbName} where id = #{id}
+    </select>
+
     <select id="selectSnapCount" parameterType="java.util.Map" resultType="java.lang.Integer">
         select count(*) from ${tbName} where snapid = #{snapid}
             and messagetype = '1'

schedule-job/alarm-schedule/src/main/resources/mappers-oracle/DatadictionaryMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.DatadictionaryMapper">
+
+
+    <select id="selectBycode" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.Datadictionary">
+        select * from Datadictionary where code = #{relatedParts} and category='alertrule_category'
+    </select>
+
+
+    <select id="getAllDatadictionary" resultType="com.gyee.wisdom.alarm.schedule.entity.Datadictionary" >
+        select * from Datadictionary a
+        where category = 'early_category'
+    </select>
+
+</mapper>

warning-web/src/main/resources/mappers-oracle/AlarmRuleCountMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.wisdom.alarm.sharding.mapper.AlarmRuleCountMapper">
+<mapper namespace="com.gyee.wisdom.alarm.sharding.mapper.WindturbineAlarmIdCountMapper">
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false">
-        insert into alarmrulecount ( ID, alarmdate, parts,rulesid,count,windturbineid,windpowerstationid)
+        insert into Windturbine_Alarm_Id_Count ( ID, alarmdate, parts,partsname,rulesid,count,windturbineid,windpowerstationid)
         <foreach collection="list" item="item" index="index" separator="union all" >
             ( select
-            #{item.id}, #{item.alarmDate},#{item.parts},#{item.rulesId},#{item.count},#{item.windturbineId},#{item.windpowerstationId}
+            #{item.id}, #{item.alarmDate},#{item.parts},#{item.partsName},#{item.rulesId},#{item.count},#{item.windturbineId},#{item.windpowerstationId}
             from dual )
         </foreach>
     </insert>

schedule-job/alarm-schedule/src/main/resources/mappers-oracle/WindturbineAlarmPartsCountMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmPartsCountMapper">
+
+    <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false">
+        insert into Windturbine_Alarm_Parts_Count ( ID, alarmdate, parts,count,windturbineid,windpowerstationid,partsname)
+        <foreach collection="list" item="item" index="index" separator="union all" >
+            ( select
+            #{item.id}, #{item.alarmDate},#{item.parts},#{item.count},#{item.windturbineId},#{item.windpowerstationId},#{item.partsName}
+            from dual )
+        </foreach>
+    </insert>
+
+    <select id="findByDate" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmPartsCount"  >
+        select * from Windturbine_Alarm_Parts_Count a
+        <where>
+            1=1
+            <if test="startTime !=null and endTime !=null">
+                and a.alarmdate &gt;= #{startTime,jdbcType=DATE} and a.alarmdate &lt;= #{endTime,jdbcType=DATE}
+            </if>
+            <if test="stationId !=null and stationId !=''">
+                and a.windpowerstationId=#{stationId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

schedule-job/alarm-schedule/src/main/resources/mappers-postgresql/AlarmHistoryMapper.xml

@@ -140,6 +140,16 @@
         order by a.alerttime  desc
     </select>
 
+    <select id="selectAlarmHistory" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.AlarmHistory">
+        select * from ${tbName} where snapid = #{snapid}
+                                  and messagetype = '1'
+                                  and alerttime &gt;= #{starttime,jdbcType=DATE} and alerttime &lt; #{endtime,jdbcType=DATE}
+    </select>
+
+    <select id="selectAlarmSnapCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*) from ${tbName} where id = #{id}
+    </select>
+
     <select id="selectSnapCount" parameterType="java.util.Map" resultType="java.lang.Integer">
         select count(*) from ${tbName} where snapid = #{snapid}
             and messagetype = '1'

schedule-job/alarm-schedule/src/main/resources/mappers-postgresql/DatadictionaryMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.DatadictionaryMapper">
+
+
+    <select id="selectBycode" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.Datadictionary">
+        select * from Datadictionary where code = #{relatedParts}
+    </select>
+
+
+    <select id="getAllDatadictionary" resultType="com.gyee.wisdom.alarm.schedule.entity.Datadictionary" >
+        select * from Datadictionary a
+        where category = 'early_category'
+    </select>
+
+</mapper>

warning-web/src/main/resources/mappers/AlarmPartsCountMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.wisdom.alarm.sharding.mapper.AlarmPartsCountMapper">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmIdCountMapper">
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false">
-        insert into alarmpartscount ( ID, alarmdate, parts,count,windturbineid )
+        insert into Windturbine_Alarm_Id_Count ( ID, alarmdate, parts,partsname,rulesid,count,windturbineid,windpowerstationid)
         <foreach collection="list" item="item" index="index" separator="union all" >
             ( select
-            #{item.id}, #{item.alarmDate},#{item.parts},#{item.count},#{item.windturbineId}
+            #{item.id}, #{item.alarmDate},#{item.parts},#{item.partsName},#{item.rulesId},#{item.count},#{item.windturbineId},#{item.windpowerstationId}
             from dual )
         </foreach>
     </insert>

schedule-job/alarm-schedule/src/main/resources/mappers-postgresql/WindturbineAlarmPartsCountMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmPartsCountMapper">
+
+    <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false">
+        insert into Windturbine_Alarm_Parts_Count ( ID, alarmdate, parts,count,windturbineid,windpowerstationid,partsname)
+        <foreach collection="list" item="item" index="index" separator="union all" >
+            ( select
+            #{item.id}, #{item.alarmDate},#{item.parts},#{item.count},#{item.windturbineId},#{item.windpowerstationId},#{item.partsName}
+            from dual )
+        </foreach>
+    </insert>
+
+    <select id="findByDate" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmPartsCount"  >
+        select * from Windturbine_Alarm_Parts_Count a
+        <where>
+            1=1
+            <if test="startTime !=null and endTime !=null">
+                and a.alarmdate &gt;= #{startTime,jdbcType=DATE} and a.alarmdate &lt;= #{endTime,jdbcType=DATE}
+            </if>
+            <if test="stationId !=null and stationId !=''">
+                and a.windpowerstationId=#{stationId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

schedule-job/alarm-schedule/src/main/resources/mappers/AlarmHistoryMapper.xml

@@ -83,6 +83,11 @@
         order by a.alerttime  desc
     </select>
 
+    <select id="selectAlarmHistory" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.AlarmHistory">
+        select * from ${tbName} where snapid = #{snapid}
+                                  and messagetype = '1'
+                                  and alerttime &gt;= #{starttime,jdbcType=DATE} and alerttime &lt; #{endtime,jdbcType=DATE}
+    </select>
 
     <!-- 联合查询 -->
     <select id="pageQueryAll2" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.model.AlarmHistoryInfo">
@@ -140,6 +145,10 @@
         order by a.alerttime  desc
     </select>
 
+    <select id="selectAlarmSnapCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*) from ${tbName} where id = #{id}
+    </select>
+
     <select id="selectSnapCount" parameterType="java.util.Map" resultType="java.lang.Integer">
         select count(*) from ${tbName} where snapid = #{snapid}
             and messagetype = '1'
@@ -147,6 +156,8 @@
     </select>
 
 
+
+
     <select id="selectHistoryAlarmSnapAndWarning"
             resultType="com.gyee.wisdom.alarm.schedule.entity.FaultWarning">
 

schedule-job/alarm-schedule/src/main/resources/mappers/DatadictionaryMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.DatadictionaryMapper">
+
+
+    <select id="selectBycode" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.Datadictionary">
+        select * from Datadictionary where code = #{relatedParts}
+    </select>
+
+
+    <select id="getAllDatadictionary" resultType="com.gyee.wisdom.alarm.schedule.entity.Datadictionary" >
+        select * from Datadictionary a
+        where category = 'early_category'
+    </select>
+
+</mapper>

warning-web/src/main/resources/mappers-oracle/AlarmPartsCountMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.wisdom.alarm.sharding.mapper.AlarmPartsCountMapper">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmIdCountMapper">
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false">
-        insert into alarmpartscount ( ID, alarmdate, parts,count,windturbineid,windpowerstationid)
+        insert into Windturbine_Alarm_Id_Count ( ID, alarmdate, parts,partsname,rulesid,count,windturbineid,windpowerstationid)
         <foreach collection="list" item="item" index="index" separator="union all" >
             ( select
-            #{item.id}, #{item.alarmDate},#{item.parts},#{item.count},#{item.windturbineId},#{item.windpowerstationId}
+            #{item.id}, #{item.alarmDate},#{item.parts},#{item.partsName},#{item.rulesId},#{item.count},#{item.windturbineId},#{item.windpowerstationId}
             from dual )
         </foreach>
     </insert>

schedule-job/alarm-schedule/src/main/resources/mappers/WindturbineAlarmPartsCountMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.wisdom.alarm.schedule.mapper.WindturbineAlarmPartsCountMapper">
+
+    <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="false">
+        insert into Windturbine_Alarm_Parts_Count ( ID, alarmdate, parts,count,windturbineid,windpowerstationid,partsname)
+        <foreach collection="list" item="item" index="index" separator="union all" >
+            ( select
+            #{item.id}, #{item.alarmDate},#{item.parts},#{item.count},#{item.windturbineId},#{item.windpowerstationId},#{item.partsName}
+            from dual )
+        </foreach>
+    </insert>
+
+    <select id="findByDate" parameterType="java.util.Map" resultType="com.gyee.wisdom.alarm.schedule.entity.WindturbineAlarmPartsCount"  >
+        select * from Windturbine_Alarm_Parts_Count a
+        <where>
+            1=1
+            <if test="startTime !=null and endTime !=null">
+                and a.alarmdate &gt;= #{startTime,jdbcType=DATE} and a.alarmdate &lt;= #{endTime,jdbcType=DATE}
+            </if>
+            <if test="stationId !=null and stationId !=''">
+                and a.windpowerstationId=#{stationId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/mapper/AlarmPartsCountMapper.java

@@ -1,16 +0,0 @@
-package com.gyee.wisdom.alarm.sharding.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.wisdom.alarm.sharding.entity.*;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-@Mapper
-public interface AlarmPartsCountMapper extends BaseMapper<AlarmPartsCount> {
-
-    void batchInsert(  @Param("list") List<AlarmPartsCount> alarmPartsCounts);
-
-}