部分实体类修改1

timeseries/dao-golden/src/main/java/com/gyee/wisdom/dao/golden/GoldenDataChangeDao.java

@@ -1,12 +1,13 @@
-package com.gyee.wisdom.dao.golden;
+package com.gyee.gaia.dao.golden;
 
+import com.gyee.gaia.dao.timeseries.GoldenDao;
+import com.gyee.gaia.dao.timeseries.IDataChangeDao;
 import com.gyee.wisdom.common.data.timeseries.*;
 import com.gyee.wisdom.common.exception.WisdomException;
-import com.gyee.wisdom.dao.timeseries.GoldenDao;
-import com.gyee.wisdom.dao.timeseries.IDataChangeDao;
-import com.gyee.wisdom.dao.timeseries.ILatestDao;
-import com.rtdb.enums.Quality;
-import com.rtdb.model.*;
+import com.rtdb.model.DoubleData;
+import com.rtdb.model.Entity;
+import com.rtdb.model.IntData;
+import com.rtdb.model.MinPoint;
 import com.rtdb.service.impl.BaseImpl;
 import com.rtdb.service.impl.ServerImpl;
 import com.rtdb.service.impl.SnapshotImpl;
@@ -14,7 +15,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Component
@@ -27,13 +31,13 @@ public class GoldenDataChangeDao implements IDataChangeDao {
 
     private HashMap<String, HashMap<TsDataType, CacheData>> topicMap;
 
-    public void registerTopic(String topic, List<TsPoint> tsPoints)  {
+    public void registerTopic(String topic, List<TsPoint> tsPoints) {
         if (topicMap == null) {
             topicMap = new HashMap<>();
         }
         HashMap<TsDataType, CacheData> tsDataTypeHashMap;
         if (topicMap.containsKey(topic)) {
-            tsDataTypeHashMap =  topicMap.get(topic);
+            tsDataTypeHashMap = topicMap.get(topic);
             tsDataTypeHashMap.clear();
         } else {
             tsDataTypeHashMap = new HashMap<>();
@@ -85,7 +89,7 @@ public class GoldenDataChangeDao implements IDataChangeDao {
                     result.putAll(getLongTsDataChanges(topic, tagIds));
                 } else if (entry.getKey() == TsDataType.BOOLEAN) {
                     result.putAll(getBooleanTsDataChanges(topic, tagIds));
-                }  else {
+                } else {
                     throw new WisdomException("不支持数据类型:" + entry.getKey());
                 }
             }
@@ -93,7 +97,7 @@ public class GoldenDataChangeDao implements IDataChangeDao {
             return result;
         } catch (Exception ex) {
             log.error(ex.getMessage());
-            return  null;
+            return null;
         }
     }
 
@@ -139,7 +143,7 @@ public class GoldenDataChangeDao implements IDataChangeDao {
             CacheData cacheData = topicMap.get(topic).get(TsDataType.LONG);
             Entity<IntData> entityD = snap.getIntSnapshots(tagIds);
             Map<String, TsData> tsDataMap = new HashMap<>();
-            for (int i  = 0; i < tagIds.length; i++) {
+            for (int i = 0; i < tagIds.length; i++) {
                 if (cacheData.getData()[i] == null || cacheData.getData()[i].getDoubleValue().isPresent() == false) {
                     cacheData.getData()[i] = new GeneralTsData();
                     cacheData.getData()[i].setTs(entityD.getList().get(i).getDateTime().getTime());
@@ -155,7 +159,7 @@ public class GoldenDataChangeDao implements IDataChangeDao {
                     tsDataMap.put(cacheData.getTagNames()[i],
                             new LongTsData(entityD.getList().get(i).getDateTime().getTime(),
                                     entityD.getList().get(i).getQuality(),
-                                    (long)entityD.getList().get(i).getValue()));
+                                    (long) entityD.getList().get(i).getValue()));
                 }
             }
             return tsDataMap;

timeseries/dao-golden/src/main/java/com/gyee/wisdom/dao/golden/GoldenHistoryDao.java

@@ -1,10 +1,9 @@
-package com.gyee.wisdom.dao.golden;
+package com.gyee.gaia.dao.golden;
 
+import com.gyee.gaia.dao.timeseries.GoldenDao;
+import com.gyee.gaia.dao.timeseries.IHistoryDao;
 import com.gyee.wisdom.common.data.timeseries.*;
 import com.gyee.wisdom.common.exception.WisdomException;
-import com.gyee.wisdom.dao.timeseries.GoldenDao;
-import com.gyee.wisdom.dao.timeseries.IHistoryDao;
-import com.rtdb.api.enums.RtdbType;
 import com.rtdb.api.model.RtdbData;
 import com.rtdb.enums.RtdbHisMode;
 import com.rtdb.enums.ValueType;
@@ -12,7 +11,6 @@ import com.rtdb.model.*;
 import com.rtdb.service.impl.BaseImpl;
 import com.rtdb.service.impl.HistorianImpl;
 import com.rtdb.service.impl.ServerImpl;
-import com.rtdb.service.impl.SnapshotImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -72,12 +70,11 @@ public class GoldenHistoryDao implements IHistoryDao {
         Date endDate = new Date(tsQuery.getEndTs());
         if (tsQuery.getInterpolation() == Interpolation.RAW) {
             return his.getDoubleArchivedValues(tagId, goldenConfig.getQueryHistoryLimit(), startDate, endDate);
-        }  else if (tsQuery.getInterpolation() == Interpolation.SNAP) {
+        } else if (tsQuery.getInterpolation() == Interpolation.SNAP) {
             Date[] dateArray = tsQuery.getDateArray();
             if (dateArray != null && dateArray.length > 0) {
                 return his.getFloatTimedValues(tagId, dateArray.length, dateArray);
-            } else
-            {
+            } else {
                 throw new WisdomException("无效的查询条件！");
             }
         } else {
@@ -257,7 +254,7 @@ public class GoldenHistoryDao implements IHistoryDao {
             Date startDate = new Date(tsQuery.getStartTs());
             Date endDate = new Date(tsQuery.getEndTs());
             int count = (int) Math.ceil((tsQuery.getEndTs() - tsQuery.getStartTs()) / (tsQuery.getInterval() * 1000));
-            List<SummaryEntity> lstSum = his.getNumberSummaryInBatches(id, count, tsQuery.getInterval()*1000, startDate, endDate);
+            List<SummaryEntity> lstSum = his.getNumberSummaryInBatches(id, count, tsQuery.getInterval() * 1000, startDate, endDate);
             List<DoubleStatData> result = new ArrayList<>();
             for (SummaryEntity s : lstSum) {
                 DoubleTsData maxData = new DoubleTsData(s.getMaxValueTime().getTime(), (short) 1, s.getMaxValue());

timeseries/dao-golden/src/main/java/com/gyee/wisdom/dao/golden/GoldenLatestDao.java

@@ -1,12 +1,9 @@
-package com.gyee.wisdom.dao.golden;
+package com.gyee.gaia.dao.golden;
 
-import com.golden.api.impl.GoldenServerImpl;
+import com.gyee.gaia.dao.timeseries.GoldenDao;
+import com.gyee.gaia.dao.timeseries.ILatestDao;
 import com.gyee.wisdom.common.data.timeseries.*;
 import com.gyee.wisdom.common.exception.WisdomException;
-import com.gyee.wisdom.dao.timeseries.GoldenDao;
-import com.gyee.wisdom.dao.timeseries.ILatestDao;
-import com.rtdb.api.callbackInter.RSDataChangeEx;
-import com.rtdb.api.model.RtdbData;
 import com.rtdb.enums.Quality;
 import com.rtdb.model.*;
 import com.rtdb.service.impl.BaseImpl;
@@ -44,7 +41,7 @@ public class GoldenLatestDao implements ILatestDao {
             }
         }
 
-       // RtdbData tmp = new RtdbData();
+        // RtdbData tmp = new RtdbData();
 
         return result;
     }
@@ -103,7 +100,7 @@ public class GoldenLatestDao implements ILatestDao {
         try {
             connection = this.goldenConfig.getGoldenConnectionPool().getConnection();
             SnapshotImpl snap = new SnapshotImpl(connection);
-            BaseImpl  base = new BaseImpl(connection);
+            BaseImpl base = new BaseImpl(connection);
             List<MinPoint> lstPoint = base.findPoints(tagNames);
             int[] ids = lstPoint.stream().mapToInt(MinPoint::getId).toArray();
             Entity<IntData> entityD = snap.getIntSnapshots(ids);
@@ -122,7 +119,7 @@ public class GoldenLatestDao implements ILatestDao {
     }
 
     public Map<String, TsData> getCoordinateTsDataSnapshots(String... tagNames) throws Exception {
-        ServerImpl connection = null;        
+        ServerImpl connection = null;
         try {
             connection = goldenConfig.getGoldenConnectionPool().getConnection();
             SnapshotImpl snap = new SnapshotImpl(connection);
@@ -228,7 +225,7 @@ public class GoldenLatestDao implements ILatestDao {
 
     @Override
     public int writeLongLatest(List<TsPointData> list) throws Exception {
-      
+
         ServerImpl connection = null;
         try {
             connection = goldenConfig.getGoldenConnectionPool().getConnection();
@@ -351,5 +348,4 @@ public class GoldenLatestDao implements ILatestDao {
     }
 
 
-
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/AlarmhistoryDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.Alerthistory;
 
@@ -6,9 +6,13 @@ import java.util.List;
 
 public interface AlarmhistoryDao {
     public List<Alerthistory> findAll();
+
     public Alerthistory findById(Long id);
+
     public void deletebyid(Long id);
+
     public void save(Alerthistory Alertsnap);
+
     public void save(List<Alerthistory> alerthistoryList);
     //public Alerthistory findByprojectId(String id);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/AlarmhistoryNewDao.java

@@ -1,15 +1,19 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.Alerthistory;
 import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
 
 import java.util.List;
 
 public interface AlarmhistoryNewDao {
     public List<AlerthistoryNew> findAll();
+
     public AlerthistoryNew findById(String id);
+
     public void deletebyid(String id);
+
     public void save(AlerthistoryNew Alertsnap);
+
     public void save(List<AlerthistoryNew> alerthistoryList);
+
     public AlerthistoryNew findByprojectId(String id);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/AlarmsnapDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 
 import com.gyee.wisdom.common.data.alarm.Alertsnap;
@@ -7,14 +7,20 @@ import java.util.List;
 
 public interface AlarmsnapDao {
     public List<Alertsnap> findAll();
+
     public Alertsnap findById(Long id);
-    public void  deletebyid(Long id);
+
+    public void deletebyid(Long id);
+
     public Alertsnap save(Alertsnap Alertsnap);
+
     public void save(List<Alertsnap> Alertsnaps);
 
-  //  public Alertsnap findByprojectId(String id);
-    public Alertsnap findByWindturbineIdAndAlertValue(String windturbineid,int alertvalue);
-    public Alertsnap findByStationIdAndAlertValue(String stationId,int alertvalue);
+    //  public Alertsnap findByprojectId(String id);
+    public Alertsnap findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue);
+
+    public Alertsnap findByStationIdAndAlertValue(String stationId, int alertvalue);
+
     public Alertsnap findByTestingpointkey(String testingpointkey);
 
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/AlarmsnapNewDao.java

@@ -1,20 +1,27 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 
-import com.gyee.wisdom.common.data.alarm.Alertsnap;
 import com.gyee.wisdom.common.data.alarm.AlertsnapNew;
 
 import java.util.List;
 
 public interface AlarmsnapNewDao {
     public List<AlertsnapNew> findAll();
+
     public AlertsnapNew findById(String id);
-    public void  deletebyid(String id);
+
+    public void deletebyid(String id);
+
     public AlertsnapNew save(AlertsnapNew Alertsnap);
+
     public void save(List<AlertsnapNew> Alertsnaps);
-    public int  countById(Long id);
+
+    public int countById(Long id);
+
     public AlertsnapNew findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue);
+
     public AlertsnapNew findByStationIdAndAlertValue(String stationId, int alertvalue);
+
     public AlertsnapNew findByTestingpointkey(String testingpointkey);
 
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/AlertRuleDao.java

@@ -1,13 +1,13 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 
 import com.gyee.wisdom.common.data.alarm.AlertRule;
-import com.gyee.wisdom.common.data.alarm.Alertsnap;
 
 import java.util.List;
 
 public interface AlertRuleDao {
     public List<AlertRule> findAll();
+
     public List<AlertRule> findByEnabled(boolean enabled);
 
 }

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/alarm/ElectricalTestingPointAIDao.java

@@ -0,0 +1,11 @@
+package com.gyee.gaia.dao.alarm;
+
+import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointAI;
+
+import java.util.List;
+
+public interface ElectricalTestingPointAIDao {
+    List<ElectricalTestingPointAI> findByUniformcodeNameWindpowerstationid(String uniformcode, String name, String windpowerstationid);
+
+
+}

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/ElectricalTestingPointDIDao.java

@@ -1,10 +1,9 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointDI;
 
-
 import java.util.List;
 
 public interface ElectricalTestingPointDIDao {
-    List<ElectricalTestingPointDI> findByUniformcodeNameWindpowerstationid(String  uniformcode, String  name, String windpowerstationid);
+    List<ElectricalTestingPointDI> findByUniformcodeNameWindpowerstationid(String uniformcode, String name, String windpowerstationid);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/FaultHistoryDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.FaultHistory;
 
@@ -8,6 +8,7 @@ public interface FaultHistoryDao {
 
 
     public void save(FaultHistory faultHistory);
+
     public void save(List<FaultHistory> faultHistories);
 
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/FaultSnapDao.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 
-import com.gyee.wisdom.common.data.alarm.AlertsnapNew;
 import com.gyee.wisdom.common.data.alarm.FaultSnap;
 
 import java.util.List;
@@ -9,11 +8,14 @@ import java.util.List;
 public interface FaultSnapDao {
 
     public FaultSnap save(FaultSnap Alertsnap);
+
     public void save(List<FaultSnap> Alertsnaps);
 
     public FaultSnap findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue);
+
     public FaultSnap findByStationIdAndAlertValue(String stationId, int alertvalue);
 
     public FaultSnap findByTestingpointkey(String testingpointkey);
+
     public List<FaultSnap> findAllFaultWindturbineId();
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/IGyeeLineDao.java

@@ -1,14 +1,17 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.GyeeLine;
-import com.gyee.wisdom.common.data.windturbine.Line;
 
 import java.util.List;
 
 public interface IGyeeLineDao {
     public List<GyeeLine> findAll();
+
     public GyeeLine findById(String id);
-    public void  deletebyid(String id);
+
+    public void deletebyid(String id);
+
     public void save(GyeeLine gyeeline);
+
     public List<GyeeLine> findByprojectId(String id);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/IGyeePowerStationDao.java

@@ -1,14 +1,13 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.GyeePowerStation;
-import com.gyee.wisdom.common.data.windturbine.PowerStation;
 
 import java.util.List;
 
 public interface IGyeePowerStationDao {
     List<GyeePowerStation> getAll();
 
-    List<GyeePowerStation>getListByPage(int pageIndex, int pageSize);
+    List<GyeePowerStation> getListByPage(int pageIndex, int pageSize);
 
     GyeePowerStation getStationById(String id);
 
@@ -16,5 +15,5 @@ public interface IGyeePowerStationDao {
 
     void delete(String id);
 
-    void   update(GyeePowerStation station);
+    void update(GyeePowerStation station);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/IGyeeProjectDao.java

@@ -1,15 +1,18 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.GyeeProject;
-import com.gyee.wisdom.common.data.windturbine.Project;
 
 import java.util.List;
 
 public interface IGyeeProjectDao {
     public void delete(String id);
+
     public void save(GyeeProject project);
+
     public List<GyeeProject> findAll();
+
     public GyeeProject findbyid(String id);
+
     public List<GyeeProject> findbyStationId(String stationId);
 
 }

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/alarm/IGyeeWindturbineDao.java

@@ -0,0 +1,17 @@
+package com.gyee.gaia.dao.alarm;
+
+import com.gyee.wisdom.common.data.alarm.GyeeWindturbine;
+
+import java.util.List;
+
+public interface IGyeeWindturbineDao {
+    public void del(String id);
+
+    public void save(GyeeWindturbine win);
+
+    public List<GyeeWindturbine> find();
+
+    public GyeeWindturbine findbyid(String id);
+
+    public List<GyeeWindturbine> findByStationId(String stationId);
+}

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/control/IControlLogDao.java

@@ -1,8 +1,7 @@
-package com.gyee.wisdom.dao.control;
+package com.gyee.gaia.dao.control;
 
 import com.gyee.wisdom.common.data.control.ControlLog;
 
-import javax.naming.ldap.Control;
 import java.util.Date;
 import java.util.List;
 
@@ -12,7 +11,7 @@ import java.util.List;
  */
 public interface IControlLogDao {
 
-    List<ControlLog> getLog(String windturbineId,String stationId,int type, Date startTime,Date endTime);
+    List<ControlLog> getLog(String windturbineId, String stationId, int type, Date startTime, Date endTime);
 
     boolean writeLog(ControlLog logData);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/control/IGycpCmdInfoDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.control;
+package com.gyee.gaia.dao.control;
 
 import com.gyee.wisdom.common.data.control.GycpCmdInfo;
 

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/control/IInputOrOutputSpeedTotalDao.java

@@ -1,8 +1,7 @@
-package com.gyee.wisdom.dao.control;
+package com.gyee.gaia.dao.control;
 
 import com.gyee.wisdom.common.data.control.InputOrOutputSpeedTotal;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -10,6 +9,6 @@ import java.util.List;
  * @date:2019-09-10
  */
 public interface IInputOrOutputSpeedTotalDao {
-    List<InputOrOutputSpeedTotal> getSmallSpeed( );
+    List<InputOrOutputSpeedTotal> getSmallSpeed();
 
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/feature/IFeatureStatDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.feature;
+package com.gyee.gaia.dao.feature;
 
 import com.gyee.wisdom.common.data.feature.FeatureStat;
 

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/hepler/IGenericDao.java

@@ -0,0 +1,45 @@
+package com.gyee.gaia.dao.hepler;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface IGenericDao<T> {
+
+    Integer saveBackId(T bean);
+
+    void save(T bean);
+
+    void update(T bean);
+
+    void update(T bean, String... wheres);
+
+    void delete(T bean);
+
+    void delete(T bean, String... wheres);
+
+    void delete(Object[] ids);
+
+    void delete(Object[] ids, Object... wheres);
+
+    T getById(Object id);
+
+    T getByParams(String field, Object parmas);
+
+    T getByParams(String[] fields, Object... parmas);
+
+    List<Map<String, Object>> queryAll();
+
+    List<T> queryAllList();
+
+    List<Map<String, Object>> queryList(Map<String, Object> params);
+
+    List<Map<String, Object>> queryList(String field, Object parmas);
+
+    List<Map<String, Object>> queryList(String[] fields, Object... parmas);
+
+    PageVo queryPage(int page, int rows, Map<String, Object> params);
+
+    PageVo queryPage(Class<T> clazz, int page, int rows, Map<String, Object> params);
+
+}

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/point/IElectricalTestingPointDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.point;
+package com.gyee.gaia.dao.point;
 
 import com.gyee.wisdom.common.data.point.ElectricalTestingPoint;
 
@@ -8,7 +8,7 @@ public interface IElectricalTestingPointDao {
 
     List<ElectricalTestingPoint> getAll();
 
-    List<ElectricalTestingPoint>getListByPage(int pageIndex, int pageSize);
+    List<ElectricalTestingPoint> getListByPage(int pageIndex, int pageSize);
 
     ElectricalTestingPoint getPointById(String id);
 
@@ -16,5 +16,5 @@ public interface IElectricalTestingPointDao {
 
     void delete(String id);
 
-    void  update(ElectricalTestingPoint point);
+    void update(ElectricalTestingPoint point);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/point/ILevelTypeTestingPointDao.java

@@ -1,6 +1,5 @@
-package com.gyee.wisdom.dao.point;
+package com.gyee.gaia.dao.point;
 
-import com.gyee.wisdom.common.data.point.ElectricalTestingPoint;
 import com.gyee.wisdom.common.data.point.LevelTypeTestingPoint;
 
 import java.util.List;
@@ -8,7 +7,7 @@ import java.util.List;
 public interface ILevelTypeTestingPointDao {
     List<LevelTypeTestingPoint> getAll();
 
-    List<LevelTypeTestingPoint>getListByPage(int pageIndex, int pageSize);
+    List<LevelTypeTestingPoint> getListByPage(int pageIndex, int pageSize);
 
     LevelTypeTestingPoint getPointById(String id);
 
@@ -16,5 +15,5 @@ public interface ILevelTypeTestingPointDao {
 
     void delete(String id);
 
-    void  update(LevelTypeTestingPoint point);
+    void update(LevelTypeTestingPoint point);
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/pv_inverter/IInverterDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.pv_inverter;
+package com.gyee.gaia.dao.pv_inverter;
 
 import com.gyee.wisdom.common.data.photovoltaic.Inverter;
 
@@ -11,10 +11,16 @@ import java.util.List;
  */
 public interface IInverterDao {
     List findByStation(String station);
+
     List<Inverter> findByLine(String line);
+
     List<Inverter> findByProject(String project);
+
     List<Inverter> findByModel(String model);
-    List<Inverter> findByStationAndModel(String station,String model);
+
+    List<Inverter> findByStationAndModel(String station, String model);
+
     Inverter findbyid(String id);
+
     List<Inverter> findAllInverter();
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/system/IDataDictionaryDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.system;
+package com.gyee.gaia.dao.system;
 
 import com.gyee.wisdom.common.data.system.model.DataDictionary;
 

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/system/IMenuDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.system;
+package com.gyee.gaia.dao.system;
 
 import com.gyee.wisdom.common.data.system.model.Menu;
 

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/timeseries/IDataChangeDao.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import com.gyee.wisdom.common.data.timeseries.TsData;
 import com.gyee.wisdom.common.data.timeseries.TsPoint;

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/timeseries/IHistoryDao.java

@@ -1,8 +1,7 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import com.gyee.wisdom.common.data.timeseries.*;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -15,12 +14,12 @@ public interface IHistoryDao {
     boolean writeHistoryValue(List<TsPointData> dataList) throws Exception;
 
     /**
-     * @param tsPoints  标签点
-     * @param ts 时间点（秒级）
-     * 上一个最近的数据
+     * @param tsPoints 标签点
+     * @param ts       时间点（秒级）
+     *                 上一个最近的数据
      * @return
      * @throws Exception
      */
-    Map<String, TsData> getHistorySection(List<TsPoint> tsPoints , Long ts) throws Exception;
+    Map<String, TsData> getHistorySection(List<TsPoint> tsPoints, Long ts) throws Exception;
 
 }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/timeseries/ILatestDao.java

@@ -1,6 +1,8 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
-import com.gyee.wisdom.common.data.timeseries.*;
+import com.gyee.wisdom.common.data.timeseries.TsData;
+import com.gyee.wisdom.common.data.timeseries.TsPoint;
+import com.gyee.wisdom.common.data.timeseries.TsPointData;
 
 import java.util.List;
 import java.util.Map;

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/ElectricalTestingPointAIDao.java

@@ -1,11 +0,0 @@
-package com.gyee.wisdom.dao.alarm;
-
-import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointAI;
-
-import java.util.List;
-
-    public interface ElectricalTestingPointAIDao {
-        List<ElectricalTestingPointAI> findByUniformcodeNameWindpowerstationid(String  uniformcode, String  name, String windpowerstationid);
-
-
-    }

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/IGyeeWindturbineDao.java

@@ -1,14 +0,0 @@
-package com.gyee.wisdom.dao.alarm;
-
-import com.gyee.wisdom.common.data.alarm.GyeeWindturbine;
-import com.gyee.wisdom.common.data.windturbine.Windturbine;
-
-import java.util.List;
-
-public interface IGyeeWindturbineDao {
-      public void del(String id);
-      public void save(GyeeWindturbine win);
-      public List<GyeeWindturbine> find();
-      public GyeeWindturbine findbyid(String id);
-      public List<GyeeWindturbine> findByStationId(String stationId);
-}

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/hepler/IGenericDao.java

@@ -1,45 +0,0 @@
-package com.gyee.wisdom.dao.hepler;
-
-import java.util.List;
-import java.util.Map;
-
-
-public interface IGenericDao<T> {
-
-	Integer saveBackId(T bean);
-
-	void save(T bean);
-
-	void update(T bean);
-
-	void update(T bean, String... wheres);
-
-	void delete(T bean);
-
-	void delete(T bean, String... wheres);
-
-	void delete(Object[] ids);
-
-	void delete(Object[] ids, Object... wheres);
-
-	T getById(Object id);
-
-	T getByParams(String field, Object parmas);
-
-	T getByParams(String[] fields, Object... parmas);
-
-	List<Map<String, Object>> queryAll();
-
-	List<T> queryAllList();
-
-	List<Map<String, Object>> queryList(Map<String, Object> params);
-
-	List<Map<String, Object>> queryList(String field, Object parmas);
-
-	List<Map<String, Object>> queryList(String[] fields, Object... parmas);
-
-	PageVo queryPage(int page, int rows, Map<String, Object> params);
-
-	PageVo queryPage(Class<T> clazz, int page, int rows, Map<String, Object> params);
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/feature/FeatureStatDao.java

@@ -1,9 +1,9 @@
-package com.gyee.wisdom.dao.sql.feature;
+package com.gyee.gaia.sql.feature;
 
+import com.gyee.gaia.dao.feature.IFeatureStatDao;
+import com.gyee.gaia.sql.feature.entity.FeatureStatEntity;
+import com.gyee.gaia.sql.feature.repository.FeatureStatRepository;
 import com.gyee.wisdom.common.data.feature.FeatureStat;
-import com.gyee.wisdom.dao.feature.IFeatureStatDao;
-import com.gyee.wisdom.dao.sql.feature.entity.FeatureStatEntity;
-import com.gyee.wisdom.dao.sql.feature.repository.FeatureStatRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;