Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -368,24 +368,24 @@ public class CacheContext implements CommandLineRunner {
 //                zlpointmap.put(b.getId(),stringWindpowerstationpointnewMap);
 //            });
 //        }
-        //标杆风机初始化
-        wtls = proBasicEquipmentService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsable()==1 && i.getIsStandard()==1).collect(Collectors.toList());
-
-        Map<String,String> wpstationmap=new HashMap<>();
-        for(ProBasicEquipment wt:wtls)
-        {
-            wpstationmap.put(wt.getWindpowerstationId(),wt.getId());
-        }
+//        //标杆风机初始化
+//        List<ProBasicEquipment> stwtls = proBasicEquipmentService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsable()==1 && i.getIsStandard()==1).collect(Collectors.toList());
+//
+//        Map<String,String> wpstationmap=new HashMap<>();
+//        for(ProBasicEquipment wt:stwtls)
+//        {
+//            wpstationmap.put(wt.getWindpowerstationId(),wt.getId());
+//        }
 
         wtls = proBasicEquipmentService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsable()==1).collect(Collectors.toList());
 
         logger.info(wtls.size()+"");
         wtls.forEach(wt->{
-            if(wpstationmap.containsKey(wt.getWindpowerstationId()))
-            {
-                String stid=wpstationmap.get(wt.getWindpowerstationId());
-                wtstandardmap.put(wt.getId(),stid);
-            }
+//            if(wpstationmap.containsKey(wt.getWindpowerstationId()))
+//            {
+//                String stid=wpstationmap.get(wt.getWindpowerstationId());
+//                wtstandardmap.put(wt.getId(),stid);
+//            }
             if(wt.getId().contains("_G_"))
             {
                 wtgfls.add(wt);
@@ -444,45 +444,60 @@ public class CacheContext implements CommandLineRunner {
             }
         });
 
+//        //初始化标杆风机
+//        for(ProBasicEquipment wt:wtls)
+//        {
+//            if(wpwtmap.containsKey(wt.getWindpowerstationId()))
+//            {
+//                List<ProBasicEquipment> wts=wpwtmap.get(wt.getWindpowerstationId());
+//                for(ProBasicEquipment w:wts)
+//                {
+//                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
+//                    {
+//                        wtstandardmap.put(wt.getId(),w.getId());
+//                        break;
+//                    }
+//                }
+//            }
+//            if(pjwtmap.containsKey(wt.getProjectId()))
+//            {
+//                List<ProBasicEquipment> wts=pjwtmap.get(wt.getProjectId());
+//                for(ProBasicEquipment w:wts)
+//                {
+//                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
+//                    {
+//                        wtstandardmap.put(wt.getId(),w.getId());
+//                        break;
+//                    }
+//                }
+//            }
+//            if(lnwtmap.containsKey(wt.getLineId()))
+//            {
+//                List<ProBasicEquipment> wts=lnwtmap.get(wt.getLineId());
+//                for(ProBasicEquipment w:wts)
+//                {
+//                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
+//                    {
+//                        wtstandardmap.put(wt.getId(),w.getId());
+//                        break;
+//                    }
+//                }
+//            }
+//        }
+
         //初始化标杆风机
         for(ProBasicEquipment wt:wtls)
         {
-            if(wpwtmap.containsKey(wt.getLineId()))
-            {
-                List<ProBasicEquipment> wts=wpwtmap.get(wt.getLineId());
-                for(ProBasicEquipment w:wts)
-                {
-                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
-                    {
-                        wtstandardmap.put(wt.getId(),w.getId());
-                        break;
-                    }
-                }
-            }
-            if(pjwtmap.containsKey(wt.getLineId()))
+            if(wpwtmap.containsKey(wt.getWindpowerstationId()))
             {
-                List<ProBasicEquipment> wts=pjwtmap.get(wt.getLineId());
+                List<ProBasicEquipment> wts=wpwtmap.get(wt.getWindpowerstationId());
                 for(ProBasicEquipment w:wts)
                 {
-                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
-                    {
-                        wtstandardmap.put(wt.getId(),w.getId());
-                        break;
-                    }
-                }
-            }
-            if(lnwtmap.containsKey(wt.getLineId()))
-            {
-                List<ProBasicEquipment> wts=lnwtmap.get(wt.getLineId());
-                for(ProBasicEquipment w:wts)
-                {
-                    if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
-                    {
-                        wtstandardmap.put(wt.getId(),w.getId());
-                        break;
-                    }
+                    wtstandardmap.put(wt.getId(),w.getId());
+                    break;
                 }
             }
+
         }
 
 
@@ -640,7 +655,7 @@ public class CacheContext implements CommandLineRunner {
 
 
 
-
+        redisService.select(9);
         wtls.forEach(wt->{
 
             if (redisService.hasKey(CurveType.monthCurve.id+"_"+wt.getId())){

realtime/generationXK-service/src/main/java/com/gyee/generation/service/PowerCurveFittingByTimeService.java

@@ -1228,8 +1228,14 @@ public class PowerCurveFittingByTimeService {
             proEconWtCurveFittingService.saveBatch(templs);
         }
 //        proEconWtCurveFittingService.saveBatch(wtcfls);
-        String s = JSONObject.toJSONString(wtcfls);
-        redisService.set(CurveType.dayCurve.id+"_"+windturbineId, s);
+
+
+        if(!wtcfls.isEmpty())
+        {
+            redisService.select(9);
+            String s = JSONObject.toJSONString(wtcfls);
+            redisService.set(CurveType.dayCurve.id+"_"+windturbineId, s);
+        }
 
     }
 
@@ -1330,8 +1336,14 @@ public class PowerCurveFittingByTimeService {
             proEconWtCurveFittingMonthService.saveBatch(templs);
         }
 //        proEconWtCurveFittingMonthService.saveBatch(wtcfls);
-        String s = JSONObject.toJSONString(wtcfls);
-        redisService.set(CurveType.monthCurve.id+"_"+windturbineId, s);
+
+        if(!wtcfls.isEmpty())
+        {
+            redisService.select(9);
+            String s = JSONObject.toJSONString(wtcfls);
+            redisService.set(CurveType.monthCurve.id+"_"+windturbineId, s);
+        }
+
     }
 
     private void insertPoints(String year,  List<PointVo> sjglls, List<PointVo> zyglls, String windturbineId) {
@@ -1423,8 +1435,13 @@ public class PowerCurveFittingByTimeService {
             proEconWtCurveFittingYearService.saveBatch(templs);
         }
 //        proEconWtCurveFittingYearService.saveBatch(wtcfls);
-        String s = JSONObject.toJSONString(wtcfls);
-        redisService.set(CurveType.yearCurve.id+"_"+windturbineId, s);
+
+        if(!wtcfls.isEmpty())
+        {
+            redisService.select(9);
+            String s = JSONObject.toJSONString(wtcfls);
+            redisService.set(CurveType.yearCurve.id+"_"+windturbineId, s);
+        }
     }
     private void insertPoints2(List<PointVo> monthSjglls, List<PointVo> monthZyglls, String windturbineId) {
 
@@ -1905,7 +1922,10 @@ public class PowerCurveFittingByTimeService {
 
 
                 if (!zyglnhpoints.containsKey(0.0))
+                {
                     zyglnhpoints.put(0.0, new PointfVo(0.0, 0.0));
+                }
+
 
                 List<PointfVo> zygltemp = zyglnhpoints.values().stream().filter(it -> it.getX() >= 3).sorted(Comparator.comparing(PointfVo::getX)).collect(Collectors.toList());
                 if (zygltemp.size() != 0) {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindDeviationService.java

@@ -18,6 +18,7 @@ import com.gyee.generation.model.vo.DeviationVo;
 import com.gyee.generation.service.auto.IProEconEquipmentDeviatPowerService;
 import com.gyee.generation.service.auto.IProEconEquipmentDeviatSpeedService;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -35,7 +36,8 @@ public class WindDeviationService {
     private IProEconEquipmentDeviatSpeedService proEconEquipmentDeviatSpeedService;
     @Resource
     private IProEconEquipmentDeviatPowerService proEconEquipmentDeviatPowerService;
-
+    @Value("${initialcode}")
+    private String initialcode;
     public void save(String begin,String end){
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
@@ -55,7 +57,7 @@ public class WindDeviationService {
             proEconEquipmentDeviatSpeedService.remove(del);
 
             wtfdls.stream().forEach(wt->{
-                if (wt.getEquipmentCategory()==-1){
+//                if (wt.getEquipmentCategory()==-1){
                     Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
 
                     ProBasicEquipmentPoint fxPoint = equipmentPointMap.get(ContantXk.CJ_FX);
@@ -63,19 +65,29 @@ public class WindDeviationService {
                     ProBasicEquipmentPoint fsPoint = equipmentPointMap.get(ContantXk.CJ_SSFS);
                     ProBasicEquipmentPoint glPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
 
+
                     List<PointData> fxDatasSnap = null;
                     List<PointData> dfjdDatasSnap = null;
                     List<PointData> fsDatasSnap = null;
                     List<PointData> glDatasSnap = null;
-                    try {
-                        fxDatasSnap = edosUtil.getHistoryDatasSnap(fxPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
-                        dfjdDatasSnap = edosUtil.getHistoryDatasSnap(dfjdPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
-                        fsDatasSnap = edosUtil.getHistoryDatasSnap(fsPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
-                        glDatasSnap = edosUtil.getHistoryDatasSnap(glPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+
+                    if(!fxPoint.getNemCode().equals(initialcode) &&
+                            !dfjdPoint.getNemCode().equals(initialcode) &&
+                            !fsPoint.getNemCode().equals(initialcode) &&
+                            !glPoint.getNemCode().equals(initialcode)
+                    )
+                    {
+                        try {
+                            fxDatasSnap = edosUtil.getHistoryDatasSnap(fxPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
+                            dfjdDatasSnap = edosUtil.getHistoryDatasSnap(dfjdPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
+                            fsDatasSnap = edosUtil.getHistoryDatasSnap(fsPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
+                            glDatasSnap = edosUtil.getHistoryDatasSnap(glPoint.getNemCode(), startOfDay.getTime() / 1000, endOfDay.getTime() / 1000);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
 
+
                     if (StringUtils.isNotEmpty(fxDatasSnap) && StringUtils.isNotEmpty(dfjdDatasSnap) && StringUtils.isNotEmpty(fsDatasSnap) && StringUtils.isNotEmpty(glDatasSnap)){
                         List<DeviationVo> tempList = new ArrayList<>();
                         for (int i =0;i<fxDatasSnap.size();i++){
@@ -346,8 +358,7 @@ public class WindDeviationService {
                         }
                     }
 
-
-                }
+//                }
             });
 
         });

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CycleCalculationService.java

@@ -1,17 +1,21 @@
 package com.gyee.generation.service.realtimelibrary;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.CurveType;
 import com.gyee.generation.model.vo.PowerVo;
 import com.gyee.generation.util.PointUtil;
 import com.gyee.generation.util.StringUtils;
 import com.gyee.generation.util.math.LightToTheoreticalPower;
 import com.gyee.generation.util.math.PowerIntegration;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
+import com.gyee.generation.util.redis.RedisService;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -38,6 +42,8 @@ public class CycleCalculationService {
     private String notCalculatePower;
 
     @Resource
+    private RedisService redisService;
+    @Resource
     private LightToTheoreticalPower lightToTheoreticalPower;
     @SneakyThrows
     public void saveCyle() throws Exception {
@@ -4322,8 +4328,123 @@ public class CycleCalculationService {
         return zsss;
     }
 
+//    private double generalLossBySpeed(List<PointData> ztmxDatasSnap, List<PointData> speedDatasSnap, List<PointData> powerDatasSnap, double statusValue,ProBasicEquipment wt) {
+//        List<PointData> pointDataList = ztmxDatasSnap.stream().filter(zt -> zt.getPointValueInDouble() == statusValue).collect(Collectors.toList());
+//
+//        Double zsss = 0.0;
+//        if (ztmxDatasSnap.size() == speedDatasSnap.size() && speedDatasSnap.size() == powerDatasSnap.size()) {
+//
+//            PowerIntegration powerIntegration=new PowerIntegration();
+//            Map<Integer, Double> powerData=new HashMap<>();
+//            if (statusValue == 2.0 || statusValue == 3.0 || statusValue == 8.0) {
+//
+//                int time=0;
+//                for (int i = 0; i < ztmxDatasSnap.size(); i++) {
+//                    for (int j = 0; j < pointDataList.size(); j++) {
+//                        if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())) {
+//                            double pjfs = StringUtils.round(speedDatasSnap.get(i).getPointValueInDouble(),2);
+//                            double power = powerDatasSnap.get(i).getPointValueInDouble();
+//
+//                            if (CacheContext.theoreticalPowerMap.containsKey(wt.getModelId()))
+//                            {
+//                                Map<Double,ProBasicModelPowerRd> valuemap=CacheContext.theoreticalPowerMap.get(wt.getModelId());
+//                                if(valuemap.containsKey(pjfs))
+//                                {
+//                                    double bzgl=  valuemap.get(pjfs).getTheoryPower();
+//
+//                                    if (power > 0) {
+//                                        double temp1 = bzgl - power;
+//                                        if (temp1 > 0) {
+////                                            zsss += temp1;
+//                                            powerData.put(time,temp1);
+//                                            time++;
+//                                        }
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+////                zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
+//            } else {
+//                int time=0;
+//                for (int i = 0; i < ztmxDatasSnap.size(); i++) {
+//                    for (int j = 0; j < pointDataList.size(); j++) {
+//                        if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())) {
+//
+//
+//                            double pjfs = StringUtils.round(speedDatasSnap.get(i).getPointValueInDouble(),2);
+//                            if (CacheContext.theoreticalPowerMap.containsKey(wt.getModelId()))
+//                            {
+//                                Map<Double,ProBasicModelPowerRd> valuemap=CacheContext.theoreticalPowerMap.get(wt.getModelId());
+//                                if(valuemap.containsKey(pjfs))
+//                                {
+//                                    double bzgl=  valuemap.get(pjfs).getTheoryPower();
+//
+//                                    powerData.put(time,bzgl);
+//                                    time++;
+//
+//                                }
+//                            }
+//
+//
+//
+//
+//                        }
+//                    }
+//                }
+//
+//            }
+////            zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
+//            double timeInterval=BigDecimal.valueOf(1).divide(new BigDecimal(120), 2, RoundingMode.HALF_EVEN).doubleValue();
+//            zsss= powerIntegration.calculateEnergy(powerData, timeInterval);
+//        }
+//
+//        return zsss;
+//    }
+
     private double generalLossBySpeed(List<PointData> ztmxDatasSnap, List<PointData> speedDatasSnap, List<PointData> powerDatasSnap, double statusValue,ProBasicEquipment wt) {
         List<PointData> pointDataList = ztmxDatasSnap.stream().filter(zt -> zt.getPointValueInDouble() == statusValue).collect(Collectors.toList());
+
+        Map<Double,Double> powerMap=new HashMap<>();
+        if (redisService.hasKey(CurveType.monthCurve.id+"_"+wt.getId())){
+            String cp0String = redisService.get(CurveType.monthCurve.id+"_"+wt.getId());
+            List<ProEconWtCurveFittingMonth>   powerList = JSONObject.parseObject(cp0String, new TypeReference< List<ProEconWtCurveFittingMonth>>() {
+            });
+            if(!powerList.isEmpty())
+            {
+                powerList.stream().forEach(curveFitting->{
+
+                    powerMap.put(curveFitting.getSpeed(),curveFitting.getActualPower());
+
+                });
+            }
+        }else
+        {
+            if(CacheContext.wpwtmap.containsKey(wt.getWindpowerstationId()))
+            {
+                List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get(wt.getWindpowerstationId());
+                for(ProBasicEquipment w:wtls)
+                {
+                    if (wt.getModelId().equals(w.getModelId()) && redisService.hasKey(CurveType.monthCurve.id+"_"+wt.getId())){
+                        String cp0String = redisService.get(CurveType.monthCurve.id+"_"+wt.getId());
+                        List<ProEconWtCurveFittingMonth>   powerList = JSONObject.parseObject(cp0String, new TypeReference< List<ProEconWtCurveFittingMonth>>() {
+                        });
+                        if(!powerList.isEmpty())
+                        {
+                            powerList.stream().forEach(curveFitting->{
+
+                                powerMap.put(curveFitting.getSpeed(),curveFitting.getActualPower());
+
+                            });
+
+                            break;
+                        }
+                    }
+
+                }
+            }
+        }
         Double zsss = 0.0;
         if (ztmxDatasSnap.size() == speedDatasSnap.size() && speedDatasSnap.size() == powerDatasSnap.size()) {
 
@@ -4338,22 +4459,19 @@ public class CycleCalculationService {
                             double pjfs = StringUtils.round(speedDatasSnap.get(i).getPointValueInDouble(),2);
                             double power = powerDatasSnap.get(i).getPointValueInDouble();
 
-                            if (CacheContext.theoreticalPowerMap.containsKey(wt.getModelId()))
+                            if(powerMap.containsKey(pjfs))
                             {
-                                Map<Double,ProBasicModelPowerRd> valuemap=CacheContext.theoreticalPowerMap.get(wt.getModelId());
-                                if(valuemap.containsKey(pjfs))
-                                {
-                                    double bzgl=  valuemap.get(pjfs).getTheoryPower();
+                                double bzgl=  powerMap.get(pjfs);
 
-                                    if (power > 0) {
-                                        double temp1 = bzgl - power;
-                                        if (temp1 > 0) {
+                                if (power > 0) {
+                                    double temp1 = bzgl - power;
+                                    if (temp1 > 0) {
 //                                            zsss += temp1;
-                                            powerData.put(time,temp1);
-                                            time++;
-                                        }
+                                        powerData.put(time,temp1);
+                                        time++;
                                     }
                                 }
+
                             }
                         }
                     }
@@ -4367,17 +4485,14 @@ public class CycleCalculationService {
 
 
                             double pjfs = StringUtils.round(speedDatasSnap.get(i).getPointValueInDouble(),2);
-                            if (CacheContext.theoreticalPowerMap.containsKey(wt.getModelId()))
+
+                            if(powerMap.containsKey(pjfs))
                             {
-                                Map<Double,ProBasicModelPowerRd> valuemap=CacheContext.theoreticalPowerMap.get(wt.getModelId());
-                                if(valuemap.containsKey(pjfs))
-                                {
-                                    double bzgl=  valuemap.get(pjfs).getTheoryPower();
+                                double bzgl=  powerMap.get(pjfs);
 
-                                    powerData.put(time,bzgl);
-                                    time++;
+                                powerData.put(time,bzgl);
+                                time++;
 
-                                }
                             }
 
                         }
@@ -4386,7 +4501,7 @@ public class CycleCalculationService {
 
             }
 //            zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
-            double timeInterval=BigDecimal.valueOf(1).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue();
+            double timeInterval=BigDecimal.valueOf(1).divide(new BigDecimal(120), 2, RoundingMode.HALF_EVEN).doubleValue();
             zsss= powerIntegration.calculateEnergy(powerData, timeInterval);
         }
 

realtime/generationXK-service/src/main/java/com/gyee/generation/util/math/PowerIntegration.java

@@ -2,6 +2,7 @@ package com.gyee.generation.util.math;
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 @Service
@@ -25,9 +26,10 @@ public class PowerIntegration {
             for (int time = 0; time < powerData.size() - 1; time++) {
                 double power1 = powerData.get(time);
                 double power2 = powerData.get(time + 1);
-                double averagePower = (power1 + power2) / 2.0;
+                double averagePower = new BigDecimal(power1 + power2).divide(new BigDecimal(2), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+
                 double timeIntervalHours = timeInterval;
-                double intervalEnergy = averagePower * timeIntervalHours;
+                double intervalEnergy =new BigDecimal(averagePower).multiply(new BigDecimal(timeIntervalHours)).doubleValue();
                 energy += intervalEnergy;
             }
         }catch (Exception e)

realtime/generationXK-service/src/main/resources/xxl-job-executor6.properties

@@ -0,0 +1,25 @@
+### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+#xxl.job.admin.addresses=http://localhost:8175/xxl-job-admin
+xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job executor appname
+### 场站计算
+xxl.job.executor.appname=generationTarget-job-6
+### 区域公司计算
+#xxl.job.executor.appname=generationRG-job
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+xxl.job.executor.address=
+### xxl-job executor server-info
+xxl.job.executor.ip=
+#场站端口
+xxl.job.executor.port=9207
+#区域端口
+#xxl.job.executor.port=9202
+
+### xxl-job executor log-path
+xxl.job.executor.logpath=/data/nem/computeEngine/executor6/logs
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+

realtime/healthmodel-server/src/main/java/com/gyee/healthmodel/service/HealthJudgeService.java

@@ -439,11 +439,12 @@ public class HealthJudgeService {
 
                     if (maps.containsKey(po.getWpId())) {
                         int temp = maps.get(po.getWpId()) + 1;
-                        if (StringUtils.notEmp(po.getTop1())) {
+                        if (temp > 1) {
+                            po.setJudgmentDescribe("设备健康情况不良，但推荐等级偏低，还需继续观察！");
+                        }else if (StringUtils.notEmp(po.getTop1())) {
                             po.setJudgmentDescribe("健康报告达到推荐级别，推荐检修！");
                             maps.put(po.getWpId(), 1);
-                        }else  if (temp > 1) {
-                            po.setJudgmentDescribe("设备健康情况不良，但推荐等级偏低，还需继续观察！");
+
                         } else {
                             po.setJudgmentDescribe("健康报告达到推荐级别，推荐检修！");
                         }

web/runeconomy-xk/src/main/java/com/gyee/neic_service/cache/FaultInfoCache.java

@@ -1,98 +0,0 @@
-package com.gyee.neic_service.cache;
-
-import com.gyee.neic_service.dao.alarm.IDeviceFaultDao;
-import com.gyee.neic_service.dao.alarm.IWarningDao;
-import com.gyee.neic_service.model.alarm.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @descrition: 风机故障缓存
- * @author:Wanghs
- * @date:2019-10-08
- */
-@Component
-public class FaultInfoCache {
-
-    @Autowired
-    private IWarningDao warningDao;
-
-    @Autowired
-    private IDeviceFaultDao deviceFaultDao;
-
-    //报警信息缓存
-    private List<Warning> warningList = new ArrayList<>();
-
-    //故障表缓存
-    private final Map<String, DeviceFault> deviceFaultMap = new HashMap<>();
-
-    //推送至客户端,客户端显示到右下角弹窗 ,缓存只保存当前时间后推24个小时的数据,且风机状态为维护状态时,不进行弹窗
-    //key 故障id,value 故障实体VIEW_FAULTHISTORY
-    private Map<Long, FaultInfo> latestFaultInfoMap = new HashMap<>();
-
-    //推送至客户端 客户端显示到bigform以及miniform中
-    private List<FaultInfoModel> faultInfoModelList = new ArrayList<>();
-
-    private List<AlertSnap> alertSnapList = new ArrayList<>();
-
-    private Map<String, AlarmGroupModel> alarmGroups = new HashMap<>();
-
-
-    public List<Warning> getWarningList() {
-        return warningList;
-    }
-
-    public Map<String, DeviceFault> getDeviceFaultMap() {
-        return deviceFaultMap;
-    }
-
-    public Map<Long, FaultInfo> getLatestFaultInfoMap() {
-        return latestFaultInfoMap;
-    }
-
-    public void setLatestFaultInfoMap(Map<Long, FaultInfo> latestFaultInfoMap) {
-        this.latestFaultInfoMap = latestFaultInfoMap;
-    }
-
-    public List<FaultInfoModel> getFaultInfoModelList() {
-        return faultInfoModelList;
-    }
-
-    public void setFaultInfoModelList(List<FaultInfoModel> faultInfoModelList) {
-        this.faultInfoModelList = faultInfoModelList;
-    }
-
-    public List<AlertSnap> getAlertSnapList() {
-        return alertSnapList;
-    }
-
-    public void setAlertSnapList(List<AlertSnap> alertSnapList) {
-        this.alertSnapList = alertSnapList;
-    }
-
-    public Map<String, AlarmGroupModel> getAlarmGroups() {
-        return alarmGroups;
-    }
-
-    public void setAlarmGroups(Map<String, AlarmGroupModel> alarmGroups) {
-        this.alarmGroups = alarmGroups;
-    }
-
-
-    public void init() {
-        this.warningList = warningDao.findAll();
-        List<DeviceFault> lst = deviceFaultDao.findAll();
-        for (DeviceFault data : lst) {
-            if (data.getCode() != null && !data.getCode().equals("")) {
-                if (!this.deviceFaultMap.containsKey(data.getCode()))
-                    this.deviceFaultMap.put(data.getCode(), data);
-            }
-        }
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/cache/InfoCache.java

@@ -1,532 +0,0 @@
-package com.gyee.neic_service.cache;
-
-import com.alibaba.fastjson.TypeReference;
-import com.gyee.neic_service.config.FileManager;
-import com.gyee.neic_service.dao.alarm.IWarningDao;
-import com.gyee.neic_service.dao.entity.EquipmentModel;
-import com.gyee.neic_service.dao.entity.Line;
-import com.gyee.neic_service.dao.entity.Windturbine;
-import com.gyee.neic_service.dao.repsoitory.ILineDao;
-import com.gyee.neic_service.dao.repsoitory.IWindturbineDao;
-import com.gyee.neic_service.model.*;
-import com.gyee.neic_service.model.agc.AGCInfo;
-import com.gyee.neic_service.model.alarm.Warning;
-import com.gyee.neic_service.model.boost_station.BoostStation;
-import com.gyee.neic_service.model.boost_station.WindStation;
-import com.gyee.neic_service.model.enums.UniformCode;
-import com.gyee.neic_service.model.station.TagInfo;
-import com.gyee.neic_service.model.windturbine.JpaModelDao;
-import com.gyee.neic_service.model.windturbine.ModelInfo;
-import com.gyee.neic_service.tspoint.TsPoint;
-import com.gyee.neic_service.util.ConfigurationManager;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 基础信息缓存
- *
- * @author nnns
- */
-@Component
-public class InfoCache {
-    private static final Logger logger = LogManager.getLogger();
-    /**
-     * 是否加载控制信息
-     */
-    @Value("${doControl:false}")
-    private String isNeedControl;
-
-    @Resource
-    private Environment environment;
-
-    @Resource
-    private FileManager fileManager;
-
-    @Resource
-    private IWindturbineDao windturbineDao;
-
-    @Resource
-    private IWarningDao warningDao;
-
-    @Resource
-    private ILineDao lineDao;
-
-    @Resource
-    private JpaModelDao jpaModelDao;
-
-    /**
-     * 升压站信息,<期次名称，升压站信息>
-     */
-    private Map<String, BoostStation> boostStationMap;
-    /**
-     * 所有场站的信息
-     */
-    private Map<String, WindStation> windStationMap;
-    /**
-     * 所有风机信息
-     */
-    private Map<String, WindturbineInfo> windturbineInfoMap;
-
-    /**
-     * 所有测点集合
-     */
-    private final Map<String, TsPoint> tsPoints = new HashMap<>();
-
-    /**
-     * 场站状态
-     */
-    private Map<String, StationStatus> stationStatusMap = new LinkedHashMap<>();
-    /**
-     * 关注信息
-     */
-    private Map<String, AttentionInfo> attentionInfoMap;
-
-    /**
-     * UniformCode
-     */
-    private Map<String, Map<String, ModelInfo[]>> modelInfos;
-
-    /**
-     * AGC 信息
-     */
-    private AGCInfo[] agcInfos;
-
-    /**
-     * 升压站信息
-     */
-    private Map<String, BoostStationData> boostStationDatas;
-
-
-    /**
-     * lock锁
-     */
-    private Object lockObject = new Object();
-
-
-    public Map<String, BoostStation> getBoostStationMap() {
-        if (boostStationMap == null) {
-            boostStationMap = new HashMap<>(20);
-        }
-        return boostStationMap;
-    }
-
-    public Map<String, WindStation> getWindStationMap() {
-        if (windStationMap == null) {
-            windStationMap = new HashMap<>(20);
-        }
-        return windStationMap;
-    }
-
-    public Map<String, WindturbineInfo> getWindturbineInfoMap() {
-        if (windturbineInfoMap == null) {
-            windturbineInfoMap = new HashMap<>(500);
-        }
-        return windturbineInfoMap;
-    }
-
-    public Map<String, AttentionInfo> getAttentionInfoMap() {
-        if (attentionInfoMap == null) {
-            attentionInfoMap = new HashMap<>(20);
-        }
-        return attentionInfoMap;
-    }
-
-
-    //key;风机型号,value:不可复位的报警id集合
-    private Map<String, List<Integer>> unAbleResetWarningMap = new HashMap<>();
-
-    public Map<String, List<Integer>> getUnAbleResetWarningMap() {
-        return unAbleResetWarningMap;
-    }
-
-    public void setUnAbleResetWarningMap(Map<String, List<Integer>> unAbleResetWarningMap) {
-        this.unAbleResetWarningMap = unAbleResetWarningMap;
-    }
-
-    public Map<String, StationStatus> getStationStatusMap() {
-        return stationStatusMap;
-    }
-
-    public AGCInfo[] getAgcInfos() {
-        if (agcInfos == null) {
-            agcInfos = new AGCInfo[0];
-        }
-        return agcInfos;
-    }
-
-    public Map<String, Map<String, ModelInfo[]>> getModelInfos() {
-        if (modelInfos == null) {
-            modelInfos = new HashMap<>();
-        }
-        return modelInfos;
-    }
-
-    public Map<String, BoostStationData> getBoostStationDatas() {
-        if (boostStationDatas == null) {
-            boostStationDatas = new HashMap<>();
-        }
-        return boostStationDatas;
-    }
-
-    public Object getLockObject() {
-        return lockObject;
-    }
-
-    public void init() {
-        logger.log(Level.INFO, "开始初始化基本信息...");
-        // 初始化升压站信息
-        initBoostStationInfo();
-        // 初始化线路信息
-        initLineInfo();
-        // 初始化场站信息
-        initWindStations();
-        // 初始化场站标签点信息
-        initStationInfos();
-        // 初始化风机标签点信息
-        initWindtrubineInfos();
-        // 创建不可复位报警集合
-        initUnAbleResetMap();
-        // 初始化场站状态
-        initStationStatus();
-
-        // 初始化AGC信息
-        this.agcInfos = fileManager.getFromFile("agc_info.json", AGCInfo[].class);
-
-        // 初始化UniformCode
-        modelInfos = fileManager.getFromFile("windturbine_info.json", new TypeReference<Map<String, Map<String, ModelInfo[]>>>() {
-        });
-
-        // 初始化升压站视图信息
-        initBoostStationView();
-
-        logger.log(Level.INFO, "基本信息初始化结束");
-    }
-
-    /**
-     * 初始化线路信息
-     */
-    private void initLineInfo() {
-        try {
-            List<Line> ls = lineDao.findAll();
-            for (BoostStation bs : getBoostStationMap().values()) {
-                bs.initLineInfo(ls);
-            }
-        } catch (Exception e) {
-            System.out.println("初始化风机线路信息出错！");
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 初始化场站状态
-     */
-    private void initStationStatus() {
-        StationStatus[] ls = fileManager.getFromFile("staion_status.json", StationStatus[].class);
-        for (StationStatus ss : ls) {
-            if (!stationStatusMap.containsKey(ss.getStationId())) {
-                stationStatusMap.put(ss.getStationId(), ss);
-            }
-        }
-    }
-
-
-    /**
-     * 初始化场站和升压站信息
-     */
-    private void initBoostStationInfo() {
-        // 场站信息
-        windStationMap = new HashMap<>(20);
-        BoostStation[] infos = fileManager.getFromFile("boost_station.json", BoostStation[].class);
-        boostStationMap = Arrays.stream(infos).collect(Collectors.toMap(BoostStation::getId, b -> b));
-        for (BoostStation bs : infos) {
-            if (!windStationMap.containsKey(bs.getStationId())) {
-                WindStation ws = new WindStation(bs);
-                windStationMap.put(ws.getId(), ws);
-                ws.addBoostStation(bs);
-            } else {
-                windStationMap.get(bs.getStationId()).addBoostStation(bs);
-            }
-        }
-    }
-
-    /**
-     * 初始化场站信息和风机信息
-     */
-    private void initWindStations() {
-        // 风机信息
-        Map<String, WindturbineInfo> wbm = getWindturbineInfoMap();
-
-        List<EquipmentModel> models = jpaModelDao.findAll();
-        Map<String, EquipmentModel> modelMap = models.stream().collect(Collectors.toMap(EquipmentModel::getId, e -> e));
-
-        try {
-            List<Windturbine> ws = windturbineDao.find();
-            for (Windturbine wb : ws) {
-                if (!wb.getWindPowerStationId().contains("FDC") || !windStationMap.containsKey(wb.getWindPowerStationId())) {
-                    continue;
-                }
-                WindturbineInfo wi = new WindturbineInfo();
-                wi.setId(wb.getId());
-                wi.setCode(wb.getCode());
-                wi.setModelId(wb.getModelId());
-                wi.setProjectId(wb.getProjectId());
-                wi.setLineId(wb.getLineId());
-                wi.setStationId(wb.getWindPowerStationId());
-                if (modelMap.containsKey(wi.getModelId())) {
-                    wi.setPowerProduction(modelMap.get(wi.getModelId()).getPowerProduction());
-                }
-
-                if (!wbm.containsKey(wi.getId())) {
-                    wbm.put(wi.getId(), wi);
-                }
-                if (windStationMap.containsKey(wi.getStationId())) {
-                    final WindStation windStation = windStationMap.get(wi.getStationId());
-                    wi.setStationName(windStation.getName());
-                    windStation.addWindturbine(wi);
-                }
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * 初始化场站标签点信息
-     */
-    private void initStationInfos() {
-        /*String[] ucs = getUniformCodes(WindStation.class);
-        // 获取所有的标签点
-        List<TsPoint> pls = thingsPointDao.findTsPointByThingTypeAndUniformCodes("station", ucs);
-        // 获取场站中的属性
-        Map<String, Field> fieldsMap = getFields(WindStation.class);
-        for (TsPoint tp : pls) {
-            if (!windStationMap.containsKey(tp.getThingId())
-                    || !fieldsMap.containsKey(tp.getUniformCode())) {
-                continue;
-            }
-            WindStation ws = windStationMap.get(tp.getThingId());
-            Field field = fieldsMap.get(tp.getUniformCode());
-            setTagInfo(ws, field, tp.getId());
-        }*/
-    }
-
-    /**
-     * 初始化风机信息
-     */
-    private void initWindtrubineInfos() {
-        /*// 获取需要刷新的UniformCode
-        String[] ucs = getUniformCodes(WindturbineInfo.class);
-        // 获取所有的标签点
-        List<TsPoint> pls = thingsPointDao.findTsPointByThingTypeAndUniformCodes("windturbine", ucs);
-        // 获取风机中的属性
-        Map<String, Field> fieldsMap = getFields(WindturbineInfo.class);
-        // 风机信息
-        Map<String, WindturbineInfo> wbm = getWindturbineInfoMap();
-        for (TsPoint tp : pls) {
-            if (!wbm.containsKey(tp.getThingId()) || !fieldsMap.containsKey(tp.getUniformCode())) {
-                continue;
-            }
-            WindturbineInfo wi = wbm.get(tp.getThingId());
-            Field field = fieldsMap.get(tp.getUniformCode());
-            // 初始化TagInfo并添加
-            setTagInfo(wi, field, tp.getId());
-        }*/
-    }
-
-    /**
-     * 初始化TagInfo并添加
-     *
-     * @param o     要添加的实体
-     * @param field 要添加的属性
-     * @param tag   标签点
-     */
-    private void setTagInfo(Object o, Field field, String tag) {
-        TagInfo ti = new TagInfo();
-        ti.setTag(tag);
-        try {
-            field.set(o, ti);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 初始化PointInfo并添加
-     *
-     * @param o     要添加的实体
-     * @param field 要添加的属性
-     * @param tag   标签点
-     * @param v     倍率
-     */
-    private void setPointInfo(Object o, Field field, String tag, double v) {
-        PointInfo pi = new PointInfo();
-        pi.setTag(tag);
-        pi.setMultiplier(v);
-        try {
-            field.set(o, pi);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 获取风机信息中的UniformCode
-     */
-    private String[] getUniformCodes(Class c) {
-        List<String> ls = new ArrayList<>();
-        Field[] fs = c.getDeclaredFields();
-        for (Field f : fs) {
-            try {
-                String ucv = ConfigurationManager.getAnnotationValue(UniformCode.class, f, environment);
-
-                if (ucv == null || "".equals(ucv)) {
-                    continue;
-                }
-                ls.add(ucv);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        String[] ucs = new String[ls.size()];
-        ls.toArray(ucs);
-        return ucs;
-    }
-
-    /**
-     * 获取风机信息中的属性
-     */
-    private Map<String, Field> getFields(Class c) {
-        Map<String, Field> fields = new HashMap<>(50);
-        Field[] fs = c.getDeclaredFields();
-        for (Field f : fs) {
-            try {
-                String ucv = ConfigurationManager.getAnnotationValue(UniformCode.class, f, environment);
-                if (ucv == null || "".equals(ucv)) {
-                    continue;
-                }
-                if (!fields.containsKey(ucv)) {
-                    f.setAccessible(true);
-                    fields.put(ucv, f);
-                }
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return fields;
-    }
-
-    /**
-     * 根据tingId和uniformCode获取TsPoint
-     */
-    public TsPoint getTsPointByIdAndUniformCode(String tingtype, String id, String uniformCode) {
-        /*String key = id + uniformCode;
-        if (tsPoints.containsKey((key))) {
-            return tsPoints.get(key);
-        }
-        // "windturbine"
-        List<TsPoint> tss = thingsPointDao.findTsPointByUnformCodes(tingtype, id, uniformCode);
-        if (tss != null && tss.size() > 0) {
-            tsPoints.put(key, tss.get(0));
-            return tss.get(0);
-        }*/
-        return null;
-    }
-
-
-    /**
-     * 创建不可复位报警集合
-     *
-     * @return
-     */
-    private boolean initUnAbleResetMap() {
-        boolean result = false;
-        try {
-            List<Warning> warningList = warningDao.findByIsReset(1);
-            warningList.forEach(s ->
-            {
-                if (unAbleResetWarningMap.containsKey(s.getModelId())) {
-                    List<Integer> lst = unAbleResetWarningMap.get(s.getModelId());
-                    if (!lst.contains(s.getEdnaValue())) {
-                        lst.add(s.getEdnaValue());
-                    }
-                } else {
-                    List<Integer> lst = new ArrayList<>();
-                    unAbleResetWarningMap.put(s.getModelId(), lst);
-                }
-            });
-            result = true;
-            logger.info("不可复位信息初始化完成");
-        } catch (Exception ex) {
-            logger.info("不可复位信息初始化失败:" + ex.getMessage());
-        } finally {
-            return result;
-        }
-    }
-
-    /**
-     * 更新场站状态
-     */
-    public String updateStationStatus(String stationId, boolean type, String name) {
-        if (stationId.equals("")) {
-            return "场站ID不能为空";
-        }
-        if (stationStatusMap.containsKey(stationId)) {
-            stationStatusMap.get(stationId).setType(type);
-        } else {
-            StationStatus ss = new StationStatus();
-            ss.setType(type);
-            ss.setStationId(stationId);
-            ss.setName(name);
-            stationStatusMap.put(stationId, ss);
-        }
-        // 保存操作记录
-        fileManager.saveObjectToFile("staion_status.json", stationStatusMap.values());
-        return "success";
-    }
-
-    /**
-     * 初始化升压站视图信息
-     */
-    private void initBoostStationView() {
-        System.out.println("初始化升压站视图信息...");
-        boostStationDatas = new HashMap<>();
-        BoostStationData[] ls = fileManager.getFromFile("boost_station_info.json", BoostStationData[].class);
-        for (BoostStationData bsd : ls) {
-            if (!boostStationDatas.containsKey(bsd.getId())) {
-                boostStationDatas.put(bsd.getId(), bsd);
-            }
-        }
-        System.out.println("升压站视图信息初始化结束");
-    }
-
-    /**
-     * 更新升压站信息
-     *
-     * @param data
-     */
-    public boolean updateBoostStationInfo(BoostStationData data) {
-        Map<String, BoostStationData> datas = this.getBoostStationDatas();
-        if (datas.containsKey(data.getId())) {
-            // 保存旧升压站信息
-            boolean b = fileManager.saveObjectToFile("boost_station_info.json" + System.currentTimeMillis(), boostStationDatas.values());
-            if (!b) {
-                return false;
-            }
-            datas.remove(data.getId());
-        }
-        datas.put(data.getId(), data);
-        return fileManager.saveObjectToFile("boost_station_info.json", boostStationDatas.values());
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/config/ActiveMQConfig.java

@@ -1,17 +0,0 @@
-//package com.gyee.neic_service.config;
-//
-//import org.apache.activemq.command.ActiveMQTopic;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * 消息队列配置
-// */
-//@Configuration
-//public class ActiveMQConfig {
-//
-//    @Bean
-//    public ActiveMQTopic topic() {
-//        return new ActiveMQTopic("LVSP.function");
-//    }
-//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/config/FileManager.java

@@ -1,109 +0,0 @@
-package com.gyee.neic_service.config;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import org.springframework.stereotype.Component;
-
-import java.io.*;
-import java.lang.reflect.Type;
-
-/**
- * 配置文件读取
- *
- * @author xysn
- */
-@Component
-public class FileManager {
-    /**
-     * 从json格式文件中获取对象
-     *
-     * @param path 文件路径
-     * @param type 对象类型
-     * @param <T>  泛型
-     * @return 返回对象
-     */
-    public <T> T getFromFile(String path, Type type) {
-        String str = getStringFormFile(path);
-        return JSON.parseObject(str, type);
-    }
-
-    /**
-     * 从json格式文件中获取对象
-     *
-     * @param path 文件路径
-     * @param type 对象类型
-     * @param <T>  泛型
-     * @return 返回对象
-     */
-    public <T> T getFromFile(String path, TypeReference<T> type) {
-        String str = getStringFormFile(path);
-        return JSON.parseObject(str, type);
-    }
-
-    /**
-     * 从文件中获取字符串
-     *
-     * @param path 路径
-     * @return 字符串
-     */
-    public String getStringFormFile(String path) {
-        BufferedReader bufferedReader = null;
-        File file = new File(path);
-        if (!file.exists()) {
-            return "";
-        }
-        try {
-            bufferedReader = new BufferedReader(new FileReader(file));
-            StringBuilder sb = new StringBuilder();
-            String s = null;
-            while ((s = bufferedReader.readLine()) != null) {
-                sb.append(s);
-            }
-            return sb.toString();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                assert bufferedReader != null;
-                bufferedReader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-    /**
-     * 保存对象到文件中
-     *
-     * @param path 文件路径
-     * @param obj  要保存的对象
-     * @return 是否保存成功
-     */
-    public boolean saveObjectToFile(String path, Object obj) {
-        BufferedWriter bufferedWriter = null;
-        try {
-            File file = new File(path);
-            bufferedWriter = new BufferedWriter(new FileWriter(file));
-            String str = "";
-            if (obj instanceof String) {
-                str = obj.toString();
-            } else {
-                str = JSON.toJSONString(obj);
-            }
-            bufferedWriter.write(str);
-            bufferedWriter.flush();
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                assert bufferedWriter != null;
-                bufferedWriter.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return false;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/config/ThreadPoolConfig.java

@@ -1,76 +0,0 @@
-//package com.gyee.neic_service.config;
-//
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-//
-//import java.util.concurrent.ThreadPoolExecutor;
-//
-///**
-// * 线程池配置
-// *
-// * @author xysn
-// */
-//@Configuration
-//public class ThreadPoolConfig {
-//
-//    /**
-//     *   默认情况下，在创建了线程池后，线程池中的线程数为0，当有任务来之后，就会创建一个线程去执行任务，
-//     *	当线程池中的线程数目达到corePoolSize后，就会把到达的任务放到缓存队列当中；
-//     *  当队列满了，就继续创建线程，当线程数量大于等于maxPoolSize后，开始使用拒绝策略拒绝
-//     */
-//
-//    /**
-//     * 核心线程数（默认线程数）
-//     */
-//    private static final int corePoolSize = 40;
-//    /**
-//     * 最大线程数
-//     */
-//    private static final int maxPoolSize = 100;
-//    /**
-//     * 允许线程空闲时间（单位：默认为秒）
-//     */
-//    private static final int keepAliveTime = 60;
-//    /**
-//     * 缓冲队列大小
-//     */
-//    private static final int queueCapacity = 300;
-//    /**
-//     * 允许等待最长时间
-//     */
-//    private static final int awaitTime = 15;
-//    /**
-//     * 线程池名前缀
-//     */
-//    private static final String threadNamePrefix = "Alarm-Thread-";
-//
-//    private ThreadPoolTaskExecutor executor;
-//
-//    public ThreadPoolTaskExecutor getExecutor() {
-//        if (executor == null) {
-//            executor = taskExecutor();
-//        }
-//
-//        return executor;
-//    }
-//
-//
-//    @Bean
-//    public ThreadPoolTaskExecutor taskExecutor() {
-//        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-//        executor.setCorePoolSize(corePoolSize);
-//        executor.setMaxPoolSize(maxPoolSize);
-//        executor.setQueueCapacity(queueCapacity);
-//        executor.setKeepAliveSeconds(keepAliveTime);
-//        executor.setThreadNamePrefix(threadNamePrefix);
-//        executor.setAwaitTerminationSeconds(awaitTime);
-//
-//        // 线程池对拒绝任务的处理策略
-//        // CallerRunsPolicy：由调用线程（提交任务的线程）处理该任务
-//        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-//        // 初始化
-//        executor.initialize();
-//        return executor;
-//    }
-//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/controller/BoostStationController.java

@@ -1,287 +0,0 @@
-package com.gyee.neic_service.controller;
-
-import com.gyee.neic_service.model.station.ShapeInfo;
-import com.gyee.neic_service.model.station.SvgFileInfo;
-import com.gyee.neic_service.model.station.SvgInfo;
-import com.gyee.neic_service.service.station.BoostStationSvc;
-import com.gyee.runeconomy.dto.R;
-import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicSubStation;
-import com.gyee.runeconomy.service.auto.IProBasicSubStationService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 组态升压站控制器
- *
- * @author xysn
- */
-@CrossOrigin
-@RestController
-@RequestMapping("/api/boost_station")
-public class BoostStationController {
-    @Resource
-    private BoostStationSvc boostStationSvc;
-    @Resource
-    private IProBasicSubStationService subStationService;
-
-    /**
-     * 获取所有用户自定义图形
-     *
-     * @return 所有用户自定义图形
-     */
-    @GetMapping("/customize")
-    public Collection<ShapeInfo> getCustomizeShapes() {
-        return boostStationSvc.getCustomizeShapes();
-    }
-
-
-    /**
-     * 移除指定名称的自定义控件
-     *
-     * @return 所有用户自定义图形
-     */
-    @GetMapping("/customize/remove")
-    public String removeCustomizeShapes(@RequestParam(value = "id") String id) {
-        if (id == null) {
-            return "控件名称不能为空";
-        }
-
-        return boostStationSvc.removeCustomizeShape(id);
-    }
-
-    /**
-     * 添加自定义控件
-     *
-     * @param info 自定义控件信息
-     * @return
-     */
-    @PostMapping("/customize/add")
-    public String addCustomizeShape(@RequestBody ShapeInfo info) {
-        if (info == null) {
-            return "图形信息不能为空！";
-        }
-        if (info.getId() == null || info.getId().equals("")) {
-            return "id不能为空";
-        }
-        if (boostStationSvc.getCustomizeShapesMap().containsKey(info.getId())) {
-            return "控件 " + info.getId() + " 已经存在！";
-        }
-        boolean b = boostStationSvc.addCustomizeShape(info);
-        return b ? "success" : "自定义控件保存失败";
-    }
-
-    /**
-     * 更新自定义控件
-     *
-     * @param info 自定义控件信息
-     * @return
-     */
-    @PostMapping("/customize/update")
-    public String updateCustomizeShape(@RequestBody ShapeInfo info) {
-        if (info == null) {
-            return "图形信息不能为空！";
-        }
-        if (!boostStationSvc.getCustomizeShapesMap().containsKey(info.getId())) {
-            return "控件 " + info.getId() + " 不存在！";
-        }
-        boolean b = boostStationSvc.addCustomizeShape(info);
-        return b ? "success" : "自定义控件保存失败";
-    }
-
-    /**
-     * 获取升压站信息
-     *
-     * @return 升压站信息
-     */
-    @GetMapping("/")
-    public Collection<ShapeInfo> getShapeInfos() {
-        return boostStationSvc.getShapeInfos();
-    }
-
-    /**
-     * 获取所有升压站场站信息
-     *
-     * @return
-     */
-    @GetMapping("/stations")
-    public ResultMsg getBoostStationStations() {
-//        return boostStationSvc.getBoostStationStations();
-        List<ProBasicSubStation> list = subStationService.list();
-        list=list.stream().filter(l->!"SXJ_KGDL_GJYF02_SBS".equals(l.getId()) && !"SXJ_KGDL_GJYF03_SBS".equals(l.getId())).collect(Collectors.toList());
-
-        return ResultMsg.ok(list);
-    }
-
-
-    /**
-     * 获取升压站信息
-     *
-     * @return 升压站信息
-     */
-    @GetMapping("/booststation")
-    public ShapeInfo getShapeInfos(@RequestParam(value = "id") String id) {
-        return boostStationSvc.getBoostStationInfo(id);
-    }
-
-    /**
-     * 更新升压站信息
-     *
-     * @param info 升压站信息
-     */
-    @PostMapping("/update")
-    public String updateShapeInfo(@RequestBody ShapeInfo info) {
-        if (info == null) {
-            return "图形信息不能为空！";
-        }
-        if (!boostStationSvc.getBoostStationInfos().containsKey(info.getId())) {
-            return "升压站 " + info.getId() + " 不存在！";
-        }
-        boolean b = boostStationSvc.updateBoostStationInfos(info);
-        return b ? "success" : "自定义控件保存失败";
-    }
-
-    /**
-     * 添加升压站信息
-     *
-     * @param info 升压站信息
-     */
-    @PostMapping("/add")
-    public String addShapeInfo(@RequestBody ShapeInfo info) {
-        if (info == null) {
-            return "图形信息不能为空！";
-        }
-        if (info.getId() == null || info.getId().equals("")) {
-            return "id不能为空";
-        }
-        if (boostStationSvc.getBoostStationInfos().containsKey(info.getId())) {
-            return "升压站 " + info.getId() + " 已经存在！";
-        }
-        boolean b = boostStationSvc.updateBoostStationInfos(info);
-        return b ? "success" : "自定义控件保存失败";
-    }
-
-    /**
-     * 移除升压站
-     */
-    @GetMapping("/remove")
-    public String addOrUpdateShapeInfo(@RequestParam(value = "id") String id) {
-        if (id == null) {
-            return "升压站id不能为空！";
-        }
-        boolean b = boostStationSvc.removeBoostStationInfos(id);
-        return b ? "success" : "升压站删除失败";
-    }
-
-
-    /**
-     * 根据id获取二次图
-     *
-     * @param id 二次图id
-     * @return 二次图
-     */
-    @GetMapping("/substation")
-    public ShapeInfo getSubStationShapes(@RequestParam(value = "id") String id) {
-        return boostStationSvc.getSubShapeInfo(id);
-    }
-
-
-    /**
-     * 获取所有二次图
-     *
-     * @return 二次图
-     */
-    @GetMapping("/substation/all")
-    public Collection<ShapeInfo> getSubStationShapesAll() {
-        return boostStationSvc.getSubShapeInfos().values();
-    }
-
-
-    /**
-     * 移除指定名称的二次图
-     */
-    @GetMapping("/substation/remove")
-    public String removeSubStationShapes(@RequestParam(value = "id") String id) {
-        if (id == null) {
-            return "二次图id不能为空";
-        }
-
-        return boostStationSvc.removeSubStation(id);
-    }
-
-    /**
-     * 添加二次图
-     *
-     * @param info 自定义控件信息
-     * @return
-     */
-    @PostMapping("/substation/add")
-    public String addSubStationShape(@RequestBody ShapeInfo info) {
-        if (info == null) {
-            return "图形信息不能为空！";
-        }
-        if (info.getId() == null || info.getId().equals("")) {
-            return "id不能为空";
-        }
-        if (boostStationSvc.getSubShapeInfos().containsKey(info.getId())) {
-            return "二次图 " + info.getId() + " 已经存在！";
-        }
-        boolean b = boostStationSvc.updateSubStationInfos(info);
-        return b ? "success" : "二次图保存失败";
-    }
-
-    /**
-     * 更新二次图
-     *
-     * @param info 自定义控件信息
-     * @return
-     */
-    @PostMapping("/substation/update")
-    public String updateSubStationShape(@RequestBody ShapeInfo info) {
-        if (info == null) {
-            return "图形信息不能为空！";
-        }
-        if (!boostStationSvc.getSubShapeInfos().containsKey(info.getId())) {
-            return "控件 " + info.getId() + " 不存在！";
-        }
-        boolean b = boostStationSvc.updateSubStationInfos(info);
-        return b ? "success" : "二次图保存失败";
-    }
-
-    /**
-     * 添加svg文件
-     */
-    @PostMapping("/svg")
-    public String addSvgFile(@RequestBody SvgFileInfo svg) {
-        return boostStationSvc.addSvgFile(svg);
-    }
-
-    /**
-     * 获取svg文件
-     */
-    @GetMapping("/svg")
-    public String getSvgFile(@RequestParam(value = "id") String id) {
-        return boostStationSvc.getSvgFile(id);
-    }
-
-    /**
-     * 添加触发器和标签
-     */
-    @PostMapping("/svginfo")
-    public String addSvgConditionsAndTags(@RequestBody SvgInfo info) {
-        return boostStationSvc.addSvgInfo(info);
-    }
-
-    /**
-     * 获取触发器和测点
-     */
-    @GetMapping("/svginfo")
-    public SvgInfo getSvgInfo(@RequestParam(value = "id") String id) {
-        return boostStationSvc.getSvgInfo(id);
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/controller/StationController.java

@@ -1,208 +0,0 @@
-package com.gyee.neic_service.controller;
-
-import com.gyee.neic_service.cache.InfoCache;
-import com.gyee.neic_service.dao.entity.StationStatusEntity;
-import com.gyee.neic_service.dao.repsoitory.IStationStatusRepository;
-import com.gyee.neic_service.model.BoostStationData;
-import com.gyee.neic_service.model.StationStatus;
-import com.gyee.neic_service.model.WindturbineInfo;
-import com.gyee.neic_service.model.boost_station.WindStation;
-import com.gyee.neic_service.model.windturbine.ParamInfo;
-import com.gyee.neic_service.service.windturbine.ComparedSvc;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author xysn
- */
-@CrossOrigin
-@RestController
-@RequestMapping("/api/station")
-public class StationController {
-    @Resource
-    private InfoCache infoCache;
-
-    @Resource
-    private ComparedSvc comparedSvc;
-
-    @Resource
-    private IStationStatusRepository iStationStatusRepository;
-
-    @GetMapping("/")
-    public Object getStationInfo() {
-//        return powerStationDao.getAll();
-        return null;
-    }
-
-    @GetMapping("/agc")
-    public Object getAGCInfos() {
-        return infoCache.getAgcInfos();
-    }
-
-    @GetMapping("/status")
-    public Collection<StationStatus> getStationStatus() {
-        return infoCache.getStationStatusMap().values();
-    }
-
-    @GetMapping("/status/update")
-    public String updateStatus(@RequestParam(value = "stationid", required = true) String stationId,
-                               @RequestParam(value = "type", required = true) boolean type,
-                               @RequestParam(value = "userName", required = true) String userName,
-                               @RequestParam(value = "name", required = false) String name) {
-        String s = infoCache.updateStationStatus(stationId, type, name);
-        if ("success".equals(s)) {
-            UUID guid = UUID.randomUUID();
-            StationStatusEntity sse = new StationStatusEntity();
-            sse.setStationId(stationId);
-            sse.setId(guid.toString());
-            sse.setChangeTime(new Date());
-            sse.setType(type);
-            sse.setUserName(userName);
-            iStationStatusRepository.save(sse);
-        }
-        return s;
-    }
-
-    @GetMapping("/compared")
-    public Map<String, List<ParamInfo>> getComparedInfo(@RequestParam(value = "models") String models) {
-        return comparedSvc.getComparedInfo(models);
-    }
-
-    @GetMapping("/agc_net")
-    public String getAGCInfoNet() {
-        BufferedReader bufferedReader = null;
-        try {
-            File file = new File("agc_info_net.json");
-            bufferedReader = new BufferedReader(new FileReader(file));
-            StringBuilder sb = new StringBuilder();
-            String s = null;
-            while ((s = bufferedReader.readLine()) != null) {
-                sb.append(s);
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                bufferedReader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-    @GetMapping("/info")
-    public String getInfo() {
-        BufferedReader bufferedReader = null;
-        try {
-            File file = new File("station_info.json");
-            bufferedReader = new BufferedReader(new FileReader(file));
-            StringBuilder sb = new StringBuilder();
-            String s = null;
-            while ((s = bufferedReader.readLine()) != null) {
-                sb.append(s);
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                bufferedReader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-    /**
-     * 获取光伏详情页
-     *
-     * @return
-     */
-    @GetMapping("/pv_info")
-    public String getPVInfo() {
-        BufferedReader bufferedReader = null;
-        try {
-            File file = new File("pv_info.json");
-            bufferedReader = new BufferedReader(new FileReader(file));
-            StringBuilder sb = new StringBuilder();
-            String s = null;
-            while ((s = bufferedReader.readLine()) != null) {
-                sb.append(s);
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                bufferedReader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-    /**
-     * 上传升压站信息
-     */
-    @PostMapping("/boost_station")
-    public void saveFaultHistory(@RequestBody BoostStationData data) {
-        infoCache.updateBoostStationInfo(data);
-    }
-
-    /**
-     * 获取信息
-     */
-    @GetMapping("/boost_station/{station}")
-    public BoostStationData getBoostStationData(@PathVariable("station") String station) {
-        if (infoCache.getBoostStationDatas().containsKey(station)) {
-            return infoCache.getBoostStationDatas().get(station);
-        }
-        return null;
-    }
-
-    /**
-     * 获取升压站更新时间
-     */
-    @GetMapping("/boost_station/update_time/{station}")
-    public long getBoostStationUpdateTime(@PathVariable("station") String station) {
-        if (infoCache.getBoostStationDatas().containsKey(station)) {
-            return infoCache.getBoostStationDatas().get(station).getUpdatedDate();
-        }
-        return -1;
-    }
-
-    /**
-     * 获取所有信息
-     */
-    @GetMapping("/boost_station/all")
-    public Map<String, BoostStationData> getBoostStationDataAll() {
-        return infoCache.getBoostStationDatas();
-    }
-
-    /**
-     * 获取场站所有的机型
-     *
-     * @param stationId
-     * @return
-     */
-    @GetMapping("/models")
-    public Object getModels(@RequestParam(value = "stationid", required = true) String stationId) {
-        final Map<String, WindStation> stations = infoCache.getWindStationMap();
-        if (!stations.containsKey(stationId)) {
-            return new String[0];
-        }
-        final List<WindturbineInfo> wis = stations.get(stationId).getWindturbineInfos();
-        return wis.stream().map(WindturbineInfo::getModelId).collect(Collectors.toSet());
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/ModelConstants.java

@@ -1,78 +0,0 @@
-package com.gyee.control.calc.dao.sql;
-
-/**
- * 字符串常量池
- */
-public class ModelConstants {
-
-    private ModelConstants() {
-    }
-
-    //jpa会将驼峰写法转化为下划线分割形式，如StationId->station_id
-    public static final String ID_ = "id";
-
-
-    public static final String NAME_ = "name";
-    public static final String DESCRIPTION = "description";
-
-    public static final String USER_ID = "user_id";
-
-
-    public static final String TYPE_ = "type";
-
-
-    public static final String CODE_ = "code";
-
-    public static final String CAPACITY_ = "capacity";
-    public static final String CAPACITY_UNIT = "capacity_unit";
-    public static final String QUANTITY = "quantity";
-
-    public static final String MODEL_ = "model";
-    public static final String ORDER_NUM = "order_num";
-    public static final String WINDTURBINE_ID = "windturbine_id";
-
-
-    public static final String WINPOWERSATIONID_ = "station_id";
-    public static final String PROJECT_ID = "project_id";
-    public static final String PHOTO_ = "photo";
-    //项目
-    public static final String PROJECT_ = "project";
-    public static final String STATION_ID = "station_id";
-    public static final String ANAME_ = "aname";
-    public static final String COMMISSION_DATE = "commission_date";
-    public static final String MASTER_PHONE = "master_phone";
-    public static final String SHIFT_FOREMAN = "shift_foreman";
-    public static final String SHIFT_FOREMAN_PHONE = "shift_foreman_phone";
-    //线路
-    public static final String EQUIPMENT_MODEL = "EQUIPMENTMODEL";
-    public static final String LINE_ = "line";
-    public static final String STATION_CODE = "station_code";
-    //模型
-    public static final String POWER_PRODUCTION = "power_production";
-    public static final String CUTIN_WIND_SPEED = "cutin_wind_speed";
-    public static final String RATED_WIND_SPEED = "rated_wind_speed";
-    public static final String CUTOUT_WIND_SPEED = "cutout_wind_speed";
-    public static final String WINDTURBINE_MANUFACTURER_ID = "windturbine_manufacturer_id";
-    public static final String UNIT_ = "unit";
-    public static final String SWEPT_AREA = "swept_area";
-    public static final String EQUIPMENT_CATEGORY = "equipment_category";
-
-    public static final String UNIFORM_CODE = "uniform_code";
-    public static final String DATA_TYPE = "data_type";
-
-    public static final String THING_TYPE = "thing_type";//主题表
-    public static final String THING_ID = "thing_id";
-
-    public static final String GYCP_CMD_INFO = "gycp_cmd_info";
-    public static final String CMD_ID = "cmd_id";
-    public static final String CMD_VALUE = "cmd_value";
-    public static final String Time = "time";
-    public static final String ISSUCCESS = "is_success";
-    public static final String CONTROL_ERRORS_CODE = "control_errors_code";
-
-    public static final String INPUT_OR_OUTPUT_SPEED_TOTAL = "inputoroutputspeedtotal";
-    public static final String WINDTURBINEID = "windturbineid";
-    public static final String INPUT_SMALL = "inputsmall";
-    public static final String RECORDE_DATE = "recorddate";
-    public static final String CONTROL_INFO = "control_info";
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/IAlertSnapDao.java

@@ -1,19 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.model.alarm.AlertSnap;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author:Wanghs
- * @date:2019-10-10
- */
-public interface IAlertSnapDao {
-
-    List<AlertSnap> findAll();
-
-    AlertSnap findById(String id);
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/IDeviceFaultDao.java

@@ -1,15 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.model.alarm.DeviceFault;
-
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-24
- */
-public interface IDeviceFaultDao {
-
-    List<DeviceFault> findAll();
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/IFaultHistoryDao.java

@@ -1,19 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.FaultHistory;
-
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-26
- */
-public interface IFaultHistoryDao {
-    void save(FaultHistory faultHistory);
-
-    void save(List<FaultHistory> faultHistories);
-
-    void faultConfirm(long id, int confirmType, String user, long alertSnapId);
-    //void OneKeyRemove(Date time);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/IFaultSnapDao.java

@@ -1,25 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.FaultSnap;
-
-import java.util.Date;
-import java.util.List;
-
-public interface IFaultSnapDao {
-
-    FaultSnap save(FaultSnap Alertsnap);
-
-    FaultSnap findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue);
-
-    FaultSnap findByStationIdAndAlertValue(String stationId, int alertvalue);
-
-    FaultSnap findByTestingpointkey(String testingpointkey);
-
-    List<FaultSnap> findAllFaultWindturbine();
-
-    List<FaultSnap> findRealTimeFaultWindturbine(Date startTime);
-
-    List<FaultSnap> findSnapByIdList(List<Long> idList);
-
-    List<Long> oneKeyRemoveSYZFaultSnap(Date nowTime);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/IWarningDao.java

@@ -1,26 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-
-import com.gyee.neic_service.model.alarm.Warning;
-
-import java.util.List;
-
-public interface IWarningDao {
-    List<Warning> findAll();
-
-    Warning findById(String id);
-
-    void deletebyid(String id);
-
-    void save(Warning warning);
-
-    Warning findByprojectId(String id);
-
-    Warning findByEdnavalue(int ednavalue);
-
-    List<Warning> findByModelId(String modelid);
-
-
-    List<Warning> findByIsReset(Integer isReset);
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaAlertSnapDao.java

@@ -1,36 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.AlertSnapEntity;
-import com.gyee.neic_service.dao.repsoitory.AlertSnapRepository;
-import com.gyee.neic_service.model.alarm.AlertSnap;
-import com.gyee.neic_service.util.DataUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Component;
-
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Component
-@Slf4j
-public class JpaAlertSnapDao implements IAlertSnapDao {
-    @Autowired
-    private AlertSnapRepository alertsnapRepository;
-
-
-    @Override
-    public List<AlertSnap> findAll() {
-        List<AlertSnap> listalertsnap = DataUtil.convertDataList(alertsnapRepository.findAll());
-        return listalertsnap;
-    }
-
-    @Override
-    public AlertSnap findById(String id) {
-        AlertSnap alertsnap = alertsnapRepository.findById(id).get().toData();
-        return alertsnap;
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaDeviceFaultDao.java

@@ -1,32 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.DeviceFaultEntity;
-import com.gyee.neic_service.dao.repsoitory.DeviceFaultRepository;
-import com.gyee.neic_service.model.alarm.DeviceFault;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-24
- */
-@Component
-public class JpaDeviceFaultDao implements IDeviceFaultDao {
-
-    @Autowired
-    private DeviceFaultRepository deviceFaultRepository;
-
-    @Override
-    public List<DeviceFault> findAll() {
-        List<DeviceFault> resultList = new ArrayList<>();
-        List<DeviceFaultEntity> entityList = deviceFaultRepository.findAll();
-        for (int i = 0; i < entityList.size(); i++) {
-            resultList.add(entityList.get(i).toData());
-        }
-        return resultList;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaFaultHistoryDao.java

@@ -1,56 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.FaultHistory;
-import com.gyee.neic_service.dao.entity.FaultHistoryEntity;
-import com.gyee.neic_service.dao.repsoitory.FaultHistoryRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Component
-@Slf4j
-public class JpaFaultHistoryDao implements IFaultHistoryDao {
-
-    @Autowired
-    private FaultHistoryRepository historyRepository;
-
-
-    @Override
-    public void save(FaultHistory faultHistory) {
-        historyRepository.saveAndFlush(new FaultHistoryEntity(faultHistory));
-    }
-
-    public void faultConfirm(long id, int confirmType, String user, long alertSnapId) {
-
-        FaultHistoryEntity entity = historyRepository.findFirstById(id);
-        if (entity != null) {
-            entity.setConfirmType(confirmType);
-            entity.setConfirmPerson(user);
-            entity.setAlertSnapId(String.valueOf(alertSnapId));
-            entity.setConfirmTime(new Date());
-            historyRepository.saveAndFlush(entity);
-
-        }
-    }
-
-    @Override
-    public void save(List<FaultHistory> faultHistorys) {
-        ArrayList<FaultHistoryEntity> entities = new ArrayList<>();
-        for (FaultHistory his : faultHistorys) {
-            FaultHistoryEntity et = new FaultHistoryEntity(his);
-            entities.add(et);
-        }
-        try {
-            historyRepository.saveAll(entities);
-            historyRepository.flush();
-        } catch (Exception e) {
-            log.error("--------保存报警历史信息error--------{}", e.getMessage());
-        }
-
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaFaultSnapDao.java

@@ -1,105 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.FaultSnap;
-import com.gyee.neic_service.dao.entity.FaultSnapEntity;
-import com.gyee.neic_service.dao.repsoitory.FaultSnapRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Component
-@Slf4j
-public class JpaFaultSnapDao implements IFaultSnapDao {
-    @Autowired
-    private FaultSnapRepository faultSnapRepository;
-
-
-    @Override
-    public FaultSnap save(FaultSnap alertsnap) {
-        return faultSnapRepository.saveAndFlush(new FaultSnapEntity(alertsnap)).toData();
-    }
-
-
-    @Override
-    public FaultSnap findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue) {
-        FaultSnapEntity alertsnapEntity = faultSnapRepository.findByWindturbineIdAndAlertValue(windturbineid, alertvalue);
-        if (alertsnapEntity != null) {
-            return alertsnapEntity.toData();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public FaultSnap findByStationIdAndAlertValue(String stationId, int alertvalue) {
-        FaultSnapEntity alertsnapEntity = faultSnapRepository.findByStationIdAndAlertValue(stationId, alertvalue);
-        if (alertsnapEntity != null) {
-            return alertsnapEntity.toData();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public FaultSnap findByTestingpointkey(String testingpointkey) {
-        FaultSnapEntity alertsnapEntity = faultSnapRepository.findByTestingpointKey(testingpointkey);
-        return alertsnapEntity == null ? null : alertsnapEntity.toData();
-    }
-
-    @Override
-    public List<FaultSnap> findAllFaultWindturbine() {
-        List<FaultSnap> resultList = new ArrayList<>();
-        List<FaultSnapEntity> entityList = faultSnapRepository.searchAllFaultWindturbineId();
-        for (int i = 0; i < entityList.size(); i++) {
-            resultList.add(entityList.get(i).toData());
-        }
-        return resultList;
-    }
-
-    @Override
-    public List<FaultSnap> findRealTimeFaultWindturbine(Date startTime) {
-        List<FaultSnap> resultList = new ArrayList<>();
-        List<FaultSnapEntity> entityList = faultSnapRepository.searchAllFaultWindturbine(startTime);
-        for (int i = 0; i < entityList.size(); i++) {
-            resultList.add(entityList.get(i).toData());
-        }
-        return resultList;
-    }
-
-    @Override
-    public List<FaultSnap> findSnapByIdList(List<Long> idList) {
-        List<FaultSnap> resultList = new ArrayList<>();
-        List<FaultSnapEntity> entityList = faultSnapRepository.findAllByIdIn(idList);
-        for (int i = 0; i < entityList.size(); i++) {
-            resultList.add(entityList.get(i).toData());
-        }
-        return resultList;
-    }
-
-
-//    public List<Long> oneKeyRemoveSYZFaultSnap(Date nowTime, Long faultSanpId)
-//    {
-//        return null;
-//    }
-
-    @Override
-    public List<Long> oneKeyRemoveSYZFaultSnap(Date nowTime) {
-        List<Long> fids = new ArrayList<>();
-        try {
-            //faultSnapRepository.OneKeyRemove(Constant.webSocketDateFomart.format(nowTime));
-            List<FaultSnapEntity> faultSanpIdList = faultSnapRepository.getFaultSnapEntitiesByIsOpenedAndLastUpdateTimeAfter(0, nowTime);
-            faultSanpIdList.forEach(element -> {
-                fids.add(element.getId());
-            });
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return fids;
-    }
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaLineDao.java

@@ -1,44 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.Line;
-import com.gyee.neic_service.dao.entity.LineEntity;
-import com.gyee.neic_service.dao.repsoitory.ILineDao;
-import com.gyee.neic_service.dao.repsoitory.LineRepository;
-import com.gyee.neic_service.util.DataUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class JpaLineDao implements ILineDao {
-    @Autowired
-    private LineRepository lineRepository;
-
-    @Override
-    public List<Line> findAll() {
-        List<Line> listline = DataUtil.convertDataList(lineRepository.findAll());
-        return listline;
-    }
-
-    @Override
-    public Line findById(String id) {
-        Line line = lineRepository.findById(id).get().toData();
-        return line;
-    }
-
-    @Override
-    public void deletebyid(String id) {
-        lineRepository.deleteById(id);
-    }
-
-    @Override
-    public void save(Line line) {
-        lineRepository.save(new LineEntity(line));
-    }
-
-    @Override
-    public List<Line> findByprojectId(String id) {
-        return DataUtil.convertDataList(lineRepository.findFirstByProjectId(id));
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaWarningDao.java

@@ -1,60 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.WarningEntity;
-import com.gyee.neic_service.dao.repsoitory.WarningRepository;
-import com.gyee.neic_service.model.alarm.Warning;
-import com.gyee.neic_service.util.DataUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class JpaWarningDao implements IWarningDao {
-    @Autowired
-    private WarningRepository warningRepository;
-
-
-    @Override
-    public List<Warning> findAll() {
-        List<Warning> warning = DataUtil.convertDataList(warningRepository.findAll());
-        return warning;
-    }
-
-    @Override
-    public Warning findById(String id) {
-        Warning warning = warningRepository.findById(id).get().toData();
-        return warning;
-    }
-
-    @Override
-    public void deletebyid(String id) {
-        warningRepository.deleteById(id);
-    }
-
-
-    @Override
-    public void save(Warning warning) {
-        warningRepository.save(new WarningEntity(warning));
-    }
-
-    @Override
-    public Warning findByprojectId(String id) {
-        return warningRepository.findAllById(id).toData();
-    }
-
-    @Override
-    public Warning findByEdnavalue(int ednavalue) {
-        return warningRepository.findByEdnaValue(ednavalue).toData();
-    }
-
-    @Override
-    public List<Warning> findByModelId(String modelid) {
-        return DataUtil.convertDataList(warningRepository.findByModelId(modelid));
-    }
-
-    @Override
-    public List<Warning> findByIsReset(Integer isReset) {
-        return DataUtil.convertDataList(warningRepository.findByIsReset(isReset));
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/alarm/JpaWindturbineDao.java

@@ -1,75 +0,0 @@
-package com.gyee.neic_service.dao.alarm;
-
-import com.gyee.neic_service.dao.entity.Windturbine;
-import com.gyee.neic_service.dao.entity.WindturbineEntity;
-import com.gyee.neic_service.dao.repsoitory.IWindturbineDao;
-import com.gyee.neic_service.dao.repsoitory.WindturbineRepository;
-import com.gyee.neic_service.util.DataUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @author songwb<songwb @ aliyun.com>
- */
-@Component
-public class JpaWindturbineDao implements IWindturbineDao {
-
-    @Autowired
-    private WindturbineRepository windturbineRepository;
-
-
-    @Override
-    public void del(String id) {
-        windturbineRepository.deleteById(id);
-    }
-
-    @Override
-    public void save(Windturbine win) {
-        return;
-    }
-
-
-    @Override
-    public List<Windturbine> find() {
-        List<WindturbineEntity> all = windturbineRepository.findAll();
-        return DataUtil.convertDataList(all);
-    }
-
-    @Override
-    public Windturbine findbyid(String id) {
-        return windturbineRepository.findById(id).get().toData();
-    }
-
-    @Override
-    public List<Windturbine> findByStationId(String stationId) {
-        return null;
-    }
-
-    @Override
-    public List<Windturbine> findByProjectId(String projectId) {
-        return null;
-    }
-
-    @Override
-    public List<Windturbine> findByLineId(String lineId) {
-        return null;
-    }
-
-    @Override
-    public List<Windturbine> findByModelId(String modelId) {
-        return null;
-    }
-
-    @Override
-    public List<Windturbine> findByStationIdAndModelId(String stationId, String modelId) {
-        return null;
-    }
-
-    @Override
-    public List<Windturbine> findFDCWindturbine() {
-        return null;
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/AlertRuleEntity.java

@@ -1,236 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 预警规则
- */
-@Entity
-@Table(name = "alertrule2")
-public class AlertRuleEntity {
-    /**
-     * ID
-     */
-    @Id
-    @Column(name = "id")
-    private String id;
-    /**
-     * 名称
-     */
-    @Column(name = "name")
-    private String name;
-    /**
-     * 表达式
-     */
-    @Column(name = "expression")
-    private String expression;
-    /**
-     * 描述
-     */
-    @Column(name = "description")
-    private String description;
-    /**
-     * 标签
-     */
-    @Column(name = "tag")
-    private String tag;
-    /**
-     * 级别
-     */
-    @Column(name = "rank")
-    private String rank;
-    /**
-     * 是否启用
-     */
-    @Column(name = "enabled")
-    private boolean enabled;
-    /**
-     * 设备类型
-     */
-    @Column(name = "modelid")
-    private String modelId;
-    /**
-     * 报警值
-     */
-    @Column(name = "ednavalue")
-    private int ednaValue;
-    /**
-     * 报警类别
-     */
-    @Column(name = "category")
-    private String category;
-    /**
-     * 范围
-     */
-    @Column(name = "range")
-    private String range;
-    /**
-     * 场站
-     */
-    @Column(name = "station")
-    private String station;
-    /**
-     * 风机
-     */
-    @Column(name = "windturbine")
-    private String windturbine;
-    /**
-     * 线路
-     */
-    @Column(name = "line")
-    private String line;
-    /**
-     * 工程
-     */
-    @Column(name = "project")
-    private String project;
-    /**
-     * 电气
-     */
-    @Column(name = "electrical")
-    private String electrical;
-    /**
-     * 关联部件
-     */
-    @Column(name = "relatedparts")
-    private String relatedParts;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getExpression() {
-        return expression;
-    }
-
-    public void setExpression(String expression) {
-        this.expression = expression;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-    public String getRank() {
-        return rank;
-    }
-
-    public void setRank(String rank) {
-        this.rank = rank;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public String getModelId() {
-        return modelId;
-    }
-
-    public void setModelId(String modelId) {
-        this.modelId = modelId;
-    }
-
-    public int getEdnaValue() {
-        return ednaValue;
-    }
-
-    public void setEdnaValue(int ednaValue) {
-        this.ednaValue = ednaValue;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getRange() {
-        return range;
-    }
-
-    public void setRange(String range) {
-        this.range = range;
-    }
-
-    public String getStation() {
-        return station;
-    }
-
-    public void setStation(String station) {
-        this.station = station;
-    }
-
-    public String getWindturbine() {
-        return windturbine;
-    }
-
-    public void setWindturbine(String windturbine) {
-        this.windturbine = windturbine;
-    }
-
-    public String getLine() {
-        return line;
-    }
-
-    public void setLine(String line) {
-        this.line = line;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getElectrical() {
-        return electrical;
-    }
-
-    public void setElectrical(String electrical) {
-        this.electrical = electrical;
-    }
-
-    public String getRelatedParts() {
-        return relatedParts;
-    }
-
-    public void setRelatedParts(String relatedParts) {
-        this.relatedParts = relatedParts;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/AlertSnapEntity.java

@@ -1,145 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.model.alarm.AlertSnap;
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name = "ALARMSNAP")
-public class AlertSnapEntity implements ToData<AlertSnap>, Serializable {
-    @Id
-    @Column(name = "id")
-    private long id;
-    @Column(name = "stationid")
-    private String stationId;
-    @Column(name = "projectid")
-    private String projectId;
-    @Column(name = "lineid")
-    private String lineId;
-    @Column(name = "windturbineid")
-    private String windturbineId;
-    @Column(name = "alertvalue")
-    private int alertValue;
-    @Column(name = "category1")
-    private String cateGory1;
-    @Column(name = "category2")
-    private String cateGory2;
-    @Column(name = "category3")
-    private String cateGory3;
-    @Column(name = "rank")
-    private String rank;
-    @Column(name = "isopened")
-    private int isOpened;
-    @Column(name = "isconfirmed")
-    private Integer confirmed;
-    @Column(name = "confirmtime")
-    private Date confirmTime;
-    @Column(name = "confirmperson")
-    private String confirmPerson;
-    @Column(name = "lastupdatetime")
-    private Date lastUpdateTime;
-    @Column(name = "lastupdateperson")
-    private String lastUpdatePerson;
-    @Column(name = "stationname")
-    private String stationName;
-    @Column(name = "projectname")
-    private String projectName;
-    @Column(name = "linename")
-    private String lineName;
-    @Column(name = "windturbinename")
-    private String windturbineName;
-    @Column(name = "alerttext")
-    private String alertText;
-    @Column(name = "modelid")
-    private String modelId;
-    @Column(name = "testingpointkey")
-    private String testingpointKey;
-    @Column(name = "ifixpicture")
-    private String ifixPicture;
-    @Column(name = "ifixtag")
-    private String ifixTag;
-    @Column(name = "lastclosetime")
-    private Date lastCloseTime;
-    @Column(name = "lastcloseperson")
-    private String lastClosePerson;
-    @Column(name = "datainfo")
-    private String dataInfo;
-
-    @Override
-    public AlertSnap toData() {
-        AlertSnap alertsnap = new AlertSnap();
-        alertsnap.setId(this.id);
-        alertsnap.setStationId(this.stationId);
-        alertsnap.setProjectId(this.projectId);
-        alertsnap.setLineId(this.lineId);
-        alertsnap.setWindturbineId(this.windturbineId);
-        alertsnap.setAlertValue(this.alertValue);
-        alertsnap.setCategory1(this.cateGory1);
-        alertsnap.setCategory2(this.cateGory2);
-        alertsnap.setCategory3(this.cateGory3);
-        alertsnap.setRank(this.rank);
-        alertsnap.setIsOpened(this.isOpened);
-        alertsnap.setIsConfirmed(this.confirmed);
-        alertsnap.setConfirmTime(this.confirmTime);
-        alertsnap.setConfirmPerson(this.confirmPerson);
-        alertsnap.setLastUpdateTime(this.lastUpdateTime);
-        alertsnap.setLastUpdatePerson(this.lastUpdatePerson);
-        alertsnap.setStationName(this.stationName);
-        alertsnap.setProjectName(this.projectName);
-        alertsnap.setLineName(this.lineName);
-        alertsnap.setWindturbineName(this.windturbineName);
-        alertsnap.setAlertText(this.alertText);
-        alertsnap.setModelId(this.modelId);
-        alertsnap.setTestingpointKey(this.testingpointKey);
-        alertsnap.setIfixPicture(this.ifixPicture);
-        alertsnap.setIfixTag(this.ifixTag);
-        alertsnap.setLastCloseTime(this.lastCloseTime);
-        alertsnap.setLastClosePerson(this.lastClosePerson);
-        alertsnap.setDataInfo(this.dataInfo);
-        return alertsnap;
-
-    }
-
-    public AlertSnapEntity(AlertSnap alertsnap) {
-        this.id = alertsnap.getId();
-        this.stationId = alertsnap.getStationId();
-        this.projectId = alertsnap.getProjectId();
-        this.lineId = alertsnap.getLineId();
-        this.windturbineId = alertsnap.getWindturbineId();
-        this.alertValue = alertsnap.getAlertValue();
-        this.cateGory1 = alertsnap.getCategory1();
-        this.cateGory2 = alertsnap.getCategory2();
-        this.cateGory3 = alertsnap.getCategory3();
-        this.rank = alertsnap.getRank();
-        this.isOpened = alertsnap.getIsOpened();
-        this.setConfirmed(alertsnap.getIsConfirmed());
-        this.confirmTime = alertsnap.getConfirmTime();
-        this.confirmPerson = alertsnap.getConfirmPerson();
-        this.lastUpdateTime = alertsnap.getLastUpdateTime();
-        this.lastUpdatePerson = alertsnap.getLastUpdatePerson();
-        this.stationName = alertsnap.getStationName();
-        this.projectName = alertsnap.getProjectName();
-        this.lineName = alertsnap.getLineName();
-        this.windturbineName = alertsnap.getWindturbineName();
-        this.alertText = alertsnap.getAlertText();
-        this.modelId = alertsnap.getModelId();
-        this.testingpointKey = alertsnap.getTestingpointKey();
-        this.ifixPicture = alertsnap.getIfixPicture();
-        this.ifixTag = alertsnap.getIfixTag();
-        this.lastCloseTime = alertsnap.getLastCloseTime();
-        this.lastClosePerson = alertsnap.getLastClosePerson();
-        this.dataInfo = alertsnap.getDataInfo();
-
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/DeviceFaultEntity.java

@@ -1,60 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.model.alarm.DeviceFault;
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-24
- */
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name = "P3_DEVICE_FAULT")
-public class DeviceFaultEntity implements ToData<DeviceFault>, Serializable {
-    @Id
-    @Column(name = "id")
-    private String id;
-    @Column(name = "CODE")
-    private String code;
-    @Column(name = "FAULTID")
-    private String faultId;
-    @Column(name = "NAME")
-    private String name;
-    @Column(name = "HALTTYPE")
-    private String haltType;
-    @Column(name = "CATEGORY")
-    private String cateGory;
-    @Column(name = "FAULTLEVEL")
-    private int faultLevel;
-    @Column(name = "CAUSE")
-    private String cause;
-    @Column(name = "DEVICEMODEL")
-    private String deviceModel;
-
-
-    @Override
-    public DeviceFault toData() {
-
-        DeviceFault data = new DeviceFault();
-        data.setId(this.id);
-        data.setCode(this.code);
-        data.setFaultId(this.faultId);
-        data.setName(this.name);
-        data.setHaltType(this.haltType);
-        data.setCateGory(this.cateGory);
-        data.setFaultLevel(this.faultLevel);
-        data.setCause(this.cause);
-        data.setDeviceModel(this.deviceModel);
-        return data;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/EquipmentModel.java

@@ -1,24 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class EquipmentModel implements Serializable {
-    private String id;
-    private String code;
-    private String name;
-    private String description;
-    private Double powerProduction;
-    private Double cutinWindSpeed;
-    private Double ratedWindSpeed;
-    private Double cutoutWindSpeed;
-    private String windturbineManufacturerId;
-    private String photo;
-    private String unit;
-    private Double sweptArea;
-    private Integer equipmentCategory;
-    private List<Windturbine> listwindturbine;
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/FaultHistory.java

@@ -1,24 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class FaultHistory implements Serializable {
-
-    private static final long serialVersionUID = -9116357102786246345L;
-    private Long id;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date faultTime;
-    private String operator;
-    private Long snapId;
-    private Integer confirmType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date confirmTime;
-    private String confirmPerson;
-    private int messageType;
-    private long alertSnapId;
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/FaultHistoryEntity.java

@@ -1,67 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@NoArgsConstructor
-@Entity
-@Table(name = "faulthistory")
-public class FaultHistoryEntity implements ToData<FaultHistory>, Serializable {
-
-    private static final long serialVersionUID = -9116357102786444345L;
-    @Id
-    @Column(name = "id")
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_FAULTHISTORY")
-//    @SequenceGenerator(name = "SEQ_FAULTHISTORY", sequenceName = "NXFD_FAULTHISTORY_ID")
-    @GeneratedValue
-    private Long id;
-    @Column(name = "faulttime")
-    private Date faultTime;
-    @Column(name = "operator")
-    private String operator;
-    @Column(name = "snapid")
-    private Long snapId;
-    @Column(name = "confirmtype")
-    private Integer confirmType;
-    @Column(name = "confirmtime")
-    private Date confirmTime;
-    @Column(name = "confirmperson")
-    private String confirmPerson;
-    @Column(name = "messagetype")
-    private int messageType;
-    @Column(name = "alertsnapid")
-    private String alertSnapId;
-
-    @Override
-    public FaultHistory toData() {
-        if (this != null) {
-            FaultHistory history = new FaultHistory();
-            BeanUtils.copyProperties(this, history);
-            return history;
-        } else {
-            return null;
-        }
-    }
-
-    public FaultHistoryEntity(FaultHistory history) {
-
-        this.id = history.getId();
-        this.faultTime = history.getFaultTime();
-        this.operator = history.getOperator();
-        this.snapId = history.getSnapId();
-        this.confirmType = history.getConfirmType();
-        this.confirmTime = history.getConfirmTime();
-        this.confirmPerson = history.getConfirmPerson();
-        this.messageType = history.getMessageType();
-
-    }
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/FaultInfoEntity.java

@@ -1,137 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.model.alarm.FaultInfo;
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-10
- */
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name = "view_faulthistory")
-public class FaultInfoEntity implements ToData<FaultInfo>, Serializable {
-
-    @Id
-    @Column(name = "id")
-    private long id;
-    //报警时间
-    @Column(name = "faulttime")
-    private Date faultTime;
-    //对象类型
-    @Column(name = "messagetype")
-    private int messageType;
-    //报警内容
-    @Column(name = "snapid")
-    private long snapID;
-
-    @Column(name = "confirmtype")
-    private int confirmType;
-
-    @Column(name = "confirmtime")
-    private Date confirmTime;
-
-    @Column(name = "confirmperson")
-    private String confirmPerson;
-
-    @Column(name = "stationid")
-    private String stationId;
-
-    @Column(name = "projectid")
-    private String projectId;
-
-    @Column(name = "lineid")
-    private String lineId;
-
-    @Column(name = "windturbineid")
-    private String windturbineId;
-
-    //报警对应故障编码
-    @Column(name = "alertvalue")
-    private int alertValue;
-
-
-    //报警级别
-    @Column(name = "rank")
-    private String rank;
-
-    @Column(name = "category1")
-    private String category1;
-
-    @Column(name = "category2")
-    private String category2;
-
-    @Column(name = "category3")
-    private String category3;
-
-    @Column(name = "isopened")
-    private int opened;
-
-    @Column(name = "lastupdatetime")
-    private Date lastUpdateTime;
-
-    @Column(name = "lastupdateperson")
-    private String lastUpdatePerson;
-
-    @Column(name = "stationname")
-    private String stationName;
-
-    @Column(name = "projectname")
-    private String projectName;
-
-    @Column(name = "linename")
-    private String lineName;
-
-    @Column(name = "windturbinename")
-    private String windturbineName;
-
-    @Column(name = "alerttext")
-    private String alertText;
-
-    @Column(name = "modelid")
-    private String modelId;
-
-
-    @Override
-    public FaultInfo toData() {
-        FaultInfo info = new FaultInfo();
-        info.setId(this.id);
-        info.setFaultTime(this.faultTime);
-        info.setMessageType(this.messageType);
-        info.setSnapID(this.snapID);
-        info.setConfirmType(this.confirmType);
-        info.setConfirmTime(this.confirmTime);
-        info.setConfirmPerson(this.confirmPerson);
-        info.setStationId(this.stationId);
-        info.setProjectId(this.projectId);
-        info.setLineId(this.lineId);
-        info.setWindturbineId(this.windturbineId);
-        info.setAlertValue(this.alertValue);//
-        info.setRank(this.rank);
-        info.setCategory1(this.category1);
-        info.setCategory2(this.category2);
-        info.setCategory3(this.category3);
-        info.setOpened(this.opened == 1);
-        info.setLastUpdateTime(this.lastUpdateTime);
-        info.setLastUpdatePerson(this.lastUpdatePerson);
-        info.setStationName(this.stationName);
-        info.setProjectName(this.projectName);
-        info.setLineName(this.lineName);
-        info.setWindturbineName(this.windturbineName);
-        info.setAlertText(this.alertText);
-        info.setModelId(this.modelId);
-
-        return info;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/FaultSnap.java

@@ -1,33 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class FaultSnap implements Serializable {
-    private static final long serialVersionUID = -8348826240826071549L;
-    private Long id;
-    private String stationId;
-    private String projectId;
-    private String lineId;
-    private String windturbineId;
-    private int alertValue;
-    private String cateGory1;
-    private String cateGory2;
-    private String cateGory3;
-    private String rank;
-    private int isOpened;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastUpdateTime;
-    private String lastUpdatePerson;
-    private String stationName;
-    private String projectName;
-    private String lineName;
-    private String windturbineName;
-    private String alertText;
-    private String modelId;
-    private String testingpointKey;
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/FaultSnapEntity.java

@@ -1,96 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name = "faultsnap")
-public class FaultSnapEntity implements ToData<FaultSnap>, Serializable {
-    private static final long serialVersionUID = -8348866240826071549L;
-    @Id
-    @Column(name = "id")
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_FAULTSNAP")
-//    @SequenceGenerator(name = "SEQ_FAULTSNAP", sequenceName = "NXFD_FAULTSNAP_ID")
-    @GeneratedValue
-    private Long id;
-    @Column(name = "stationid")
-    private String stationId;
-    @Column(name = "projectid")
-    private String projectId;
-    @Column(name = "lineid")
-    private String lineId;
-    @Column(name = "windturbineid")
-    private String windturbineId;
-    @Column(name = "alertvalue")
-    private int alertValue;
-    @Column(name = "category1")
-    private String cateGory1;
-    @Column(name = "category2")
-    private String cateGory2;
-    @Column(name = "category3")
-    private String cateGory3;
-    @Column(name = "rank")
-    private String rank;
-    @Column(name = "isopened")
-    private int isOpened;
-    @Column(name = "lastupdatetime")
-    private Date lastUpdateTime;
-    @Column(name = "lastupdateperson")
-    private String lastUpdatePerson;
-    @Column(name = "stationname")
-    private String stationName;
-    @Column(name = "projectname")
-    private String projectName;
-    @Column(name = "linename")
-    private String lineName;
-    @Column(name = "windturbinename")
-    private String windturbineName;
-    @Column(name = "alerttext")
-    private String alertText;
-    @Column(name = "modelid")
-    private String modelId;
-    @Column(name = "testingpointkey")
-    private String testingpointKey;
-
-    @Override
-    public FaultSnap toData() {
-
-        FaultSnap snap = new FaultSnap();
-        BeanUtils.copyProperties(this, snap);
-        return snap;
-
-    }
-
-    public FaultSnapEntity(FaultSnap snap) {
-
-        this.id = snap.getId();
-        this.stationId = snap.getStationId();
-        this.projectId = snap.getProjectId();
-        this.lineId = snap.getLineId();
-        this.windturbineId = snap.getWindturbineId();
-        this.alertValue = snap.getAlertValue();
-        this.cateGory1 = snap.getCateGory1();
-        this.cateGory2 = snap.getCateGory2();
-        this.cateGory3 = snap.getCateGory3();
-        this.rank = snap.getRank();
-        this.isOpened = snap.getIsOpened();
-        this.lastUpdateTime = snap.getLastUpdateTime();
-        this.lastUpdatePerson = snap.getLastUpdatePerson();
-        this.stationName = snap.getStationName();
-        this.projectName = snap.getProjectName();
-        this.lineName = snap.getLineName();
-        this.windturbineName = snap.getWindturbineName();
-        this.alertText = snap.getAlertText();
-        this.modelId = snap.getModelId();
-        this.testingpointKey = snap.getTestingpointKey();
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/Line.java

@@ -1,22 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class Line implements Serializable {
-    private String id;
-    private String code;
-    private String name;
-    private String aname;
-    private String projectId;
-    private Integer orderNum;
-    private String capacityUnit;
-    private Double capacity;
-    private Integer quantity;
-    private String stationCode;
-    private List<Windturbine> listwindturbine;
-    private Project project;
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/LineEntity.java

@@ -1,117 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.control.calc.dao.sql.ModelConstants;
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * author:wangjw
- */
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = ModelConstants.LINE_)
-public class LineEntity implements ToData<Line> {
-    /**
-     * 主键ID
-     */
-    @Id
-    /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
-    @Column(name = "ID")
-    private String id;
-    /**
-     * 编码
-     */
-    @Column(name = "CODE")
-    private String code;
-    /**
-     * 名称
-     */
-    @Column(name = "NAME")
-    private String name;
-    /**
-     * 地址
-     */
-    @Column(name = "ANAME")
-    private String aname;
-    /**
-     * 项目id
-     */
-    @Column(name = "PROJECTID")
-    private String projectId;
-    /**
-     * 顺序
-     */
-    @Column(name = "ORDERNUM")
-    private Integer orderNum;
-    /**
-     * 装机容量
-     */
-    @Column(name = "CAPACITY")
-    private Double capacity;
-    /*装机单位*/
-    @Column(name = "CAPACITYUNIT")
-    private String capacityUnit;
-    /*装机数量*/
-    @Column(name = "QUANTITY")
-    private Integer quantity;
-/*    @OneToMany(mappedBy=ModelConstants.ID_,cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
-    private List<WindturbineEntity> listwindturbines;
-    @ManyToOne(cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
-    @JoinColumn(name=ModelConstants.PROJECT_ID, referencedColumnName=ModelConstants.ID_,insertable=false, updatable=false)
-    private ProjectEntity project;*/
-
-    public LineEntity(Line line) {
-        this.id = line.getId();
-        this.code = line.getCode();
-        this.name = line.getName();
-        this.aname = line.getAname();
-        this.projectId = line.getProjectId();
-        this.orderNum = line.getOrderNum();
-        this.capacity = line.getCapacity();
-        this.capacityUnit = line.getCapacityUnit();
-        this.quantity = line.getQuantity();
-/*        List<WindturbineEntity> windturbinelist=new ArrayList<WindturbineEntity>();
-        for(windturbine windturbine:line.getListwindturbine()){
-            WindturbineEntity wind=  new WindturbineEntity(windturbine);
-            windturbinelist.add(wind);
-        }
-        listwindturbines=windturbinelist;
-        project=new ProjectEntity(line.getProject());*/
-    }
-
-
-    @Override
-    public Line toData() {
-        if (this != null) {
-            Line line = new Line();
-            line.setId(this.id);
-            line.setCode(this.code);
-            line.setName(this.name);
-            line.setAname(this.aname);
-            line.setProjectId(this.projectId);
-            line.setOrderNum(this.orderNum);
-            line.setCapacity(this.capacity);
-            line.setCapacityUnit(this.getCapacityUnit());
-            line.setQuantity(this.getQuantity());
-            return line;
-        } else {
-            return null;
-        }
-/*        line.setListwindturbine(DataUtil.convertDataList(this.listwindturbines));
-        line.setProject(this.getProject().toData());*/
-
-    }
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/ModelEntity.java

@@ -1,124 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = "EQUIPMENTMODEL")
-public class ModelEntity implements ToData<EquipmentModel> {
-    /**
-     * 主键ID
-     */
-    @Id
-    /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
-    @Column(name = "ID")
-    private String id;
-    /**
-     * 编码
-     */
-    @Column(name = "CODE")
-    private String code;
-    /**
-     * 名称
-     */
-    @Column(name = "NAME")
-    private String name;
-    /**
-     * 地址
-     */
-    @Column(name = "DESCRIPTION")
-    private String descrition;
-    /**
-     * 项目id
-     */
-    @Column(name = "POWERPRODUCTION")
-    private Double powerProduction;
-    /**
-     * 顺序
-     */
-    @Column(name = "CUTINWINDSPEED")
-    private Double cutinWindSpeed;
-    @Column(name = "RATEDWINDSPEED")
-    private Double ratedWindSpeed;
-    @Column(name = "CUTOUTWINDSPEED")
-    private Double cutoutWindSpeed;
-    /**
-     * 装机容量
-     */
-    @Column(name = "WINDTURBINEMANUFACTURERID")
-    private String windturbineManufacturerId;
-    /*装机单位*/
-    @Column(name = "UNIT")
-    private String unit;
-    @Column(name = "PHOTO")
-    private String photo;
-    /*装机数量*/
-    @Column(name = "SWEPTAREA")
-    private Double sweptArea;
-    /*风场编号*/
-    @Column(name = "EQUIPMENTCATEGORY")
-    private Integer equipmentCategory;
-
-    public ModelEntity(EquipmentModel model) {
-        this.id = model.getId();
-        this.code = model.getCode();
-        this.name = model.getName();
-        this.descrition = model.getDescription();
-        this.powerProduction = model.getPowerProduction();
-        this.cutinWindSpeed = model.getCutinWindSpeed();
-        this.ratedWindSpeed = model.getRatedWindSpeed();
-        this.cutoutWindSpeed = model.getCutinWindSpeed();
-        this.windturbineManufacturerId = model.getWindturbineManufacturerId();
-        this.unit = model.getUnit();
-        this.photo = model.getPhoto();
-        this.sweptArea = model.getSweptArea();
-        this.equipmentCategory = model.getEquipmentCategory();
-/*        List<WindturbineEntity> windturbinelist=new ArrayList<WindturbineEntity>();
-        for(windturbine windturbine:model.getListwindturbine()){
-            WindturbineEntity wind=  new WindturbineEntity(windturbine);
-            windturbinelist.add(wind);
-        }
-        listwindturbine=windturbinelist;*/
-    }
-
-
-    @Override
-    public EquipmentModel toData() {
-        if (this != null) {
-            EquipmentModel equipmentModel = new EquipmentModel();
-            equipmentModel.setId(this.id);
-            equipmentModel.setCode(this.code);
-            equipmentModel.setName(this.name);
-            equipmentModel.setDescription(this.descrition);
-            equipmentModel.setPowerProduction(this.powerProduction);
-            equipmentModel.setCutinWindSpeed(this.cutinWindSpeed);
-            equipmentModel.setWindturbineManufacturerId(this.windturbineManufacturerId);
-            equipmentModel.setUnit(this.getUnit());
-            equipmentModel.setSweptArea(this.getSweptArea());
-            equipmentModel.setEquipmentCategory(this.getEquipmentCategory());
-            equipmentModel.setPhoto(this.getPhoto());
-            equipmentModel.setRatedWindSpeed(this.getRatedWindSpeed());
-            equipmentModel.setCutoutWindSpeed(this.getCutoutWindSpeed());
-            equipmentModel.setEquipmentCategory(this.getEquipmentCategory());
-            /*equipmentModel.setListwindturbine(DataUtil.convertDataList(this.getListwindturbine()));*/
-            return equipmentModel;
-        } else {
-            return null;
-        }
-    }
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/PowerStation.java

@@ -1,30 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-//电场(风场)
-@Data
-public class PowerStation implements Serializable {
-    private String id;
-    private String code;
-    private String stationName;
-    private String address;
-    private String telephone;
-    private double capacity;
-    private String capacityUnit;
-    private int quantity;
-    private String shortName;
-    private double longitude;
-    private double latitude;
-    private String photo;
-    private String companyId;
-    private String systemManuFact;
-    private String headFarm;
-    private String headFarmPhone;
-    private String model;
-    private int orderNum;
-    private double height;
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/Project.java

@@ -1,25 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class Project implements Serializable {
-    private String id;
-    private String code;
-    private String name;
-    private String aname;
-    private String stationId;
-    private Double capacity;
-    private String capacityUnit;
-    private Integer quantity;
-    private String model;
-    private Date commissionDate;
-    private String masterPhone;
-    private String shiftForeman;
-    private String shiftForemanPhone;
-    private Integer orderNum;
-    private PowerStation powerStation;
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/StationStatusEntity.java

@@ -1,79 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-@Entity
-@Table(name = "STATIONSTATUS")
-public class StationStatusEntity {
-    /**
-     * ID
-     */
-    @Id
-    @Column(name = "ID")
-    private String id;
-    /**
-     * 场站ID
-     */
-    @Column(name = "STATIONID")
-    private String stationId;
-    /**
-     * 改变时间
-     */
-    @Column(name = "CHANGETIME")
-    private Date changeTime;
-    /**
-     * 是否自动控制
-     */
-    @Column(name = "TYPE")
-    private boolean type;
-
-    /**
-     * 用户名
-     */
-    @Column(name = "USERNAME")
-    private String userName;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-
-    public Date getChangeTime() {
-        return changeTime;
-    }
-
-    public void setChangeTime(Date changeTime) {
-        this.changeTime = changeTime;
-    }
-
-    public boolean isType() {
-        return type;
-    }
-
-    public void setType(boolean type) {
-        this.type = type;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/WarningEntity.java

@@ -1,89 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.model.alarm.Warning;
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name = "warning2")
-public class WarningEntity implements ToData<Warning>, Serializable {
-
-    private static final long serialVersionUID = -3888921205274103285L;
-    @Id
-    private String id;
-    @Column(name = "levelid")
-    private String levelId;
-    @Column(name = "manufacturercode")
-    private String manuFactureRcode;
-    @Column(name = "englishtext")
-    private String englishText;
-    @Column(name = "chinesetext")
-    private String chineseText;
-    @Column(name = "parentid")
-    private String parentId;
-    @Column(name = "isleaf")
-    private Integer isLeaf;
-    @Column(name = "sequencenumber")
-    private Integer sequenceNumber;
-    @Column(name = "characteristic")
-    private String characterIstic;
-    @Column(name = "modelid")
-    private String modelId;
-    @Column(name = "codename")
-    private String codeName;
-    @Column(name = "ednavalue")
-    private Integer ednaValue;
-    @Column(name = "display")
-    private Integer display;
-    @Column(name = "warningclassifyid")
-    private String warningClassifyId;
-    @Column(name = "standardtime")
-    private Double standardTime;
-    @Column(name = "isreset")
-    private Integer isReset;
-
-    @Column(name = "faultcode")
-    private String faultCode;
-//    @Column(name = "warningtypeid")
-//    private String warningTypeId;
-
-    @Override
-    public Warning toData() {
-        Warning warning = new Warning();
-        BeanUtils.copyProperties(this, warning);
-        return warning;
-    }
-
-
-    public WarningEntity(Warning warning) {
-        this.id = warning.getId();
-        this.levelId = warning.getLevelId();
-        this.manuFactureRcode = warning.getManuFactureRcode();
-        this.englishText = warning.getEnglishText();
-        this.chineseText = warning.getChineseText();
-        this.parentId = warning.getParentId();
-        this.isLeaf = warning.getIsLeaf();
-        this.sequenceNumber = warning.getSequenceNumber();
-        this.characterIstic = warning.getCharacterIstic();
-        this.modelId = warning.getModelId();
-        this.codeName = warning.getCodeName();
-        this.ednaValue = warning.getEdnaValue();
-        this.display = warning.getDisplay();
-        this.warningClassifyId = warning.getWarningClassifyId();
-        this.standardTime = warning.getStandardTime();
-        this.isReset = warning.getIsReset();
-//        this.warningTypeId = warning.getWarningTypeId();
-    }
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/Windturbine.java

@@ -1,25 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class Windturbine implements Serializable {
-    private String id;
-    private String code;
-    private String windPowerStationId;
-    private Double longitude;
-    private Double latitude;
-    private String modelId;
-    private String status;
-    private String projectId;
-    private String lineId;
-    private Date firstIntegratedTime;
-    private String photo;
-    private String name;
-    private String standardId;
-    private Line line;
-    private EquipmentModel model;
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/entity/WindturbineEntity.java

@@ -1,152 +0,0 @@
-package com.gyee.neic_service.dao.entity;
-
-import com.gyee.neic_service.util.ToData;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-
-
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = "WINDTURBINE")
-public class WindturbineEntity implements ToData<Windturbine> {
-
-//      `ID` varchar(50) NOT NULL,
-//  `CODE` varchar(50) DEFAULT NULL,
-//  `WINDPOWERSTATIONID` varchar(50) NOT NULL,
-//  `LONGITUDE` float(18,2) DEFAULT NULL,
-//  `LATITUDE` float(18,2) DEFAULT NULL,
-//  `MODELID` varchar(50) DEFAULT NULL,
-//  `STATUS` varchar(50) DEFAULT NULL,
-//  `PROJECTID` varchar(50) DEFAULT NULL,
-//  `LINEID` varchar(50) DEFAULT NULL,
-//  `FIRSTINTEGRATEDTIME` varchar(50) DEFAULT NULL,
-//  `PHOTO` varchar(50) DEFAULT NULL,
-//  `NAME` varchar(50) DEFAULT NULL,
-//  `STANDARDID` varchar(50) DEFAULT NULL,
-//  `GYCP_ID` int(11) DEFAULT NULL COMMENT '通信通道Id',
-
-    /**
-     * 主键ID
-     */
-    @Id
-    /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
-    @Column(name = "ID")
-    private String id;
-    /**
-     * 编码
-     */
-    @Column(name = "CODE")
-    private String code;
-    /**
-     * 风场id
-     */
-    @Column(name = "WINDPOWERSTATIONID")
-    private String windPowerStationId;
-    /**
-     * 经度
-     */
-    @Column(name = "LONGITUDE")
-    private Double longitude;
-    /**
-     * 纬度
-     */
-    @Column(name = "LATITUDE")
-    private Double latitude;
-    /**
-     * 模型id
-     */
-    @Column(name = "MODELID")
-    private String modelId;
-    /**
-     * 状态
-     */
-    @Column(name = "STATUS")
-    private String status;
-    /**
-     * 项目id
-     */
-    @Column(name = "PROJECTID")
-    private String projectId;
-    /**
-     * 线路id
-     */
-    @Column(name = "LINEID")
-    private String lineId;
-    /**
-     * 首次并网的时间
-     */
-    @Column(name = "FIRSTINTEGRATEDTIME")
-    private Date firstIntegratedTime;
-    /**
-     * app注册ID
-     */
-    @Column(name = "PHOTO")
-    private String photo;
-    /**
-     * app注册ID
-     */
-    @Column(name = "NAME")
-    private String name;
-    /**
-     * app注册ID
-     */
-    @Column(name = "STANDARDID")
-    private String standardId;
-
-
-    public WindturbineEntity(Windturbine win) {
-        this.id = win.getId();
-        this.code = win.getCode();
-        this.windPowerStationId = win.getWindPowerStationId();
-        this.longitude = win.getLongitude();
-        this.latitude = win.getLatitude();
-        this.modelId = win.getModelId();
-        this.status = win.getStatus();
-        this.projectId = win.getProjectId();
-        this.lineId = win.getLineId();
-        this.firstIntegratedTime = win.getFirstIntegratedTime();
-        this.photo = win.getPhoto();
-        this.name = win.getName();
-        this.standardId = win.getStandardId();
-/*        this.line=new LineEntity(win.getLine());
-        this.model=new ModelEntity(win.getModel());*/
-    }
-
-
-    @Override
-    public Windturbine toData() {
-        if (this != null) {
-            Windturbine win = new Windturbine();
-            win.setId(id);
-            win.setCode(code);
-            win.setWindPowerStationId(windPowerStationId);
-            win.setLongitude(longitude);
-            win.setLatitude(latitude);
-            win.setModelId(modelId);
-            win.setStatus(status);
-            win.setProjectId(projectId);
-            win.setLineId(lineId);
-            win.setFirstIntegratedTime(firstIntegratedTime);
-            win.setPhoto(photo);
-            win.setName(name);
-            win.setStandardId(standardId);
-
-            return win;
-        } else {
-            return null;
-        }
-    }
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/AlertRuleRepository.java

@@ -1,13 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.AlertRuleEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-import java.util.List;
-
-public interface AlertRuleRepository extends JpaRepository<AlertRuleEntity, String>, JpaSpecificationExecutor {
-    List<AlertRuleEntity> findByEnabled(boolean enabled);
-
-    List<AlertRuleEntity> findAlertRuleEntitiesByStationAndModelId(String station, String modelId);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/AlertSnapRepository.java

@@ -1,29 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.AlertSnapEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-
-@Repository
-public interface AlertSnapRepository extends JpaRepository<AlertSnapEntity, String>, JpaSpecificationExecutor<AlertSnapEntity> {
-    AlertSnapEntity findAllById(Long id);
-
-    AlertSnapEntity findByWindturbineIdAndAlertValue(String windturbineId, int alertValue);
-
-    AlertSnapEntity findByStationIdAndAlertValue(String stationId, int alertValue);
-
-    AlertSnapEntity findByTestingpointKey(String testingpointkey);
-
-    @Query(value = "select t1 from AlertSnapEntity t1   where  t1.lastUpdateTime>=?1 and t1.isOpened=1   order by t1.lastUpdateTime desc ")
-    List<AlertSnapEntity> searchLatest(Date startTime);
-
-    @Query(value = "select t1 from AlertSnapEntity t1   where  t1.lastUpdateTime>?1  and  t1.isOpened=1  and t1.cateGory1=?3  and ( t1.stationId=?2 or t1.projectId=?2 or t1.lineId=?2 or t1.windturbineId=?2 ) order by t1.lastUpdateTime desc ")
-    List<AlertSnapEntity> searchLatestByObjectId(Date startTime, String objectId, String cateGory1);
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/DeviceFaultRepository.java

@@ -1,19 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.DeviceFaultEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-24
- */
-@Repository
-public interface DeviceFaultRepository extends JpaRepository<DeviceFaultEntity, String>, JpaSpecificationExecutor {
-
-    List<DeviceFaultEntity> findAll();
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/FaultHistoryRepository.java

@@ -1,17 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.FaultHistoryEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface FaultHistoryRepository extends JpaRepository<FaultHistoryEntity, Long>, JpaSpecificationExecutor {
-
-    FaultHistoryEntity findFirstById(long id);
-
-//    @Modifying
-//    @Query("update faulthistory set confirmtype=1 where FAULTTIME > ?1")
-//    void OneKeyRemove(Date startTime);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/FaultInfoRepository.java

@@ -1,28 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.FaultInfoEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-10
- */
-@Repository
-public interface FaultInfoRepository extends JpaRepository<FaultInfoEntity, Integer>, JpaSpecificationExecutor<FaultInfoEntity> {
-
-    @Query(value = "select t1 from FaultInfoEntity t1 where t1.confirmType=0 and t1.opened=1 and t1.messageType=1 and t1.faultTime>=?1  order by t1.faultTime desc ")
-    List<FaultInfoEntity> searchByFaultTime(Date startTime);
-
-    //原生sql
-    @Query(value = "select * from VIEW_FAULTHISTORY    where  rownum<=?1  order by faultTime desc ", nativeQuery = true)
-    List<FaultInfoEntity> searchLatestByCount(int count);
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/FaultSnapRepository.java

@@ -1,54 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.FaultSnapEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Repository
-public interface FaultSnapRepository extends JpaRepository<FaultSnapEntity, Long>, JpaSpecificationExecutor {
-
-    FaultSnapEntity findByWindturbineIdAndAlertValue(String windturbineId, int alertValue);
-
-    FaultSnapEntity findByStationIdAndAlertValue(String stationId, int alertValue);
-
-    FaultSnapEntity findByTestingpointKey(String testingpointkey);
-
-    //获取故障风机编号
-    @Query(value = "select t1 from FaultSnapEntity t1   where t1.cateGory1='FJ' and t1.stationId like '%FDC%' and t1.stationId not like '%QS%' and t1.isOpened=1")
-    List<FaultSnapEntity> searchAllFaultWindturbineId();
-
-    //获取故障风机编号
-    @Query(value = "select t1 from FaultSnapEntity t1   where  t1.isOpened=1 and t1.lastUpdateTime>?1")
-    List<FaultSnapEntity> searchAllFaultWindturbine(Date startTime);
-
-    List<FaultSnapEntity> findAllByIdIn(List<Long> idList);
-
-
-    List<FaultSnapEntity> getFaultSnapEntitiesByIsOpenedAndLastUpdateTimeAfter(int isopend, Date startTime);
-
-//    @Modifying
-//    @Query("update faultsnap f set f.isopened=0")//("update faultsnap f set f.isopened=0 where  f.lastupdatetime > ?1 and f.category1='SYZ'")
-//    int OneKeyRemove(String startTime);
-
-
-//
-//    //List<FaultSnapEntity>  getFaultSnapEntityByIsOpenedandAndLastUpdateTime(boolean isopend,Date lastUpdateTime);
-//    // 一键移除升压站误报
-//    @Transactional
-//    @Query(value ="update faultsnap t1 set isopened=0  where t1.lastUpdateTime> ?1 and t1.isopened=1 ",nativeQuery = true)
-//    void oneKeyRemoveSYZFaultSnap(Date nowTime);
-//
-////
-////
-////    // select id from faultsnap where isopened=1 and category1='SYZ' and lastupdatetime > to_date('2019-11-22 16:55:00','yyyy-mm-dd hh24:mi:ss')
-//    @Transactional
-//    @Query(value ="select id from faultsnap where isopened=0 and lastupdatetime > ?1 ",nativeQuery = true)
-//    List<Long> getIdListFromFaultSnapBySYZ (Date nowTime);
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/ILineDao.java

@@ -1,18 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-
-import com.gyee.neic_service.dao.entity.Line;
-
-import java.util.List;
-
-public interface ILineDao {
-    List<Line> findAll();
-
-    Line findById(String id);
-
-    void deletebyid(String id);
-
-    void save(Line line);
-
-    List<Line> findByprojectId(String id);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/IStationStatusRepository.java

@@ -1,11 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.StationStatusEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author xysn
- */
-public interface IStationStatusRepository extends JpaRepository<StationStatusEntity, Long> {
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/IWindturbineDao.java

@@ -1,29 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-
-import com.gyee.neic_service.dao.entity.Windturbine;
-
-import java.util.List;
-
-public interface IWindturbineDao{
-    void del(String id);
-
-    void save(Windturbine win);
-
-    List<Windturbine> find();
-
-    Windturbine findbyid(String id);
-
-    List<Windturbine> findByStationId(String stationId);
-
-    List<Windturbine> findByProjectId(String projectId);
-
-    List<Windturbine> findByLineId(String lineId);
-
-    List<Windturbine> findByModelId(String modelId);
-
-    List<Windturbine> findByStationIdAndModelId(String stationId, String modelId);
-
-    List<Windturbine> findFDCWindturbine();
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/LineRepository.java

@@ -1,16 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.LineEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Repository
-public interface LineRepository extends JpaRepository<LineEntity, String>, JpaSpecificationExecutor {
-
-    List<LineEntity> findFirstByProjectId(String projectId);
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/ModelRepository.java

@@ -1,12 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.ModelEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface ModelRepository extends JpaRepository<ModelEntity, String>, JpaSpecificationExecutor {
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/WarningRepository.java

@@ -1,20 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.WarningEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Repository
-public interface WarningRepository extends JpaRepository<WarningEntity, String>, JpaSpecificationExecutor {
-    WarningEntity findAllById(String id);
-
-    WarningEntity findByEdnaValue(Integer ednavalue);
-
-    List<WarningEntity> findByModelId(String modelid);
-
-    List<WarningEntity> findByIsReset(Integer isReset);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/repsoitory/WindturbineRepository.java

@@ -1,27 +0,0 @@
-package com.gyee.neic_service.dao.repsoitory;
-
-import com.gyee.neic_service.dao.entity.WindturbineEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Repository
-public interface WindturbineRepository extends JpaRepository<WindturbineEntity, String>, JpaSpecificationExecutor {
-
-    /*  ModelEntity findFirstByUserName(String userName);*/
-    List<WindturbineEntity> findByWindPowerStationId(String stationId);
-
-    List<WindturbineEntity> findByLineId(String lineId);
-
-    List<WindturbineEntity> findByProjectId(String projectId);
-
-    List<WindturbineEntity> findByModelId(String modelId);
-
-    List<WindturbineEntity> findByWindPowerStationIdAndModelId(String stationId, String modelId);
-
-    List<WindturbineEntity> findByWindPowerStationIdLike(String likeStation);
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/windturbine/ITagValueChanged.java

@@ -1,15 +0,0 @@
-package com.gyee.neic_service.dao.windturbine;
-
-/**
- * 标签点数据变化
- *
- * @author xysn
- */
-public interface ITagValueChanged {
-    /**
-     * 数据改变
-     *
-     * @param value
-     */
-    void valueChanged(double value);
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/dao/windturbine/PointData.java

@@ -1,62 +0,0 @@
-package com.gyee.neic_service.dao.windturbine;
-
-/**
- * 测点数据
- */
-public class PointData {
-    /**
-     * 时间戳
-     */
-    private long ts;
-    /**
-     * 数据
-     */
-    private double doubleValue;
-    /**
-     * boolean 数据
-     */
-    private boolean booleanValue;
-    /**
-     * 状态
-     */
-    private int status;
-
-    public long getTs() {
-        return ts;
-    }
-
-    public void setTs(long ts) {
-        this.ts = ts;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public double getValue() {
-        if (booleanValue) {
-            return 1;
-        }
-        return doubleValue;
-    }
-
-    public double getDoubleValue() {
-        return doubleValue;
-    }
-
-    public void setDoubleValue(double doubleValue) {
-        this.doubleValue = doubleValue;
-    }
-
-    public boolean getBooleanValue() {
-        return booleanValue;
-    }
-
-    public void setBooleanValue(boolean booleanValue) {
-        this.booleanValue = booleanValue;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/feigns/FeignsBuilder.java

@@ -1,56 +0,0 @@
-//package com.gyee.neic_service.feigns;
-//
-//import feign.Feign;
-//import feign.Request;
-//import feign.Retryer;
-//import feign.jackson.JacksonDecoder;
-//import feign.jackson.JacksonEncoder;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * @author xysn
-// */
-//@Configuration
-//public class FeignsBuilder {
-//    /**
-//     * 数据适配器url
-//     */
-//    @Value("${urls.adapter: http://127.0.0.1:8011}")
-//    private String adapterUrl;
-//
-//    /**
-//     * 推荐url
-//     */
-//    @Value("${recommendationUrl: http://127.0.0.1:8101}")
-//    private String recommendationUrl;
-//
-//    /**
-//     * 报警url
-//     */
-//    @Value("${shardingUrl:http://localhost:8075}")
-//    private String shardingUrl;
-//
-//    @Bean
-//    public IDataAdapter dataAdapter() {
-//        return Feign.builder()
-//                .encoder(new JacksonEncoder())
-//                .decoder(new JacksonDecoder())
-//                .options(new Request.Options(1000, 100000))
-//                .retryer(new Retryer.Default(5000, 5000, 3))
-//                .target(IDataAdapter.class, adapterUrl);
-//    }
-//
-//
-//
-//    @Bean
-//    public ISharding shardingService() {
-//        return Feign.builder()
-//                .encoder(new JacksonEncoder())
-//                .decoder(new JacksonDecoder())
-//                .options(new Request.Options(1000, 10000))
-//                .retryer(new Retryer.Default(5000, 5000, 3))
-//                .target(ISharding.class, shardingUrl);
-//    }
-//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/feigns/IDataAdapter.java

@@ -1,85 +0,0 @@
-//package com.gyee.neic_service.feigns;
-//
-//import com.gyee.neic_service.dao.windturbine.PointData;
-//import feign.Param;
-//import feign.RequestLine;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * DataAdapter数据请求
-// */
-//public interface IDataAdapter {
-//    /**
-//     * 获取实时数据
-//     *
-//     * @param keys 以逗号(,)隔开的一个或多个标签
-//     * @return 实时数据
-//     */
-//    @RequestLine("GET /ts/latest?keys={keys}")
-//    Map<String, PointData> getValueByKeys(@Param(value = "keys") String keys);
-//
-//
-//    /**
-//     * 获取等间隔历史数据
-//     *
-//     * @param tagName  测点名称
-//     * @param startTs  开始时间
-//     * @param endTs    结束时间
-//     * @param interval 数据间隔
-//     * @return 历史数据
-//     */
-//    @RequestLine("GET /ts/history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
-//    List<PointData> getSnapValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs,
-//                                       @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
-//
-//
-//    /**
-//     * 获取等间隔历史数据
-//     *
-//     * @param thingId   设备ID
-//     * @param thingType 设备类型
-//     * @param startTs   开始时间
-//     * @param endTs     结束时间
-//     * @param interval  时间间隔
-//     * @return 历史数据
-//     */
-//    @RequestLine("GET /ts/history/snap?thingId={thingId}&uniformCode={uniformCode}&thingType={thingType}&startTs={startTs}&endTs={endTs}&interval={interval}")
-//    List<PointData> getSnapValuesByUniformCode(@Param(value = "thingId") String thingId, @Param(value = "uniformCode") String uniformCode,
-//                                               @Param(value = "thingType") String thingType, @Param(value = "startTs") long startTs,
-//                                               @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
-//
-//
-//    /**
-//     * 获取历史数据
-//     *
-//     * @param thingId   设备ID
-//     * @param thingType 设备类型
-//     * @param startTs   开始时间
-//     * @param endTs     结束时间
-//     * @return 历史数据
-//     */
-//    @RequestLine("GET /ts/history/raw?thingId={thingId}&uniformCode={uniformCode}&thingType={thingType}&startTs={startTs}&endTs={endTs}")
-//    List<PointData> getRawValuesByUniformCode(@Param(value = "thingId") String thingId, @Param(value = "uniformCode") String uniformCode,
-//                                              @Param(value = "thingType") String thingType, @Param(value = "startTs") long startTs,
-//                                              @Param(value = "endTs") long endTs);
-//
-//    /**
-//     * 获取历史数据
-//     *
-//     * @param tagName 测点名称
-//     * @param startTs 开始时间
-//     * @param endTs   结束时间
-//     * @return 历史数据
-//     */
-//    @RequestLine("GET /ts/history/raw?tagName={tagName}&startTs={startTs}&endTs={endTs}")
-//    List<PointData> getRawValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs, @Param(value = "endTs") long endTs);
-//
-//
-//    /**
-//     * 获取历史时刻数据
-//     */
-//    @RequestLine("GET /ts/history/section?tagNames={tagNames}&ts={ts}")
-//    Map<String, PointData> getHistorySection(@Param(value = "tagNames") String tagNames, @Param(value = "ts") long ts);
-//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/feigns/ISharding.java

@@ -1,128 +0,0 @@
-//package com.gyee.neic_service.feigns;
-//
-//import com.gyee.neic_service.dao.entity.FaultHistory;
-//import com.gyee.neic_service.dao.entity.FaultSnap;
-//import com.gyee.neic_service.model.RequestInfo;
-//import com.gyee.neic_service.model.alarm.AlertSnap;
-//import com.gyee.neic_service.model.alarm.FaultInfo;
-//import com.gyee.neic_service.model.alarm.OverhaulInfo;
-//import feign.Headers;
-//import feign.Param;
-//import feign.RequestLine;
-//
-//import java.util.List;
-//
-///**
-// * @descrition:
-// * @author:Wanghs
-// * @date:2020-04-29
-// */
-//public interface ISharding {
-//
-//    @RequestLine("GET /alarm/snap?stationid={stationid}&windturbineid={windturbineid}&category1={category1}" +
-//            "&category2={category2}&rank={rank}" +
-//            "&isopened={isopened}&keyword={keyword}&starttime={starttime}&endtime={endtime}")
-//    List<AlertSnap> getRealTimeAlarm(
-//            @Param(value = "stationid") String stationid,
-//            @Param(value = "windturbineid") String windturbineid,
-//            @Param(value = "category1") String category1,
-//            @Param(value = "category2") String category2,
-//            @Param(value = "rank") String rank,
-//            @Param(value = "isopened") Integer isopened,
-//            @Param(value = "keyword") String keyWord,
-//            @Param(value = "starttime") String startTime,
-//            @Param(value = "endtime") String endTime
-//    );
-//
-//    /**
-//     * 获取一段时间的活跃报警
-//     *
-//     * @param startTime 开始时间 2021-10-16 12:01:01
-//     * @param endTime   结束时间
-//     * @return 报警列表
-//     */
-//    @RequestLine("GET /fault/snap/list?starttime={startTime}&endtime={endTime}&isopened=1")
-//    List<FaultSnap> getFalutSnapListOpened(@Param(value = "startTime") String startTime, @Param(value = "endTime") String endTime);
-//
-//    /**
-//     * 通过场站ID和机型获取报警缓存
-//     *
-//     * @param stationId 场站ID
-//     * @param modelId   机型ID
-//     * @return 报警缓存
-//     */
-//    @RequestLine("GET /alarm/snap?stationid={stationId}&modelid={modelId}")
-//    List<AlertSnap> getAlarmSnapByStationAndModel(@Param(value = "stationId") String stationId, @Param(value = "modelId") String modelId);
-//
-//    //获取最新实时报警2   websocketController getRealTimeAlertInfo()
-//    @RequestLine("GET /alarm/snap/single?windturbineid={wtId}&alertvalue={alertValue}")
-//    List<AlertSnap> getRealTimeAlarmByObjectId(
-//            @Param(value = "cateGory1") String cateGory1,
-//            @Param(value = "objectId") String objectId,
-//            @Param(value = "startTime") String startTime,
-//            @Param(value = "isOpened") boolean isOpened //默认为1
-//    );
-//
-//    //获取历史故障 websocketController getHistoryFaultInfo
-//    @RequestLine("GET /fault/history/list?pagenum={pagenum}&pagesize={pagesize}&stationid={stationid}&keyword={keyword}&starttime={starttime}&endtime={endtime}")
-//    List<FaultInfo> getFaultHistoryInfo(
-//            @Param(value = "pagenum") Integer pagenum,
-//            @Param(value = "pagesize") Integer pagesize,
-//            @Param(value = "stationid") String stationid,
-//            @Param(value = "keyword") String keyword,
-//            @Param(value = "starttime") String starttime,
-//            @Param(value = "endtime") String endtime
-//    );
-//
-//    //故障确认故障 websocketController faultAlarmConfirm()
-//    @Headers({"Content-Type: application/json", "Accept: application/json"})
-//    @RequestLine("POST /fault/history")
-//    void confirmFault(FaultHistory confirmData);
-//
-//    //根据id获取故障历史  getPopupStatus
-//    @RequestLine("GET /fault/history/{historyId}")
-//    FaultHistory getFaultHistoryById(@Param(value = "historyId") long historyId);
-//
-//
-//    //获取故障弹窗状态  getPopupStatus
-//    @RequestLine("GET /fault/snap/ids?ids={ids}")
-//    List<FaultSnap> getFaultSnapByIdList(@Param(value = "ids") String ids);
-//
-//    //获取最新的一定数量的故障
-//    @RequestLine("GET /fault/top?topnum={count}")
-//    List<FaultInfo> getlatestFaultInfoByCount(@Param(value = "count") int count);
-//
-//    //获取当前正在活跃的故障
-//    @RequestLine("GET /alarm/snap/single?windturbineid={wtId}&alertvalue={alertValue}")
-//    List<FaultInfo> getlatestIsOpenedFaultInfo(
-//            @Param(value = "confirmType") int confirmType,
-//            @Param(value = "opened") int opened,
-//            @Param(value = "messageType") int messageType,
-//            @Param(value = "startTime") int startTime,
-//            @Param(value = "endTime") int endTime);
-//
-//    //获取最新的一定数量的故障
-//    @RequestLine("GET /fault/recent?faulttime={faulttime}")
-//    List<FaultInfo> GetRealTimeFaultInfoByStartTime(@Param(value = "faulttime") String faulttime);
-//
-//
-//    //一键清除弹窗
-//    @RequestLine("GET /fault/clear?startTime={startTime}&endTime={endTime}")
-//    void clearFault(@Param(value = "startTime") Long startTime, @Param(value = "endTime") Long endTime);
-//
-//    //确认时批量确认
-//    @RequestLine("GET /fault/confirm?faultHistoryId={faultHistoryId}&confirmType={confirmType}&userName={userName}&snpaId={snpaId}")
-//    void confirmBatch(@Param(value = "faultHistoryId") Long faultHistoryId,
-//                      @Param(value = "confirmType") int confirmType,
-//                      @Param(value = "userName") String userName,
-//                      @Param(value = "snpaId") Long snpaId);
-//
-//
-//    /**
-//     * 获取检修信息
-//     *
-//     * @return 检修信息
-//     */
-//    @RequestLine("GET /inspectorder/order/list?startTime={startTime}&endTime={endTime}")
-//    RequestInfo<OverhaulInfo> getInspectorder(@Param(value = "startTime") long startTime, @Param(value = "endTime") long endTime);
-//}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/AttentionInfo.java

@@ -1,95 +0,0 @@
-package com.gyee.neic_service.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.gyee.neic_service.model.enums.AttentionMessageType;
-import com.gyee.neic_service.model.enums.AttentionType;
-
-/**
- * 关注信息
- *
- * @author xysn
- */
-public class AttentionInfo {
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * 场站ID
-     */
-    private String stationId;
-    /**
-     * 场站名称
-     */
-    private String name;
-    /**
-     * 时间戳
-     */
-    private long time;
-    /**
-     * 消息类型
-     */
-    private AttentionMessageType type;
-    /**
-     * 设备类型
-     */
-    private AttentionType attentionType;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public void setTime(long time) {
-        this.time = time;
-    }
-
-    public AttentionMessageType getType() {
-        return type;
-    }
-
-    public void setType(AttentionMessageType type) {
-        this.type = type;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public AttentionType getAttentionType() {
-        return attentionType;
-    }
-
-    public void setAttentionType(AttentionType attentionType) {
-        this.attentionType = attentionType;
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-
-    /**
-     * 获取唯一标记
-     *
-     * @return 标记
-     */
-    @JsonIgnore
-    public String getTag() {
-        return id + "" + type.ordinal();
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/BoostStationData.java

@@ -1,96 +0,0 @@
-package com.gyee.neic_service.model;
-
-
-import java.util.List;
-
-/**
- * 升压站数据信息
- *
- * @author xysn
- */
-public class BoostStationData {
-    /**
-     * 场站ID
-     */
-    private String id;
-    /**
-     * 场站名称
-     */
-    private String name;
-    /**
-     * 序号
-     */
-    private int index;
-    /**
-     * 标签名称
-     */
-    private String tagName;
-    /**
-     * 背景图片路径
-     */
-    private String background;
-    /**
-     * 更新时间
-     */
-    private long updatedDate;
-    /**
-     * 控件时间
-     */
-    private List<BoostStationPointData> boostStationPointInfos;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getBackground() {
-        return background;
-    }
-
-    public void setBackground(String background) {
-        this.background = background;
-    }
-
-    public long getUpdatedDate() {
-        return updatedDate;
-    }
-
-    public void setUpdatedDate(long updatedDate) {
-        this.updatedDate = updatedDate;
-    }
-
-    public List<BoostStationPointData> getBoostStationPointInfos() {
-        return boostStationPointInfos;
-    }
-
-    public void setBoostStationPointInfos(List<BoostStationPointData> boostStationPointInfos) {
-        this.boostStationPointInfos = boostStationPointInfos;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
-    public String getTagName() {
-        return tagName;
-    }
-
-    public void setTagName(String tagName) {
-        this.tagName = tagName;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/BoostStationPointData.java

@@ -1,106 +0,0 @@
-package com.gyee.neic_service.model;
-
-
-/**
- * 升压站控件点信息
- *
- * @author xysn
- */
-public class BoostStationPointData {
-    /**
-     * 坐标
-     */
-    private Point coordinate;
-    /**
-     * 控件类型
-     */
-    private String type;
-    /**
-     * 数据标签
-     */
-    private String dataTag;
-    /**
-     * 中心点坐标
-     */
-    private Point centerCoordinate;
-    /**
-     * 旋转角度
-     */
-    private int angle;
-    /**
-     * 缩放比例
-     */
-    private int proportion;
-    /**
-     * 数据标签与名称
-     */
-    private String info;
-    /**
-     * 是否取反
-     */
-    private boolean isNegate;
-
-    public Point getCoordinate() {
-        return coordinate;
-    }
-
-    public void setCoordinate(Point coordinate) {
-        this.coordinate = coordinate;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getDataTag() {
-        return dataTag;
-    }
-
-    public void setDataTag(String dataTag) {
-        this.dataTag = dataTag;
-    }
-
-    public Point getCenterCoordinate() {
-        return centerCoordinate;
-    }
-
-    public void setCenterCoordinate(Point centerCoordinate) {
-        this.centerCoordinate = centerCoordinate;
-    }
-
-    public int getAngle() {
-        return angle;
-    }
-
-    public void setAngle(int angle) {
-        this.angle = angle;
-    }
-
-    public int getProportion() {
-        return proportion;
-    }
-
-    public void setProportion(int proportion) {
-        this.proportion = proportion;
-    }
-
-    public String getInfo() {
-        return info;
-    }
-
-    public void setInfo(String info) {
-        this.info = info;
-    }
-
-    public boolean getIsNegate() {
-        return isNegate;
-    }
-
-    public void setIsNegate(boolean negate) {
-        isNegate = negate;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/Point.java

@@ -1,28 +0,0 @@
-package com.gyee.neic_service.model;
-
-
-/**
- * 坐标点
- *
- * @author xysn
- */
-public class Point {
-    private double x;
-    private double y;
-
-    public double getX() {
-        return x;
-    }
-
-    public void setX(double x) {
-        this.x = x;
-    }
-
-    public double getY() {
-        return y;
-    }
-
-    public void setY(double y) {
-        this.y = y;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/PointInfo.java

@@ -1,49 +0,0 @@
-package com.gyee.neic_service.model;
-
-import com.gyee.neic_service.model.enums.Trends;
-import com.gyee.neic_service.model.station.TagInfo;
-
-/**
- * 标签点信息
- *
- * @author xysn
- */
-public class PointInfo extends TagInfo {
-    /**
-     * 倍率
-     */
-    private double multiplier = 1;
-    /**
-     * 历史数据
-     */
-    private double valueHistory = 0;
-    /**
-     * 趋势
-     */
-    private Trends trend = Trends.Counterpoise;
-
-    @Override
-    public void setValue(double value) {
-        double d = value - valueHistory;
-        if (d > 0) {
-            trend = Trends.Rise;
-        } else {
-            trend = Trends.Decline;
-        }
-        valueHistory = value;
-        super.setValue(value);
-    }
-
-    @Override
-    public double getValue() {
-        return super.getValue() * multiplier;
-    }
-
-    public Trends getTrend() {
-        return trend;
-    }
-
-    public void setMultiplier(double multiplier) {
-        this.multiplier = multiplier;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/RequestInfo.java

@@ -1,83 +0,0 @@
-package com.gyee.neic_service.model;
-
-import java.util.List;
-
-/**
- * 请求信息
- *
- * @author xysn
- */
-public class RequestInfo<T> {
-    /**
-     * 是否成功
-     */
-    private boolean success;
-    /**
-     * 请求状态
-     */
-    private int status;
-    /**
-     * 数据数量
-     */
-    private int count;
-    /**
-     * 消息
-     */
-    private String msg;
-    /**
-     * 权限
-     */
-    private String token;
-    /**
-     * 数据
-     */
-    private List<T> data;
-
-    public boolean getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public List<T> getData() {
-        return data;
-    }
-
-    public void setData(List<T> data) {
-        this.data = data;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/StationStatus.java

@@ -1,45 +0,0 @@
-package com.gyee.neic_service.model;
-
-/**
- * 风场状态
- *
- * @author xysn
- */
-public class StationStatus {
-    /**
-     * 场站名称
-     */
-    private String name;
-    /**
-     * 场站状态
-     */
-    private boolean type;
-    /**
-     * 场站ID
-     */
-    private String stationId;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isType() {
-        return type;
-    }
-
-    public void setType(boolean type) {
-        this.type = type;
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/WindSpeedTrendInfo.java

@@ -1,88 +0,0 @@
-package com.gyee.neic_service.model;
-
-import com.gyee.neic_service.dao.windturbine.PointData;
-import com.gyee.neic_service.model.enums.UniformCode;
-import com.gyee.neic_service.model.enums.UniformCodeWrite;
-import com.gyee.neic_service.model.station.TagInfo;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 风速趋势信息
- */
-public class WindSpeedTrendInfo {
-    /**
-     * 风机ID
-     */
-    private String id;
-
-    /**
-     * 5分钟平均风速
-     */
-    @UniformCode("${uniform_code.wind_turbine.average_wind_speed5:YDPJFS5M}")
-    private TagInfo averageWindSpeed5;
-
-    /**
-     * 风速趋势
-     */
-    @UniformCodeWrite("${uniform_code.wind_turbine.wind_speed_trend:FSQS}")
-    private TagInfo windSpeedTrend;
-
-    /**
-     * 数据
-     */
-    private List<PointData> pointData;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public TagInfo getAverageWindSpeed5() {
-        return averageWindSpeed5;
-    }
-
-    public void setAverageWindSpeed5(TagInfo averageWindSpeed5) {
-        this.averageWindSpeed5 = averageWindSpeed5;
-    }
-
-    public TagInfo getWindSpeedTrend() {
-        if (windSpeedTrend == null) {
-            windSpeedTrend = new TagInfo();
-        }
-        return windSpeedTrend;
-    }
-
-    public void setWindSpeedTrend(TagInfo windSpeedTrend) {
-        this.windSpeedTrend = windSpeedTrend;
-    }
-
-    public List<PointData> getPointData() {
-        return pointData;
-    }
-
-    public void setPointData(List<PointData> pointData) {
-        this.pointData = pointData;
-    }
-
-    public void initWindSpeed(long time) {
-        if (pointData == null || pointData.size() == 0) {
-            return;
-        }
-        if (averageWindSpeed5.getTimestamp() == pointData.get(pointData.size() - 1).getTs()) {
-            return;
-        }
-        // 10分钟
-        long tm = time - 300000;
-        List<PointData> collect = pointData.stream().filter(p -> p.getTs() < tm).collect(Collectors.toList());
-        pointData.removeAll(collect);
-        PointData pd = new PointData();
-        pd.setDoubleValue(averageWindSpeed5.getValue());
-        pd.setTs(averageWindSpeed5.getTimestamp());
-        pointData.add(pd);
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/WindturbineInfo.java

@@ -1,531 +0,0 @@
-package com.gyee.neic_service.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.gyee.neic_service.model.enums.UniformCode;
-import com.gyee.neic_service.model.station.TagInfo;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 风机
- */
-public class WindturbineInfo implements Serializable {
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * Code
-     */
-    private String code;
-    /**
-     * 型号
-     */
-    private String modelId;
-    /**
-     * 风机期次信息
-     */
-    private String projectId;
-    /**
-     * 场站信息
-     */
-    private String stationId;
-    /**
-     * 场站名称
-     */
-    private String stationName;
-    /**
-     * 线路信息
-     */
-    private String lineId;
-    /**
-     * 最小切入风速
-     */
-    private double minimumWindSpeed = 3.5;
-    /**
-     * 装机容量
-     */
-    private double powerProduction;
-    /**
-     * 编号
-     */
-    private int index;
-    /**
-     * 状态
-     */
-    @UniformCode("${windturbine.status:FJZT8}")
-    private TagInfo status;
-    /**
-     * 转速
-     */
-    @UniformCode("AI128")
-    private TagInfo rollSpeed;
-    /**
-     * 功率
-     */
-    @UniformCode("AI130")
-    private TagInfo power;
-    /**
-     * 风速
-     */
-    @UniformCode("AI022")
-    private TagInfo windSpeed;
-    /**
-     * 挂牌类型
-     */
-    @UniformCode("${windturbine.lock_type:XDSL}")
-    private TagInfo lockType;
-    /**
-     * 理论功率
-     */
-    @UniformCode("LLGL")
-    private TagInfo theoreticalPower;
-    /**
-     * 5分钟平均风速
-     */
-    @UniformCode("YDPJFS5M")
-    private TagInfo averageWindSpeed5;
-    /**
-     * 故障状态
-     */
-    @UniformCode("GZZT")
-    private TagInfo faultStatus;
-    /**
-     * 资源等级
-     */
-    @UniformCode("ZYZS")
-    private TagInfo resourceLevel;
-
-    /**
-     * 是否为紧急报警
-     */
-    private boolean isEmergencyAlarm = false;
-    /**
-     * 风机评分
-     */
-    @UniformCode("JKZS")
-    private TagInfo score;
-    /**
-     * 欠发状态
-     */
-    @UniformCode("${windturbine.undelivered:RSSQFZT}")
-    private TagInfo undeliveredStatus;
-
-    /**
-     * 解缆状态
-     */
-    @UniformCode("${windturbine.unhooking:DI012}")
-    private TagInfo unhooking;
-    /**
-     * 欠发状态
-     */
-    @UniformCode("${windturbine.wind_trends:FSQS}")
-    private TagInfo windTrends;
-
-    /**
-     * 是否状态异常（故障状态为true，但是风速可启动）
-     */
-    private boolean abnormalState;
-
-
-    public String getId() {
-        return id;
-    }
-
-    public String getWindturbineId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-        if (id == null) {
-            return;
-        }
-        final String[] ss = id.split("_");
-        if (ss.length != 2) {
-            return;
-        }
-        try {
-            index = Integer.valueOf(ss[1]);
-        } catch (Exception e) {
-        }
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public String getModelId() {
-        return modelId;
-    }
-
-    public void setModelId(String modelId) {
-        this.modelId = modelId;
-    }
-
-    public double getStatus() {
-        if (this.status == null) {
-            this.status = new TagInfo();
-        }
-        return status.getValue();
-    }
-
-    public TagInfo getStatusInfo() {
-        if (this.status == null) {
-            this.status = new TagInfo();
-        }
-        return this.status;
-    }
-
-    public void setStatus(double status) {
-        if (this.status == null) {
-            this.status = new TagInfo();
-        }
-        this.status.setValue(status);
-    }
-
-    /**
-     * 状态时间
-     *
-     * @return
-     */
-    public long getTs() {
-
-        if (this.status == null) {
-            this.status = new TagInfo();
-        }
-        return status.getTimestamp();
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public double getRollSpeed() {
-        if (this.rollSpeed == null) {
-            this.rollSpeed = new TagInfo();
-        }
-        return rollSpeed.getValue();
-    }
-
-    public void setRollSpeed(double rollSpeed) {
-        if (this.rollSpeed == null) {
-            this.rollSpeed = new TagInfo();
-        }
-        this.rollSpeed.setValue(rollSpeed);
-    }
-
-    public double getPower() {
-        if (this.power == null) {
-            this.power = new TagInfo();
-        }
-        return power.getValue();
-    }
-
-    public void setPower(double power) {
-        if (this.power == null) {
-            this.power = new TagInfo();
-        }
-        this.power.setValue(power);
-    }
-
-    public double getWindSpeed() {
-        if (this.windSpeed == null) {
-            this.windSpeed = new TagInfo();
-        }
-        return windSpeed.getValue();
-    }
-
-    public void setWindSpeed(double windSpeed) {
-        if (this.windSpeed == null) {
-            this.windSpeed = new TagInfo();
-        }
-        this.windSpeed.setValue(windSpeed);
-    }
-
-    /**
-     * 获取风速标签
-     */
-    @JsonIgnore
-    public String getWindSpeedTag() {
-        if (this.windSpeed == null) {
-            this.windSpeed = new TagInfo();
-        }
-        return windSpeed.getTag();
-    }
-
-    public void setStatusTag(String tag) {
-        if (status == null) {
-            status = new TagInfo();
-        }
-        this.status.setTag(tag);
-    }
-
-    public void setRollSpeedTag(String tag) {
-        if (rollSpeed == null) {
-            rollSpeed = new TagInfo();
-        }
-        this.rollSpeed.setTag(tag);
-    }
-
-    public void setPowerTag(String tag) {
-        if (power == null) {
-            power = new TagInfo();
-        }
-        this.power.setTag(tag);
-    }
-
-    public void setWindSpeedTag(String tag) {
-        if (windSpeed == null) {
-            windSpeed = new TagInfo();
-        }
-        this.windSpeed.setTag(tag);
-    }
-
-    public double getLockType() {
-        if (this.lockType == null) {
-            this.lockType = new TagInfo();
-        }
-        return lockType.getValue();
-    }
-
-    public double getLockValue() {
-        return getLockType();
-    }
-
-    public void setLockType(double lockType) {
-        if (this.lockType == null) {
-            this.lockType = new TagInfo();
-        }
-        this.lockType.setValue(lockType);
-    }
-
-    public void setLockTypeTag(String tag) {
-        if (lockType == null) {
-            lockType = new TagInfo();
-        }
-        this.lockType.setTag(tag);
-    }
-
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
-    }
-
-    public double getTheoreticalPower() {
-        if (theoreticalPower == null) {
-            theoreticalPower = new TagInfo();
-        }
-        return theoreticalPower.getValue();
-    }
-
-    public void setTheoreticalPower(double theoreticalPower) {
-        if (this.theoreticalPower == null) {
-            this.theoreticalPower = new TagInfo();
-        }
-        this.theoreticalPower.setValue(theoreticalPower);
-    }
-
-    public double getMinimumWindSpeed() {
-        if (minimumWindSpeed < 3) {
-            return 3.5;
-        }
-        return minimumWindSpeed;
-    }
-
-    public void setMinimumWindSpeed(double minimumWindSpeed) {
-        this.minimumWindSpeed = minimumWindSpeed;
-    }
-
-    public double getAverageWindSpeed5() {
-        if (averageWindSpeed5 == null) {
-            averageWindSpeed5 = new TagInfo();
-        }
-        return averageWindSpeed5.getValue();
-    }
-
-    public void setAverageWindSpeed5(double averageWindSpeed5) {
-        if (this.averageWindSpeed5 == null) {
-            this.averageWindSpeed5 = new TagInfo();
-        }
-        this.averageWindSpeed5.setValue(averageWindSpeed5);
-    }
-
-    @JsonIgnore
-    public String getAverageWindSpeed5Tag() {
-        if (averageWindSpeed5 == null) {
-            averageWindSpeed5 = new TagInfo();
-        }
-        return averageWindSpeed5.getTag();
-    }
-
-    public boolean getFaultStatus() {
-        if (faultStatus == null) {
-            faultStatus = new TagInfo(1);
-        }
-        return faultStatus.getValue() == 1;
-    }
-
-    public void setFaultStatus(boolean faultStatus) {
-        if (this.faultStatus == null) {
-            this.faultStatus = new TagInfo();
-        }
-        this.faultStatus.setValue(faultStatus ? 1 : 0);
-    }
-
-    public double getResourceLevel() {
-        if (this.resourceLevel == null) {
-            this.resourceLevel = new TagInfo();
-        }
-        return resourceLevel.getValue();
-    }
-
-    public void setResourceLevel(double resourceLevel) {
-        if (this.resourceLevel == null) {
-            this.resourceLevel = new TagInfo();
-        }
-        this.resourceLevel.setValue(resourceLevel);
-    }
-
-    /**
-     * 获取风机潜力
-     */
-    public double getPotential() {
-        double potential = theoreticalPower.getValue() - power.getValue();
-        potential = potential < 0 ? 0 : potential;
-        return potential;
-    }
-
-    /**
-     * 获取风能利用率
-     *
-     * @return 风能利用率
-     */
-    public double getWindEnergyUtilisation() {
-        return getPower() / getTheoreticalPower();
-    }
-
-    public boolean isEmergencyAlarm() {
-        return isEmergencyAlarm;
-    }
-
-    public void setEmergencyAlarm(boolean emergencyAlarm) {
-        isEmergencyAlarm = emergencyAlarm;
-    }
-
-    public double getScore() {
-        if (this.score == null) {
-            this.score = new TagInfo();
-        }
-        return score.getValue();
-    }
-
-    public void setScore(double score) {
-        if (this.score == null) {
-            this.score = new TagInfo();
-        }
-        this.score.setValue(score);
-    }
-
-    public String getLineId() {
-        return lineId;
-    }
-
-    public void setLineId(String lineId) {
-        this.lineId = lineId;
-    }
-
-    @JsonIgnore
-    public String getLockTypeTag() {
-        if (this.lockType == null) {
-            this.lockType = new TagInfo();
-        }
-        return this.lockType.getTag();
-    }
-
-    @JsonIgnore
-    public String getStatusTag() {
-        if (this.status == null) {
-            this.status = new TagInfo();
-        }
-        return this.status.getTag();
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public double getPowerProduction() {
-        return powerProduction;
-    }
-
-    public void setPowerProduction(double powerProduction) {
-        this.powerProduction = powerProduction;
-    }
-
-    public boolean getAbnormalState() {
-        return abnormalState;
-    }
-
-    public void setAbnormalState(boolean abnormalState) {
-        this.abnormalState = abnormalState;
-    }
-
-    public double getUndeliveredStatus() {
-        if (this.undeliveredStatus == null) {
-            this.undeliveredStatus = new TagInfo();
-        }
-        return undeliveredStatus.getValue();
-    }
-
-    public void setUndeliveredStatus(double undeliveredStatus) {
-        if (this.undeliveredStatus == null) {
-            this.undeliveredStatus = new TagInfo();
-        }
-        this.undeliveredStatus.setValue(undeliveredStatus);
-    }
-
-    public TagInfo getUnhooking() {
-        if (unhooking == null) {
-            unhooking = new TagInfo();
-        }
-        return unhooking;
-    }
-
-    public void setUnhooking(TagInfo unhooking) {
-        this.unhooking = unhooking;
-    }
-
-    public TagInfo getWindTrends() {
-        if (windTrends == null) {
-            windTrends = new TagInfo();
-        }
-        return windTrends;
-    }
-
-    public void setWindTrends(TagInfo windTrends) {
-        this.windTrends = windTrends;
-    }
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/agc/AGCInfo.java

@@ -1,59 +0,0 @@
-package com.gyee.neic_service.model.agc;
-
-import java.util.List;
-
-/**
- * AGC信息
- *
- * @author xysn
- */
-public class AGCInfo {
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * 场站名称
-     */
-    private String name;
-    /**
-     * 调度名称
-     */
-    private String schedulingName;
-    /**
-     * 标签
-     */
-    private List<Tag> tags;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getSchedulingName() {
-        return schedulingName;
-    }
-
-    public void setSchedulingName(String schedulingName) {
-        this.schedulingName = schedulingName;
-    }
-
-    public List<Tag> getTags() {
-        return tags;
-    }
-
-    public void setTags(List<Tag> tags) {
-        this.tags = tags;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/agc/Tag.java

@@ -1,57 +0,0 @@
-package com.gyee.neic_service.model.agc;
-
-/**
- * AGC标签
- *
- * @author xysn
- */
-public class Tag {
-    /**
-     * 名称
-     */
-    private String name;
-    /**
-     * 标签
-     */
-    private String tag;
-    /**
-     * 标签值
-     */
-    private String value;
-    /**
-     * 倍率
-     */
-    private double calc;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public double getCalc() {
-        return calc == 0 ? 1 : calc;
-    }
-
-    public void setCalc(double calc) {
-        this.calc = calc;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/AlarmGroupModel.java

@@ -1,26 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @descrition:
- * @author:Wanghs
- * @date:2019-10-10
- */
-@Data
-public class AlarmGroupModel {
-    private String thingId;
-    private String thingName;
-    private String alarmText;
-    private int maxRank;
-    private int agCount;
-    private Date agTime;
-
-    private List<AlertSnap> snapList;
-
-    private boolean allowReset;
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/AlertClassify.java

@@ -1,31 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-/**
- * 报警分类
- */
-public class AlertClassify {
-    /**
-     * 名称
-     */
-    private String name;
-    /**
-     * ID
-     */
-    private String id;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/AlertInfo.java

@@ -1,117 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-
-/**
- * 推荐设置报警信息
- */
-public class AlertInfo {
-    /**
-     * 场站ID
-     */
-    private String stationId;
-    /**
-     * 机型
-     */
-    private String modelId;
-    /**
-     * 统一识别码
-     */
-    private String uniformCode;
-    /**
-     * 报警内容
-     */
-    private String alertText;
-    /**
-     * 报警级别
-     */
-    private String rank;
-    /**
-     * 最后更新时间
-     */
-    private String lastUpdateTime;
-    /**
-     * 不可复位
-     */
-    private boolean notResettable;
-    /**
-     * 部件
-     */
-    private String part;
-
-    /**
-     * 是否需要停机
-     */
-    private boolean stop;
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getModelId() {
-        return modelId;
-    }
-
-    public void setModelId(String modelId) {
-        this.modelId = modelId;
-    }
-
-    public String getUniformCode() {
-        return uniformCode;
-    }
-
-    public void setUniformCode(String uniformCode) {
-        this.uniformCode = uniformCode;
-    }
-
-    public String getAlertText() {
-        return alertText;
-    }
-
-    public void setAlertText(String alertText) {
-        this.alertText = alertText;
-    }
-
-    public String getRank() {
-        return rank;
-    }
-
-    public void setRank(String rank) {
-        this.rank = rank;
-    }
-
-    public String getLastUpdateTime() {
-        return lastUpdateTime;
-    }
-
-    public void setLastUpdateTime(String lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
-    }
-
-    public boolean getNotResettable() {
-        return notResettable;
-    }
-
-    public void setNotResettable(boolean notResettable) {
-        this.notResettable = notResettable;
-    }
-
-    public String getPart() {
-        return part;
-    }
-
-    public void setPart(String part) {
-        this.part = part;
-    }
-
-    public boolean getStop() {
-        return stop;
-    }
-
-    public void setStop(boolean stop) {
-        this.stop = stop;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/AlertPartInfo.java

@@ -1,69 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import java.util.List;
-
-/**
- * 部件信息
- */
-public class AlertPartInfo {
-    /**
-     * 名称
-     */
-    private String name;
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * 是否不可复位
-     */
-    private boolean notResettable;
-    /**
-     * 是否需要停机
-     */
-    private boolean stop;
-    /**
-     * 报警
-     */
-    private List<AlertInfo> children;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public boolean isNotResettable() {
-        return notResettable;
-    }
-
-    public void setNotResettable(boolean notResettable) {
-        this.notResettable = notResettable;
-    }
-
-    public List<AlertInfo> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<AlertInfo> children) {
-        this.children = children;
-    }
-
-    public boolean getStop() {
-        return stop;
-    }
-
-    public void setStop(boolean stop) {
-        this.stop = stop;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/AlertSnap.java

@@ -1,119 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class AlertSnap implements Serializable {
-    private long id;
-    private String stationId;
-    private String projectId;
-    private String lineId;
-    private String windturbineId;
-    private int alertValue;
-    private String category1;
-    private String category2;
-    private String category3;
-    private String rank;
-    private int isOpened;
-    private Integer isConfirmed;
-    private Date confirmTime;
-    private String confirmPerson;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date lastUpdateTime;
-    private String lastUpdatePerson;
-    private String stationName;
-    private String projectName;
-    private String lineName;
-    private String windturbineName;
-    private String alertText;
-    private String modelId;
-    private String testingpointKey;
-    private String ifixPicture;
-    private String ifixTag;
-    private Date lastCloseTime;
-    private String lastClosePerson;
-    private String dataInfo;
-
-    public String getObjectId() {
-        if (category1.equals("custom")) {
-            switch (category2) {
-                case "1":
-                    return windturbineId;
-                case "2":
-                    return stationId;
-                case "3":
-                    return projectId;
-                case "4":
-                    return lineId;
-                case "5":
-                    return stationId;
-                default:
-                    return "";
-            }
-        } else if (category1.equals("FJ"))
-            return windturbineId;
-        else
-            return stationId;
-    }
-
-    public String getObjectName() {
-        if (category1.equals("custom")) {
-            switch (category2) {
-                case "1":
-                    return windturbineName;
-                case "2":
-                    return stationName;
-                case "3":
-                    return projectName;
-                case "4":
-                    return lineName;
-                case "5":
-                    return stationName;
-                default:
-                    return "未知";
-            }
-        } else if (category1.equals("windturbine") || category1.equals("FJ"))
-            return windturbineName;
-        else
-            return stationName;
-
-    }
-
-    public String getRankName() {
-
-        switch (this.rank) {
-            case "1":
-                return "低";
-            case "2":
-                return "中低";
-            case "3":
-                return "中";
-            case "4":
-                return "中高";
-            case "5":
-                return "高";
-            default:
-                return "低";
-        }
-    }
-
-    public String getCategoryName() {
-
-        switch (this.category1) {
-            case "custom":
-                return "自定义";
-            case "windturbine":
-                return "风机";
-            case "SYZ":
-                return "升压站";
-            case "GF":
-                return "光伏";
-            default:
-                return "未知";
-        }
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/DeviceFault.java

@@ -1,24 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @descrition: 故障实体
- * @author:Wanghs
- * @date:2019-10-24
- */
-@Data
-public class DeviceFault implements Serializable {
-    private String id;
-    private String code;
-    private String faultId;
-    private String name;
-    private String haltType;
-    private String cateGory;
-    private int faultLevel;
-    private String cause;
-    private String deviceModel;
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/FaultInfo.java

@@ -1,132 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @descrition:故障信息-映射VIEW_FAULTHISTORY
- * @author:Wanghs
- * @date:2019-10-09
- */
-@Data
-public class FaultInfo implements Comparable<FaultInfo> {
-
-
-    private long id;
-    private String idString;
-
-    public String getIdString() {
-        idString = String.valueOf(id);
-        return idString;
-    }
-
-    //报警时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date faultTime;
-    //对象类型
-    private int messageType;
-    //报警内容
-    private long snapID;
-    private String snapIDString;
-
-    public String getSnapIDString() {
-        snapIDString = String.valueOf(this.snapID);
-        return snapIDString;
-    }
-
-    private Integer confirmType;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date confirmTime;
-
-    private String confirmPerson;
-
-    private String stationId;
-
-    private String projectId;
-
-    private String lineId;
-
-    private String windturbineId;
-    //报警对应故障编码
-    private long alertValue;
-    //报警级别
-    private String rank;
-
-    private String category1;
-
-    private String category2;
-
-    private String category3;
-
-    private boolean isOpened;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date lastUpdateTime;
-
-    private String lastUpdatePerson;
-
-    private String stationName;
-
-    private String projectName;
-
-    private String lineName;
-
-    private String windturbineName;
-
-    private String alertText;
-
-    private String modelId;
-
-    //是否允许复位
-    private boolean isAllowReset = false;
-
-    public String getObjectName() {
-        if (category1.equals("FJ"))
-            return windturbineName;
-        else
-            return stationName;
-    }
-
-    public String getObjectId() {
-        if (category1.equals("FJ"))
-            return windturbineId;
-        else
-            return stationId;
-    }
-
-    public String getCategoryName() {
-        switch (category1) {
-            case "FJ":
-                return "风机";
-            case "SYZ":
-                return "升压站";
-            default:
-                return "未知";
-        }
-    }
-
-    public String getMessageTypeString() {
-        String resultString = "";
-        if (messageType == 1) {
-            resultString = "触发";
-        } else if (messageType == 2) {
-            resultString = "";
-        } else if (messageType == 3) {
-            resultString = "解除";
-        }
-        return resultString;
-    }
-
-    @Override
-    public int compareTo(FaultInfo info) {
-
-        if (info.getFaultTime().getTime() > this.faultTime.getTime()) {
-            return 1;
-        } else if (info.getFaultTime().getTime() < this.faultTime.getTime()) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/FaultInfoModel.java

@@ -1,31 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @descrition: 故障列表信息  28条 推送至客户端  miniForm,bigForm
- * @author:Wanghs
- * @date:2019-10-09
- */
-@Data
-public class FaultInfoModel {
-
-
-    private FaultInfo faultInfo;
-
-    private boolean allowRest;
-
-    private String thingId;
-
-    private String thingName;
-
-    private Date alertTime;
-
-    private String alertText;
-
-    private int agCount;
-
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/OverhaulInfo.java

@@ -1,45 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-/**
- * 检修信息
- *
- * @author xysn
- */
-public class OverhaulInfo {
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * 风机ID
-     */
-    private String windturbineId;
-    /**
-     * 风场ID
-     */
-    private String windpowerStationId;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getWindturbineId() {
-        return windturbineId;
-    }
-
-    public void setWindturbineId(String windturbineId) {
-        this.windturbineId = windturbineId;
-    }
-
-    public String getWindpowerStationId() {
-        return windpowerStationId;
-    }
-
-    public void setWindpowerStationId(String windpowerStationId) {
-        this.windpowerStationId = windpowerStationId;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/alarm/Warning.java

@@ -1,30 +0,0 @@
-package com.gyee.neic_service.model.alarm;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class Warning implements Serializable {
-
-    private static final long serialVersionUID = -3888921205274103285L;
-    private String id;
-    private String levelId;
-    private String manuFactureRcode;
-    private String englishText;
-    private String chineseText;
-    private String parentId;
-    private Integer isLeaf;
-    private Integer sequenceNumber;
-    private String characterIstic;
-    private String modelId;
-    private String codeName;
-    private Integer ednaValue;
-    private Integer display;
-    private String warningClassifyId;
-    private Double standardTime;
-    private Integer isReset;
-    private String warningTypeId;
-    private String faultCode;
-
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/annotations/SettingChanged.java

@@ -1,12 +0,0 @@
-package com.gyee.neic_service.model.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SettingChanged {
-    String value() default "";
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/annotations/VoiceControl.java

@@ -1,17 +0,0 @@
-package com.gyee.neic_service.model.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 语音控制注解
- *
- * @author xysn
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface VoiceControl {
-    String value() default "";
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/boost_station/BoostStation.java

@@ -1,441 +0,0 @@
-package com.gyee.neic_service.model.boost_station;
-
-import com.gyee.neic_service.dao.entity.Line;
-import com.gyee.neic_service.model.WindturbineInfo;
-import com.gyee.neic_service.model.station.TagInfo;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 升压站
- *
- * @author xysn
- */
-public class BoostStation {
-    /**
-     * 升压站ID
-     */
-    private String id;
-    /**
-     * 升压站名称
-     */
-    private String name;
-    /**
-     * 场站ID
-     */
-    private String stationId;
-    /**
-     * 场站名称
-     */
-    private String stationName;
-    /**
-     * 有功设定
-     */
-    private TagInfo powerSet;
-    /**
-     * 有功设定倍率
-     */
-    private double powerSetMultiplier = 1;
-    /**
-     * 实发有功
-     */
-    private TagInfo actualPower;
-    /**
-     * 实发有功倍率
-     */
-    private double actualPowerMultiplier = 1;
-    /**
-     * 理论功率
-     */
-    private TagInfo theoryPower;
-    /**
-     * 理论功率倍率
-     */
-    private double theoryPowerMultiplier;
-    /**
-     * 升压站所拥有的期次
-     */
-    private List<WindturbineProject> projects;
-    /**
-     * 压站所拥有的期次map
-     */
-    private Map<String, WindturbineProject> projectMap;
-    /**
-     * 升压站所拥有的风机
-     */
-    private List<WindturbineInfo> windturbines;
-    /**
-     * 限电停机的时间
-     */
-    private long stopTime;
-    /**
-     * 是否限电
-     */
-    private TagInfo electricityRestrictions;
-    /**
-     * 样板风机（不推荐停机）
-     */
-    private HashSet<String> templateWindturbine;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(String stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public List<WindturbineProject> getProjects() {
-        if (projects == null) {
-            projects = new ArrayList<>();
-        }
-        return projects;
-    }
-
-    public void setProjects(List<WindturbineProject> projects) {
-        this.projects = projects;
-    }
-
-    public List<WindturbineInfo> getWindturbines() {
-        if (windturbines == null) {
-            windturbines = new ArrayList<>();
-        }
-        return windturbines;
-    }
-
-    public void setWindturbines(List<WindturbineInfo> windturbines) {
-        this.windturbines = windturbines;
-    }
-
-    public double getPowerSet() {
-        if (powerSet == null) {
-            powerSet = new TagInfo();
-        }
-        return powerSet.getValue() * powerSetMultiplier;
-    }
-
-    public void setPowerSet(double ps) {
-        if (powerSet == null) {
-            powerSet = new TagInfo();
-        }
-        this.powerSet.setValue(ps);
-    }
-
-    public double getPowerSetMultiplier() {
-        return powerSetMultiplier;
-    }
-
-    public void setPowerSetMultiplier(double powerSetMultiplier) {
-        this.powerSetMultiplier = powerSetMultiplier;
-    }
-
-    public double getActualPower() {
-        if (actualPower == null) {
-            actualPower = new TagInfo();
-        }
-        return actualPower.getValue() * actualPowerMultiplier;
-    }
-
-    public void setActualPower(double ap) {
-        if (actualPower == null) {
-            actualPower = new TagInfo();
-        }
-        this.actualPower.setValue(ap);
-    }
-
-    public double getActualPowerMultiplier() {
-        return actualPowerMultiplier;
-    }
-
-    public void setActualPowerMultiplier(double actualPowerMultiplier) {
-        this.actualPowerMultiplier = actualPowerMultiplier;
-    }
-
-    public double getTheoryPowerMultiplier() {
-        return theoryPowerMultiplier;
-    }
-
-    public void setTheoryPowerMultiplier(double theoryPowerMultiplier) {
-        this.theoryPowerMultiplier = theoryPowerMultiplier;
-    }
-
-    public double getTheoryPower() {
-        if (this.theoryPower == null) {
-            this.theoryPower = new TagInfo();
-        }
-        return theoryPower.getValue() * theoryPowerMultiplier;
-    }
-
-    public void setTheoryPower(double theoryPower) {
-        if (this.theoryPower == null) {
-            this.theoryPower = new TagInfo();
-        }
-        this.theoryPower.setValue(theoryPower);
-    }
-
-    public void setTheoryPowerTag(String tag) {
-        if (this.theoryPower == null) {
-            this.theoryPower = new TagInfo();
-        }
-        theoryPower.setTag(tag);
-    }
-
-    public void setPowerSetTag(String tag) {
-        if (powerSet == null) {
-            powerSet = new TagInfo();
-        }
-        powerSet.setTag(tag);
-    }
-
-    public void setActualPowerTag(String tag) {
-        if (actualPower == null) {
-            actualPower = new TagInfo();
-        }
-        actualPower.setTag(tag);
-    }
-
-    public HashSet<String> getTemplateWindturbine() {
-        if (templateWindturbine == null) {
-            templateWindturbine = new HashSet<>();
-        }
-        return templateWindturbine;
-    }
-
-    public void setTemplateWindturbine(HashSet<String> templateWindturbine) {
-        this.templateWindturbine = templateWindturbine;
-    }
-
-    public boolean getElectricityRestrictions() {
-        if (electricityRestrictions == null) {
-            electricityRestrictions = new TagInfo();
-        }
-        return electricityRestrictions.getValue() == 1;
-    }
-
-    public void setElectricityRestrictions(boolean electricityRestrictions) {
-        if (this.electricityRestrictions == null) {
-            this.electricityRestrictions = new TagInfo();
-        }
-        this.electricityRestrictions.setValue(electricityRestrictions ? 1 : 0);
-    }
-
-    public void setElectricityRestrictionsTag(String tag) {
-        if (this.electricityRestrictions == null) {
-            this.electricityRestrictions = new TagInfo();
-        }
-        this.electricityRestrictions.setTag(tag);
-    }
-
-    public long getStopTime() {
-        return stopTime;
-    }
-
-    public void setStopTime(long stopTime) {
-        this.stopTime = stopTime;
-    }
-
-    /**
-     * 是否有剩余AGC空间
-     */
-    public boolean isHaveSpace() {
-        // 偏差值
-        double ps = getPowerSet();
-        double ap = getActualPower();
-        double deviationRate = (ps - ap) / ps;
-        return deviationRate >= 0.03;
-
-        //return getPowerSet() - getActualPower() >= 2;
-    }
-
-    /**
-     * 获取曲线偏差率
-     *
-     * @return
-     */
-    public double getDeviationRate() {
-        return (getPowerSet() - getActualPower()) / getPowerSet();
-    }
-
-    /**
-     * 获取理论功率
-     */
-    public double getTheoreticalPower() {
-        return windturbines.stream().map(WindturbineInfo::getTheoreticalPower).reduce(Double::sum).get();
-    }
-
-    /**
-     * 升压站是否限电
-     *
-     * @return 是否限电
-     */
-    public boolean isElectricityRestrictions() {
-        try {
-            // 场站潜力
-            double potential = getPowerSet() - getActualPower();
-            // 并网风机潜力
-            double gp = getOnlineWindturbinePotential();
-            return potential < 3 && gp > 6;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    /**
-     * 是否是样板风机
-     *
-     * @param wi 风机信息
-     * @return 是否是样板风机
-     */
-    public boolean isTemplateWindturbine(WindturbineInfo wi) {
-        return templateWindturbine != null && templateWindturbine.contains(wi.getId());
-    }
-
-    /**
-     * 获取升压站名称
-     */
-    public static String getBoostStationName(String bsid) {
-        return null;
-    }
-
-    /**
-     * 获取当前并网的风机
-     *
-     * @return
-     */
-    public List<WindturbineInfo> getOnlineWindturbineOrderByScore() {
-        return getWindturbines().stream().filter(w -> w.getStatus() == 4).sorted(Comparator.comparing(WindturbineInfo::getScore)).collect(Collectors.toList());
-    }
-
-    /**
-     * 获取当前并网并且不是样板风机的风机
-     *
-     * @return
-     */
-    public List<WindturbineInfo> getOnlineWindturbineNoTemplateNoLockOrderByScore() {
-        return getWindturbines().stream().filter(w -> w.getStatus() == 4 && w.getLockType() == 0 && !this.isTemplateWindturbine(w)).sorted(Comparator.comparing(WindturbineInfo::getScore)).collect(Collectors.toList());
-    }
-
-    /**
-     * 获取并网风机潜力
-     *
-     * @return
-     */
-    public double getOnlineWindturbinePotential() {
-        // 并网风机功率
-        Optional<Double> p = getWindturbines().stream().filter(w -> w.getStatus() == 4).map(WindturbineInfo::getPower).reduce(Double::sum);
-        if (!p.isPresent()) {
-            return 0;
-        }
-        double power = p.get();
-        // 并网风机理论功率
-        Optional<Double> t = getWindturbines().stream().filter(w -> w.getStatus() == 4).map(WindturbineInfo::getTheoreticalPower).reduce(Double::sum);
-        if (!t.isPresent()) {
-            return 0;
-        }
-        double tp = t.get();
-        // 并网风机潜力
-        double gp = (tp - power) / 1000;
-        return gp;
-    }
-
-    /**
-     * 是否需要维护
-     *
-     * @return
-     */
-    public boolean isCanMaintain() {
-        return getMaintainPercentage() >= 0.3;
-    }
-
-    /**
-     * 获取需要打维护风机比例
-     *
-     * @return
-     */
-    public double getMaintainPercentage() {
-        long l = getWindturbines().stream().filter(w -> w.getAverageWindSpeed5() <= 2.75).count();
-        int count = getWindturbines().size();
-        double d = (double) l / count;
-        return d;
-    }
-
-    /**
-     * 场站风机是否可以启动
-     *
-     * @return
-     */
-    public boolean getIsCanStart() {
-        try {
-            // 并网风机理论功率
-            double tp = 0;
-            List<WindturbineInfo> ls = getWindturbines().stream().filter(w -> w.getStatus() == 4).collect(Collectors.toList());
-            for (WindturbineInfo wi : ls) {
-                tp += wi.getTheoreticalPower();
-            }
-            tp /= 1000;
-            return tp - getPowerSet() < 0;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public Map<String, WindturbineProject> getProjectMap() {
-        if (projectMap == null || projectMap.size() < 1) {
-            projectMap = projects.stream().collect(Collectors.toMap(WindturbineProject::getId, wp -> wp));
-        }
-        return projectMap;
-    }
-
-    /**
-     * 添加风机
-     *
-     * @param wi 风机
-     * @return 如果风机是这个升压站的，则添加并返回true，否则返回false，不添加
-     */
-    public boolean addWindturbine(WindturbineInfo wi) {
-        getWindturbines().add(wi);
-        if (getProjectMap().containsKey(wi.getProjectId())) {
-            getProjectMap().get(wi.getProjectId()).addWindturbine(wi);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * 初始化线路信息
-     *
-     * @param ls 线路信息
-     */
-    public void initLineInfo(List<Line> ls) {
-        for (WindturbineProject wp : getProjects()) {
-            wp.initLineInfo(ls);
-        }
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/boost_station/BoostStationInfo.java

@@ -1,176 +0,0 @@
-package com.gyee.neic_service.model.boost_station;
-
-import java.util.HashSet;
-
-/**
- * 场站信息
- *
- * @author xysn
- */
-public class BoostStationInfo {
-    /**
-     * 名称
-     */
-    private String id;
-    /**
-     * 名称
-     */
-    private String name;
-    /**
-     * 期次
-     */
-    private String period;
-    /**
-     * 场站Id
-     */
-    private String station;
-    /**
-     * 场站名称
-     */
-    private String stationName;
-    /**
-     * 有功设定限值
-     */
-    private String powerSet;
-    /**
-     * 有功设定限值倍率
-     */
-    private double powerSetMultiplier;
-    /**
-     * 实发有功
-     */
-    private String actualPower;
-    /**
-     * 实发有功倍率
-     */
-    private double actualPowerMultiplier;
-    /**
-     * 理论功率
-     */
-    private String theoryPower;
-    /**
-     * 理论功率倍率
-     */
-    private double theoryPowerMultiplier;
-    /**
-     * 是否限电
-     */
-    private String isElectricityRestrictions;
-
-    /**
-     * 样板风机（不推荐停机）
-     */
-    private HashSet<String> templateWindturbine;
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(String period) {
-        this.period = period;
-    }
-
-    public String getStation() {
-        return station;
-    }
-
-    public void setStation(String station) {
-        this.station = station;
-    }
-
-    public String getStationName() {
-        return stationName;
-    }
-
-    public void setStationName(String stationName) {
-        this.stationName = stationName;
-    }
-
-    public String[] getPeriods() {
-        if (period == null) {
-            return new String[0];
-        }
-        return period.split(",");
-    }
-
-    public String getPowerSet() {
-        return powerSet;
-    }
-
-    public void setPowerSet(String powerSet) {
-        this.powerSet = powerSet;
-    }
-
-    public String getActualPower() {
-        return actualPower;
-    }
-
-    public void setActualPower(String actualPower) {
-        this.actualPower = actualPower;
-    }
-
-    public String getTheoryPower() {
-        return theoryPower;
-    }
-
-    public void setTheoryPower(String theoryPower) {
-        this.theoryPower = theoryPower;
-    }
-
-    public double getPowerSetMultiplier() {
-        return powerSetMultiplier;
-    }
-
-    public void setPowerSetMultiplier(double powerSetMultiplier) {
-        this.powerSetMultiplier = powerSetMultiplier;
-    }
-
-    public double getActualPowerMultiplier() {
-        return actualPowerMultiplier;
-    }
-
-    public void setActualPowerMultiplier(double actualPowerMultiplier) {
-        this.actualPowerMultiplier = actualPowerMultiplier;
-    }
-
-    public double getTheoryPowerMultiplier() {
-        return theoryPowerMultiplier;
-    }
-
-    public void setTheoryPowerMultiplier(double theoryPowerMultiplier) {
-        this.theoryPowerMultiplier = theoryPowerMultiplier;
-    }
-
-    public HashSet<String> getTemplateWindturbine() {
-        return templateWindturbine;
-    }
-
-    public void setTemplateWindturbine(HashSet<String> templateWindturbine) {
-        this.templateWindturbine = templateWindturbine;
-    }
-
-    public String getIsElectricityRestrictions() {
-        return isElectricityRestrictions;
-    }
-
-    public void setIsElectricityRestrictions(String isElectricityRestrictions) {
-        this.isElectricityRestrictions = isElectricityRestrictions;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/boost_station/LineInfo.java

@@ -1,57 +0,0 @@
-package com.gyee.neic_service.model.boost_station;
-
-import com.gyee.neic_service.model.WindturbineInfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 线路信息
- *
- * @author xysn
- */
-public class LineInfo {
-    /**
-     * ID
-     */
-    private String id;
-    /**
-     * 线路名称
-     */
-    private String name;
-    /**
-     * 线路所拥有的风机
-     */
-    private List<WindturbineInfo> windturbineInfos;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<WindturbineInfo> getWindturbineInfos() {
-        if (windturbineInfos == null) {
-            windturbineInfos = new ArrayList<>();
-        }
-        return windturbineInfos;
-    }
-
-    public void setWindturbineInfos(List<WindturbineInfo> windturbineInfos) {
-        this.windturbineInfos = windturbineInfos;
-    }
-
-    public void addWindturbine(WindturbineInfo wi) {
-        getWindturbineInfos().add(wi);
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/boost_station/WindStation.java

@@ -1,333 +0,0 @@
-package com.gyee.neic_service.model.boost_station;
-
-import com.gyee.neic_service.model.WindturbineInfo;
-import com.gyee.neic_service.model.enums.UniformCode;
-import com.gyee.neic_service.model.enums.WindSpeedTrend;
-import com.gyee.neic_service.model.station.TagInfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 风电场
- *
- * @author xysn
- */
-public class WindStation {
-    /**
-     * 场站ID
-     */
-    private String id;
-    /**
-     * 场站名称
-     */
-    private String name;
-
-    /**
-     * 15分钟风功率预测
-     */
-    @UniformCode("${uniform_code.station.wind_power_forecast15:FCFGCDQ0001}")
-    private TagInfo windPowerForecast15;
-
-    /**
-     * 30分钟风功率预测
-     */
-    @UniformCode("${uniform_code.station.wind_power_forecast30:FCFGCDQ0002}")
-    private TagInfo windPowerForecast30;
-
-    /**
-     * 场站实时功率
-     */
-    @UniformCode("${uniform_code.station.real_time_power:SSZGL}")
-    private TagInfo realTimePower;
-    /**
-     * 日发电量
-     */
-    @UniformCode("RFDLB")
-    private TagInfo dailyPowerGeneration;
-    /**
-     * 理论日发电量
-     */
-    @UniformCode("RFDLC")
-    private TagInfo theoreticalPowerGeneration;
-    /**
-     * 场用电量
-     */
-    @UniformCode("CYDLB")
-    private TagInfo fieldElectricity;
-
-    /**
-     * 限电损失电量
-     */
-    @UniformCode("RXDSSDL")
-    private TagInfo powerLossRestrictions;
-    /**
-     * 故障损失电量
-     */
-    @UniformCode("RGZSSDL")
-    private TagInfo powerLossFault;
-    /**
-     * 检修损失电量
-     */
-    @UniformCode("RJXSSDL")
-    private TagInfo powerLossInspection;
-    /**
-     * 受累损失电量
-     */
-    @UniformCode("RWZSSDL")
-    private TagInfo powerLossBurden;
-    /**
-     * 性能损失电量
-     */
-    @UniformCode("RXNSSDL")
-    private TagInfo powerLossPerformance;
-
-    /**
-     * 场站风速趋势
-     */
-    private WindSpeedTrend windSpeedTrend;
-
-    /**
-     * 场站的升压站
-     */
-    private Map<String, BoostStation> boostStations;
-
-    /**
-     * 场站风机
-     */
-    private List<WindturbineInfo> windturbineInfos;
-
-    public WindStation(BoostStation bs) {
-        this.id = bs.getStationId();
-        this.name = bs.getStationName();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Map<String, BoostStation> getBoostStations() {
-        if (boostStations == null) {
-            boostStations = new HashMap<>();
-        }
-        return boostStations;
-    }
-
-    public void setBoostStations(Map<String, BoostStation> boostStations) {
-        this.boostStations = boostStations;
-    }
-
-    public List<WindturbineInfo> getWindturbineInfos() {
-        if (windturbineInfos == null) {
-            windturbineInfos = new ArrayList<>();
-        }
-        return windturbineInfos;
-    }
-
-    public void setWindturbineInfos(List<WindturbineInfo> windturbineInfos) {
-        this.windturbineInfos = windturbineInfos;
-    }
-
-    public TagInfo getWindPowerForecast15() {
-        return windPowerForecast15;
-    }
-
-    public void setWindPowerForecast15(TagInfo windPowerForecast15) {
-        this.windPowerForecast15 = windPowerForecast15;
-    }
-
-    public TagInfo getWindPowerForecast30() {
-        return windPowerForecast30;
-    }
-
-    public void setWindPowerForecast30(TagInfo windPowerForecast30) {
-        this.windPowerForecast30 = windPowerForecast30;
-    }
-
-    public TagInfo getRealTimePower() {
-        return realTimePower;
-    }
-
-    public void setRealTimePower(TagInfo realTimePower) {
-        this.realTimePower = realTimePower;
-    }
-
-    public WindSpeedTrend getWindSpeedTrend() {
-        if (windPowerForecast15 == null || windPowerForecast30 == null) {
-            windSpeedTrend = WindSpeedTrend.fluctuation;
-            return windSpeedTrend;
-        }
-        if (windPowerForecast15.getValue() <= -1) {
-            windSpeedTrend = WindSpeedTrend.decline;
-            return windSpeedTrend;
-        }
-        if (windPowerForecast15.getValue() < 1.5) {
-            windSpeedTrend = WindSpeedTrend.fluctuation;
-            return windSpeedTrend;
-        }
-        if (windPowerForecast30.getValue() - windPowerForecast15.getValue() > windPowerForecast15.getValue() * 0.05) {
-            windSpeedTrend = WindSpeedTrend.rise;
-        } else if (windPowerForecast30.getValue() - windPowerForecast15.getValue() < realTimePower.getValue() * 0.05 * -1) {
-            windSpeedTrend = WindSpeedTrend.decline;
-        } else {
-            windSpeedTrend = WindSpeedTrend.fluctuation;
-        }
-        return windSpeedTrend;
-    }
-
-    public void setWindSpeedTrend(WindSpeedTrend windSpeedTrend) {
-        this.windSpeedTrend = windSpeedTrend;
-    }
-
-    public double getDailyPowerGeneration() {
-        if (dailyPowerGeneration == null) {
-            dailyPowerGeneration = new TagInfo();
-        }
-        return dailyPowerGeneration.getValue();
-    }
-
-    public void setDailyPowerGeneration(double dailyPowerGeneration) {
-        if (this.dailyPowerGeneration == null) {
-            this.dailyPowerGeneration = new TagInfo();
-        }
-        this.dailyPowerGeneration.setValue(dailyPowerGeneration);
-    }
-
-    public double getTheoreticalPowerGeneration() {
-        if (this.theoreticalPowerGeneration == null) {
-            this.theoreticalPowerGeneration = new TagInfo();
-        }
-        return theoreticalPowerGeneration.getValue() * 0.0001;
-    }
-
-    public void setTheoreticalPowerGeneration(double theoreticalPowerGeneration) {
-        if (this.theoreticalPowerGeneration == null) {
-            this.theoreticalPowerGeneration = new TagInfo();
-        }
-        this.theoreticalPowerGeneration.setValue(theoreticalPowerGeneration);
-    }
-
-    public double getFieldElectricity() {
-        if (this.fieldElectricity == null) {
-            this.fieldElectricity = new TagInfo();
-        }
-        return fieldElectricity.getValue();
-    }
-
-    public void setFieldElectricity(double fieldElectricity) {
-        if (this.fieldElectricity == null) {
-            this.fieldElectricity = new TagInfo();
-        }
-        this.fieldElectricity.setValue(fieldElectricity);
-    }
-
-    public double getPowerLossRestrictions() {
-        if (powerLossRestrictions == null) {
-            powerLossRestrictions = new TagInfo();
-        }
-        return powerLossRestrictions.getValue();
-    }
-
-    public void setPowerLossRestrictions(double powerLossRestrictions) {
-        if (this.powerLossRestrictions == null) {
-            this.powerLossRestrictions = new TagInfo();
-        }
-        this.powerLossRestrictions.setValue(powerLossRestrictions);
-    }
-
-    public double getPowerLossFault() {
-        if (powerLossFault == null) {
-            powerLossFault = new TagInfo();
-        }
-        return powerLossFault.getValue();
-    }
-
-    public void setPowerLossFault(double powerLossFault) {
-        if (this.powerLossFault == null) {
-            this.powerLossFault = new TagInfo();
-        }
-        this.powerLossFault.setValue(powerLossFault);
-    }
-
-    public double getPowerLossInspection() {
-        if (powerLossInspection == null) {
-            powerLossInspection = new TagInfo();
-        }
-        return powerLossInspection.getValue();
-    }
-
-    public void setPowerLossInspection(double powerLossInspection) {
-        if (this.powerLossInspection == null) {
-            this.powerLossInspection = new TagInfo();
-        }
-        this.powerLossInspection.setValue(powerLossInspection);
-    }
-
-    public double getPowerLossBurden() {
-        if (powerLossBurden == null) {
-            powerLossBurden = new TagInfo();
-        }
-        return powerLossBurden.getValue();
-    }
-
-    public void setPowerLossBurden(double powerLossBurden) {
-        if (this.powerLossBurden == null) {
-            this.powerLossBurden = new TagInfo();
-        }
-        this.powerLossBurden.setValue(powerLossBurden);
-    }
-
-    public double getPowerLossPerformance() {
-        if (powerLossPerformance == null) {
-            powerLossPerformance = new TagInfo();
-        }
-        return powerLossPerformance.getValue();
-    }
-
-    public void setPowerLossPerformance(double powerLossPerformance) {
-        if (this.powerLossPerformance == null) {
-            this.powerLossPerformance = new TagInfo();
-        }
-        this.powerLossPerformance.setValue(powerLossPerformance);
-    }
-
-    /**
-     * 添加升压站
-     *
-     * @param bs 升压站
-     */
-    public void addBoostStation(BoostStation bs) {
-        if (boostStations == null) {
-            boostStations = new HashMap<>(5);
-        }
-        boostStations.put(bs.getId(), bs);
-    }
-
-    /**
-     * 添加风机
-     *
-     * @param wi 风机信息
-     */
-    public void addWindturbine(WindturbineInfo wi) {
-        getWindturbineInfos().add(wi);
-        for (BoostStation bs : getBoostStations().values()) {
-            if (bs.addWindturbine(wi)) {
-                break;
-            }
-        }
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/boost_station/WindturbineProject.java

@@ -1,99 +0,0 @@
-package com.gyee.neic_service.model.boost_station;
-
-import com.gyee.neic_service.dao.entity.Line;
-import com.gyee.neic_service.model.WindturbineInfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 风机期次
- */
-public class WindturbineProject {
-    /**
-     * 期次名称
-     */
-    private String id;
-    /**
-     * 期次名称
-     */
-    private String name;
-
-    /**
-     * 期次线路信息
-     */
-    private Map<String, LineInfo> lineInfos;
-    /**
-     * 期次风机信息
-     */
-    private List<WindturbineInfo> windturbineInfos;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Map<String, LineInfo> getLineInfos() {
-        if (lineInfos == null) {
-            lineInfos = new HashMap<>(5);
-        }
-        return lineInfos;
-    }
-
-    public void setLineInfos(Map<String, LineInfo> lineInfos) {
-        this.lineInfos = lineInfos;
-    }
-
-    public List<WindturbineInfo> getWindturbineInfos() {
-        if (windturbineInfos == null) {
-            windturbineInfos = new ArrayList<>();
-        }
-        return windturbineInfos;
-    }
-
-    public void setWindturbineInfos(List<WindturbineInfo> windturbineInfos) {
-        this.windturbineInfos = windturbineInfos;
-    }
-
-    /**
-     * 添加风机信息
-     *
-     * @param wi 风机信息
-     */
-    public void addWindturbine(WindturbineInfo wi) {
-        getWindturbineInfos().add(wi);
-        if (getLineInfos().containsKey(wi.getLineId())) {
-            getLineInfos().get(wi.getLineId()).addWindturbine(wi);
-        }
-    }
-
-    /**
-     * 初始化线路信息
-     *
-     * @param ls
-     */
-    public void initLineInfo(List<Line> ls) {
-        Map<String, LineInfo> lis = getLineInfos();
-        List<Line> l = ls.stream().filter(ll -> ll.getProjectId().equals(this.id)).collect(Collectors.toList());
-        for (Line le : l) {
-            LineInfo li = new LineInfo();
-            li.setName(le.getName());
-            li.setId(le.getId());
-            lis.put(li.getId(), li);
-        }
-    }
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/AttentionMessageType.java

@@ -1,26 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-/**
- * 关注信息类型
- *
- * @author xysn
- */
-
-public enum AttentionMessageType {
-    /**
-     * 限电
-     */
-    ElectricityRestrictions,
-    /**
-     * 通讯中断，离线
-     */
-    Offline,
-    /**
-     * 事故
-     */
-    Accident,
-    /**
-     * 曲线跟随率低
-     */
-    LowCurveFollowingRate,
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/AttentionType.java

@@ -1,33 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-/**
- * 关注区设备类型
- *
- * @author xysn
- */
-public enum AttentionType {
-    /**
-     * 场站
-     */
-    Station,
-    /**
-     * 风机
-     */
-    WindTurbine,
-    /**
-     * 线路
-     */
-    Line,
-    /**
-     * 天气
-     */
-    Weather,
-    /**
-     * 升压站
-     */
-    BoostStation,
-    /**
-     * 期次
-     */
-    Project
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/Trends.java

@@ -1,21 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-/**
- * 数据趋势
- *
- * @author xysn
- */
-public enum Trends {
-    /**
-     * 平衡
-     */
-    Counterpoise,
-    /**
-     * 上升
-     */
-    Rise,
-    /**
-     * 下降
-     */
-    Decline,
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/UniformCode.java

@@ -1,17 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * UniformCode注解
- *
- * @author xysn
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface UniformCode {
-    String value() default "";
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/UniformCodeWrite.java

@@ -1,17 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 需要写入数据库的UniformCode注解
- *
- * @author xysn
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface UniformCodeWrite {
-    String value() default "";
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/WindSpeedTrend.java

@@ -1,19 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-/**
- * 风速趋势
- */
-public enum WindSpeedTrend {
-    /**
-     * 上升
-     */
-    rise,
-    /**
-     * 波动
-     */
-    fluctuation,
-    /**
-     * 下降
-     */
-    decline
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/enums/WindturbineStatus.java

@@ -1,25 +0,0 @@
-package com.gyee.neic_service.model.enums;
-
-/**
- * @descrition: 风机状态
- * @author:Wanghs
- * @date:2019-08-12
- */
-public enum WindturbineStatus {
-    //停机 0
-    Stop,
-    //上电 1
-    OnPower,
-    //待机 2
-    Standby,
-    //启动 3
-    Start,
-    //并网 4
-    Online,
-    //故障 5
-    Fault,
-    //维护 6
-    Maintain,
-    //离线 7
-    Offline
-}

web/runeconomy-xk/src/main/java/com/gyee/neic_service/model/overview/StationOverviewInfo.java

@@ -1,203 +0,0 @@
-package com.gyee.neic_service.model.overview;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.gyee.neic_service.model.PointInfo;
-import com.gyee.neic_service.model.boost_station.BoostStation;
-import com.gyee.neic_service.model.boost_station.WindStation;
-import com.gyee.neic_service.model.enums.UniformCode;
-import com.gyee.neic_service.model.station.TagInfo;
-
-/**
- * 场站全览信息
- *
- * @author xysn
- */
-public class StationOverviewInfo {
-    /**
-     * 实时功率
-     */
-    @UniformCode("${uniform_code.station.real_time_power:SSZGL}")
-    private TagInfo realTimePower;
-    /**
-     * 场站实时平均风速/日照强度
-     */
-    @UniformCode("${uniform_code.station.average_wind_speed:SSFS}")
-    private TagInfo averageWindSpeed;
-    /**
-     * 理论功率
-     */
-    @UniformCode("${uniform_code.station.theoretical_power:ZLLGL}")
-    private PointInfo theoreticalPower;
-
-
-    // -------注意，这里出线功率和agc有功设定上限是河北用---------
-    /**
-     * 场站出线功率
-     */
-    @UniformCode("${uniform_code.station.outlet_power:SSFS}")
-    private TagInfo outletPower;
-
-    /**
-     * 有功设定上限
-     */
-    @UniformCode("${uniform_code.station.power_set_upper_limit:SSFS}")
-    private TagInfo powerSetUpperLimit;
-
-    /**
-     * 有功设定
-     */
-    private TagInfo agcPowerSet;
-    /**
-     * 健康指数
-     */
-    @UniformCode("${uniform_code.station.health_index:JKZS}")
-    private TagInfo healthIndex;
-
-    /**
-     * 资源指数
-     */
-    @UniformCode("${uniform_code.station.resource_index:ZYZS}")
-    private TagInfo resourceIndex;
-    /**
-     * 风能利用率
-     */
-    @UniformCode("${uniform_code.station.wind_energy_rate:FNLYL}")
-    private TagInfo windEnergyRate;
-    /**
-     * 曲线跟随率
-     */
-    @UniformCode("${uniform_code.station.curve_following_rate:QXGSL}")
-    private TagInfo curveFollowingRate;
-    /**
-     * 场站信息
-     */
-    @JsonIgnore
-    private WindStation windStation;
-
-    public String getStationId() {
-        if (windStation == null) {
-            return "";
-        }
-        return windStation.getId();
-    }
-
-    public TagInfo getRealTimePower() {
-        return realTimePower;
-    }
-
-    public void setRealTimePower(TagInfo realTimePower) {
-        this.realTimePower = realTimePower;
-    }
-
-    public TagInfo getAverageWindSpeed() {
-        return averageWindSpeed;
-    }
-
-    public void setAverageWindSpeed(TagInfo averageWindSpeed) {
-        this.averageWindSpeed = averageWindSpeed;
-    }
-
-    public PointInfo getTheoreticalPower() {
-        return theoreticalPower;
-    }
-
-    public void setTheoreticalPower(PointInfo theoreticalPower) {
-        this.theoreticalPower = theoreticalPower;
-    }
-
-    @JsonIgnore
-    public WindStation getWindStation() {
-        return windStation;
-    }
-
-    public TagInfo getOutletPower() {
-        return outletPower;
-    }
-
-    public void setOutletPower(TagInfo outletPower) {
-        this.outletPower = outletPower;
-    }
-
-    public TagInfo getPowerSetUpperLimit() {
-        return powerSetUpperLimit;
-    }
-
-    public void setPowerSetUpperLimit(TagInfo powerSetUpperLimit) {
-        this.powerSetUpperLimit = powerSetUpperLimit;
-    }
-
-    /**
-     * AGC 有功设定
-     */
-    public TagInfo getAgcPowerSet() {
-        double aps = 0;
-        if (this.agcPowerSet == null) {
-            this.agcPowerSet = new TagInfo();
-        }
-        if (windStation == null) {
-            return this.agcPowerSet;
-        }
-        for (BoostStation bs : windStation.getBoostStations().values()) {
-            aps += bs.getPowerSet();
-        }
-        this.agcPowerSet.setValue(aps);
-        return this.agcPowerSet;
-    }
-
-
-    public TagInfo getHealthIndex() {
-        return healthIndex;
-    }
-
-    public void setHealthIndex(TagInfo healthIndex) {
-        this.healthIndex = healthIndex;
-    }
-
-    /**
-     * 健康指数最大值
-     */
-    public double getHealthIndexMax() {
-        if (windStation == null) {
-            return 0;
-        }
-        return windStation.getWindturbineInfos().size() * 10;
-    }
-
-    public TagInfo getResourceIndex() {
-        return resourceIndex;
-    }
-
-    public void setResourceIndex(TagInfo resourceIndex) {
-        this.resourceIndex = resourceIndex;
-    }
-
-    /**
-     * 资源指数最大值
-     */
-    public double getResourceIndexMax() {
-        if (windStation == null) {
-            return 0;
-        }
-        return windStation.getWindturbineInfos().size() * 10;
-    }
-
-    public TagInfo getWindEnergyRate() {
-        return windEnergyRate;
-    }
-
-    public void setWindEnergyRate(TagInfo windEnergyRate) {
-        this.windEnergyRate = windEnergyRate;
-    }
-
-    public TagInfo getCurveFollowingRate() {
-        return curveFollowingRate;
-    }
-
-    public void setCurveFollowingRate(TagInfo curveFollowingRate) {
-        this.curveFollowingRate = curveFollowingRate;
-    }
-
-    public void setWindStation(WindStation windStation) {
-        this.windStation = windStation;
-    }
-}