部分实体类修改2

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.golden;
+package com.gyee.gaia.dao.golden;
 
 import com.gyee.wisdom.common.data.timeseries.GeneralTsData;
 import lombok.Data;

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

@@ -1,11 +1,10 @@
-package com.gyee.wisdom.dao.golden;
+package com.gyee.gaia.dao.golden;
 
 
 import com.rtdb.service.impl.ServerImpl;
 import com.rtdb.service.impl.ServerImplPool;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
 
 @Configuration
 //@PropertySource("classpath:/golden.properties")
@@ -38,7 +37,7 @@ public class GoldenConfig {
 
     public ServerImplPool getServerImplPool() {
         if (pool == null) {
-            pool = new ServerImplPool(serverIp, serverPort, userName,password, poolSize, maxPoolSize);
+            pool = new ServerImplPool(serverIp, serverPort, userName, password, poolSize, maxPoolSize);
         }
         return pool;
     }
@@ -46,8 +45,8 @@ public class GoldenConfig {
     public GoldenConnectionPool getGoldenConnectionPool() {
         if (connectionPool == null) {
             connectionPool = new GoldenConnectionPool();
-            connectionPool.init(serverIp, (short)serverPort, userName,password, poolSize,1, maxPoolSize);
-            System.out.println("golden server ip = " +  serverIp);
+            connectionPool.init(serverIp, (short) serverPort, userName, password, poolSize, 1, maxPoolSize);
+            System.out.println("golden server ip = " + serverIp);
         }
         return connectionPool;
     }

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

@@ -1,6 +1,5 @@
-package com.gyee.wisdom.dao.golden;
+package com.gyee.gaia.dao.golden;
 
-import com.golden.api.impl.GoldenServerImpl;
 import com.gyee.wisdom.common.exception.WisdomException;
 import com.rtdb.service.impl.ServerImpl;
 import org.springframework.stereotype.Component;
@@ -21,7 +20,7 @@ public class GoldenConnectionPool {
     private Vector connections = null; // 存放连接池中连接的向量 , 初始时为 null
 
 
-    public void  init(String serverIp, short serverPort, String userName, String password, int defaultConnections, int incrementalConnections, int maxConnections) {
+    public void init(String serverIp, short serverPort, String userName, String password, int defaultConnections, int incrementalConnections, int maxConnections) {
         this.serverIp = serverIp;
         this.serverPort = serverPort;
         this.userName = userName;
@@ -50,7 +49,8 @@ public class GoldenConnectionPool {
     /**
      * 创建由 numConnections 指定数目的Golden连接 , 并把这些连接
      * 放入 connections 向量中
-     * @param numConnections  要创建的Golden连接的数目
+     *
+     * @param numConnections 要创建的Golden连接的数目
      */
     private void createConnections(int numConnections) throws Exception {
         // 循环创建指定数目的Golden连接
@@ -58,7 +58,7 @@ public class GoldenConnectionPool {
             // 是否连接池中的Golden连接的数量己经达到最大？最大值由类成员 maxConnections
             // 指出，如果 maxConnections 为 0 或负数，表示连接数量没有限制。
             // 如果连接数己经达到最大，即退出。
-            if (this.maxConnections > 0  && this.connections.size() >= this.maxConnections) {
+            if (this.maxConnections > 0 && this.connections.size() >= this.maxConnections) {
                 break;
             }
 
@@ -77,17 +77,18 @@ public class GoldenConnectionPool {
 
     /**
      * 创建一个新的Golden连接并返回它
+     *
      * @return 返回一个新创建的Golden连接
      */
     private ServerImpl newConnection() throws Exception {
         // 创建一个Golden连接
-//        String file = RtdbServerImpl.class.getProtectionDomain().getCodeSource().getLocation().getFile();
-//        System.out.println("fffffffffffffffffffff = " + file);
-//        if (file.endsWith(".jar")) {
-//            System.out.println("对对对对对对对对对对对对对对");
-//        } else {
-//            System.out.println("错错错错错错错错错错错错错错");
-//        }
+        //        String file = RtdbServerImpl.class.getProtectionDomain().getCodeSource().getLocation().getFile();
+        //        System.out.println("fffffffffffffffffffff = " + file);
+        //        if (file.endsWith(".jar")) {
+        //            System.out.println("对对对对对对对对对对对对对对");
+        //        } else {
+        //            System.out.println("错错错错错错错错错错错错错错");
+        //        }
 
         ServerImpl conn = new ServerImpl(serverIp, serverPort, userName, password);
         return conn; // 返回创建的新的Golden连接
@@ -122,6 +123,7 @@ public class GoldenConnectionPool {
      * 当前没有可用的Golden连接，本函数则根据 incrementalConnections 设置
      * 的值创建几个Golden连接，并放入连接池中。
      * 如果创建后，所有的连接仍都在使用中，则返回 null
+     *
      * @return 返回一个可用的Golden连接
      */
     private ServerImpl getFreeConnection() throws Exception {
@@ -145,6 +147,7 @@ public class GoldenConnectionPool {
     /**
      * 查找连接池中所有的连接，查找一个可用的Golden连接，
      * 如果没有可用的连接，返回 null
+     *
      * @return 返回一个可用的Golden连接
      */
     private ServerImpl findFreeConnection() throws Exception {
@@ -296,6 +299,7 @@ public class GoldenConnectionPool {
 
     /**
      * 返回连接池自动增加的大小 、
+     *
      * @return 连接池自动增加的大小
      */
     public int getIncrementalConnections() {
@@ -311,6 +315,7 @@ public class GoldenConnectionPool {
 
     /**
      * 返回连接池中最大的可用连接数量
+     *
      * @return 连接池中最大的可用连接数量
      */
     public int getMaxConnections() {

timeseries/dao-interface/src/main/java/com/gyee/wisdom/dao/alarm/ScadaBJDao.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.ScadaBJ;
 
 import java.util.List;
 
 public interface ScadaBJDao {
     public List<ScadaBJ> findAll();
+
     public List<ScadaBJ> findByEnabled(boolean enabled);
 
 }

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

@@ -1,13 +1,14 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 
-import com.gyee.wisdom.common.data.alarm.ScadaBJ;
 import com.gyee.wisdom.common.data.alarm.ScadaFault;
 
 import java.util.List;
 
 public interface ScadaFaultDao {
     public List<ScadaFault> findAll();
+
     public List<ScadaFault> findByEnabled(boolean enabled);
+
     public List<ScadaFault> getScadaFaultByCategory4Not(String c4);
 }

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

@@ -1,19 +1,25 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
+
 import com.gyee.wisdom.common.data.alarm.Warning;
 import com.gyee.wisdom.common.data.alarm.WarningClassify;
-import com.gyee.wisdom.common.data.alarm.Warningfj;
 
 import java.util.List;
 
 public interface WarningDao {
     public List<Warning> findAll();
+
     public Warning findById(String id);
-    public void  deletebyid(String id);
+
+    public void deletebyid(String id);
+
     public void save(Warning warning);
+
     public Warning findByprojectId(String id);
+
     public Warning findByEdnavalue(int ednavalue);
 
     public List<Warning> findByModelId(String modelid);
+
     public List<Warning> findByModelIdIn(String[] modelids);
 
     public List<WarningClassify> findAllWarningClassify();

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

@@ -1,15 +1,19 @@
-package com.gyee.wisdom.dao.alarm;
-import com.gyee.wisdom.common.data.alarm.Warning;
-import com.gyee.wisdom.common.data.alarm.Warningfj;
+package com.gyee.gaia.dao.alarm;
 
+import com.gyee.wisdom.common.data.alarm.Warningfj;
 
 import java.util.List;
 
 public interface WarningfjDao {
     public List<Warningfj> findAll();
+
     public Warningfj findById(String id);
-    public void  deletebyid(String id);
+
+    public void deletebyid(String id);
+
     public void save(Warningfj warning);
+
     public Warningfj findByprojectId(String id);
-    public Warningfj findByEdnavalueAndModelId(int ednavalue,String modelId);
+
+    public Warningfj findByEdnavalueAndModelId(int ednavalue, String modelId);
 }

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

@@ -1,5 +1,7 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
+
 import com.gyee.wisdom.common.data.alarm.Warningrecords;
+
 import java.util.List;
 
 /**

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 import com.gyee.wisdom.common.data.alarm.Warningsyz;
 
@@ -6,10 +6,16 @@ import java.util.List;
 
 public interface WarningsyzDao {
     public List<Warningsyz> findAll();
+
     public Warningsyz findById(String id);
-    public void  deletebyid(String id);
+
+    public void deletebyid(String id);
+
     public void save(Warningsyz warning);
+
     public Warningsyz findByprojectId(String id);
+
     public Warningsyz findByDescription(String id);
+
     public Warningsyz findByPointkey(String id);
 }

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.alarm;
+package com.gyee.gaia.dao.alarm;
 
 
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointAi;
@@ -6,7 +6,7 @@ import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointAi;
 import java.util.List;
 
 public interface WindturbinetestingpointAiDao {
-    List<WindturbineTestingpointAi>  getWindturbinetestingpointAiByModelAndUniformcode(String  model, String  uniformcode);
+    List<WindturbineTestingpointAi> getWindturbinetestingpointAiByModelAndUniformcode(String model, String uniformcode);
 
     List<WindturbineTestingpointAi> getWindturbinetestingpointAiByModelAndUniformcodeIn(String model, String[] uniformcodes);
 }

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

@@ -1,6 +1,4 @@
-package com.gyee.wisdom.dao.alarm;
-
-
+package com.gyee.gaia.dao.alarm;
 
 
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointDi;
@@ -9,10 +7,16 @@ import java.util.List;
 
 public interface WindturbinetestingpointDiDao {
     public List<WindturbineTestingpointDi> findAll();
+
     public WindturbineTestingpointDi findById(String id);
+
     List<WindturbineTestingpointDi> getAllWindturbinetestingpointDiByWindpowerstationId(String windpowerstationid);
+
     public List<WindturbineTestingpointDi> findByUniformcode(String id);
-    public void  deletebyid(String id);
+
+    public void deletebyid(String id);
+
     public void save(WindturbineTestingpointDi windturbineTestingpointDi);
+
     public WindturbineTestingpointDi findByprojectId(String id);
 }

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

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

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

@@ -1,6 +1,5 @@
-package com.gyee.wisdom.dao.point;
+package com.gyee.gaia.dao.point;
 
-import com.gyee.wisdom.common.data.point.TestingPoint;
 import com.gyee.wisdom.common.data.point.WindturbineTestingPoint;
 
 import java.util.List;
@@ -9,7 +8,7 @@ public interface IWindturbineTestingPointDao {
 
     List<WindturbineTestingPoint> getAll();
 
-    List<WindturbineTestingPoint>getListByPage(int pageIndex, int pageSize);
+    List<WindturbineTestingPoint> getListByPage(int pageIndex, int pageSize);
 
     WindturbineTestingPoint getPointById(String id);
 
@@ -17,7 +16,7 @@ public interface IWindturbineTestingPointDao {
 
     void delete(String id);
 
-    void  update(WindturbineTestingPoint point);
+    void update(WindturbineTestingPoint point);
 
     List<WindturbineTestingPoint> findBycategory(Integer category);
 }

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

@@ -1,8 +1,6 @@
-package com.gyee.wisdom.dao.power;
+package com.gyee.gaia.dao.power;
 
-import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.power.Status8Snap;
-import com.gyee.wisdom.common.data.power.WindturbinePowerCurvefitting;
 
 import java.util.List;
 

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

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

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

@@ -1,6 +1,7 @@
-package com.gyee.wisdom.dao.system;
+package com.gyee.gaia.dao.system;
 
 import com.gyee.wisdom.common.data.system.model.Resource;
+
 import java.util.List;
 
 
@@ -12,13 +13,13 @@ public interface IResourceDao {
 
     Resource get(String id);
 
-    List<Resource> list() ;
+    List<Resource> list();
 
     void remove(String id);
 
-    void switchStatus(String id,boolean disabled);
+    void switchStatus(String id, boolean disabled);
 
-    List<Resource> listByRole(String roleId) ;
+    List<Resource> listByRole(String roleId);
 
     List<Resource> getEnableResources();
 }

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

@@ -1,6 +1,7 @@
-package com.gyee.wisdom.dao.system;
+package com.gyee.gaia.dao.system;
 
 import com.gyee.wisdom.common.data.system.model.Role;
+
 import java.util.List;
 
 
@@ -12,7 +13,7 @@ public interface IRoleDao {
 
     void updateMenus(String rid, List<String> mids);
 
-    void updateResources(String rid, List<String> resources) ;
+    void updateResources(String rid, List<String> resources);
 
     boolean contains(String roleName);
 
@@ -20,15 +21,15 @@ public interface IRoleDao {
 
     List<Role> list();
 
-    void remove(String id) ;
+    void remove(String id);
 
     void removeRoleMenuByMenuId(String menuId);
 
-    void removeRoleResourceByResourceId(String resourceId) ;
+    void removeRoleResourceByResourceId(String resourceId);
 
-    void switchStatus(String id, boolean disabled) ;
+    void switchStatus(String id, boolean disabled);
 
-    List<Role> getRoles(String userId) ;
+    List<Role> getRoles(String userId);
 
-	 String getRoleid(String uid) ;
+    String getRoleid(String uid);
 }

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

@@ -1,13 +1,14 @@
-package com.gyee.wisdom.dao.system;
+package com.gyee.gaia.dao.system;
 
 import com.gyee.wisdom.common.data.system.model.SysLog;
+
 import java.util.List;
 
 public interface ISysLogDao {
 
-    void add(SysLog sysLog) ;
+    void add(SysLog sysLog);
 
-    List<SysLog> list() ;
+    List<SysLog> list();
 
     void clear();
 }

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

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

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.timeseries;
+package com.gyee.gaia.dao.timeseries;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 

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

@@ -1,6 +1,5 @@
-package com.gyee.wisdom.dao.topic;
+package com.gyee.gaia.dao.topic;
 
-import com.gyee.wisdom.common.data.point.TestingPoint;
 import com.gyee.wisdom.common.data.topic.Topic;
 
 import java.util.List;
@@ -16,7 +15,7 @@ public interface ITopicDao {
 
     Topic getByTopic(String topicName);
 
-    List<Topic>getListByPage(int pageIndex, int pageSize);
+    List<Topic> getListByPage(int pageIndex, int pageSize);
 
     Topic getById(String id);
 
@@ -24,9 +23,9 @@ public interface ITopicDao {
 
     void delete(String id);
 
-    void  update(Topic data);
+    void update(Topic data);
 
-    void updatePoints(String topicId,List<String> pointIdList);
+    void updatePoints(String topicId, List<String> pointIdList);
 
     void deleteByTopic(String topic);
 }

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

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

timeseries/dao-taos/src/main/java/com/gyee/wisdom/dao/taos/TaosDataChangeDao.java

@@ -1,9 +1,9 @@
-package com.gyee.wisdom.dao.taos;
+package com.gyee.gaia.dao.redistaos;
 
+import com.gyee.gaia.dao.timeseries.IDataChangeDao;
+import com.gyee.gaia.dao.timeseries.TaosDao;
 import com.gyee.wisdom.common.data.timeseries.TsData;
 import com.gyee.wisdom.common.data.timeseries.TsPoint;
-import com.gyee.wisdom.dao.timeseries.IDataChangeDao;
-import com.gyee.wisdom.dao.timeseries.TaosDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/TaosHistoryDao.java

@@ -1,10 +1,10 @@
-package com.gyee.wisdom.dao.redistaos;
+package com.gyee.gaia.dao.redistaos;
 
+import com.gyee.gaia.dao.redistaos.config.TaosConfig;
+import com.gyee.gaia.dao.timeseries.IHistoryDao;
+import com.gyee.gaia.dao.timeseries.TaosDao;
 import com.gyee.wisdom.common.data.timeseries.*;
 import com.gyee.wisdom.common.exception.WisdomException;
-import com.gyee.wisdom.dao.redistaos.config.TaosConfig;
-import com.gyee.wisdom.dao.timeseries.IHistoryDao;
-import com.gyee.wisdom.dao.timeseries.TaosDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,6 +34,7 @@ public class TaosHistoryDao implements IHistoryDao {
 
     /**
      * 查询单个测点历史数据
+     *
      * @param tsQuery
      * @return
      * @throws Exception
@@ -53,6 +54,7 @@ public class TaosHistoryDao implements IHistoryDao {
 
     /**
      * 查询单测点min、max、avg值
+     *
      * @param tsQuery
      * @return
      * @throws Exception
@@ -78,9 +80,9 @@ public class TaosHistoryDao implements IHistoryDao {
             sql.append("` where ts between").append(tsQuery.getStartTs());
             sql.append(" and ").append(tsQuery.getEndTs());
             sql.append(" interval(").append(tsQuery.getInterval()).append("s)");
-//            sb.append(" where point_time>='").append(DateFormatUtils.format(tsQuery.getStartTs(), "yyyy-MM-dd HH:mm:ss:SSS"));
-//            sb.append("' and point_time<='").append(DateFormatUtils.format(tsQuery.getEndTs(), "yyyy-MM-dd HH:mm:ss:SSS"));
-//            sb.append("' interval(").append(tsQuery.getInterval()).append("s)");
+            //            sb.append(" where point_time>='").append(DateFormatUtils.format(tsQuery.getStartTs(), "yyyy-MM-dd HH:mm:ss:SSS"));
+            //            sb.append("' and point_time<='").append(DateFormatUtils.format(tsQuery.getEndTs(), "yyyy-MM-dd HH:mm:ss:SSS"));
+            //            sb.append("' interval(").append(tsQuery.getInterval()).append("s)");
 
             // select avg(value),max(value),min(value) from `NSSDJL.NX_GD_NSSF_DD_P1_L1_001_FXWG004` where ts>=1654012800000 and ts<=1656604800000 interval(86400s)
 
@@ -137,6 +139,7 @@ public class TaosHistoryDao implements IHistoryDao {
 
     /**
      * 查询多测点某个时间点的数值
+     *
      * @param tsPoints 标签点
      * @param ts       时间点（秒级）
      *                 上一个最近的数据
@@ -176,24 +179,24 @@ public class TaosHistoryDao implements IHistoryDao {
             result.putAll(results.get(i).get());
         }
 
-//        for (Map.Entry<TsDataType, List<TsPoint>> entry : pointGroup.entrySet()) {
-//            String[] tagNames = tsPoints.stream().map(TsPoint::getId).toArray(String[]::new);
-//            for (String tag : tagNames) {
-//                TsData tsData = null;
-//                String point = TaosCovertUtil.coverStationPrefix(tag) + "." + tag.replace(".", "_");
-//                String sql = "select last_row(*) from " + point + " where point_time>='"
-//                        + DateFormatUtils.format(ts - year_time, "yyyy-MM-dd HH:mm:ss:SSS") + "'"
-//                        + " and point_time <='" + DateFormatUtils.format(ts, "yyyy-MM-dd HH:mm:ss:SSS") + "'";
-//                ResultSet rs = config.getConnect().createStatement().executeQuery(sql);
-//                while (rs.next()) {
-//                    if (entry.getKey() == TsDataType.DOUBLE)
-//                        tsData = new DoubleTsData(ts, (short) 0, rs.getDouble(2));
-//                    if (entry.getKey() == TsDataType.BOOLEAN)
-//                        tsData = new BooleanTsData(ts, (short) 0, rs.getBoolean(2));
-//                    result.put(tag, tsData);
-//                }
-//            }
-//        }
+        //        for (Map.Entry<TsDataType, List<TsPoint>> entry : pointGroup.entrySet()) {
+        //            String[] tagNames = tsPoints.stream().map(TsPoint::getId).toArray(String[]::new);
+        //            for (String tag : tagNames) {
+        //                TsData tsData = null;
+        //                String point = TaosCovertUtil.coverStationPrefix(tag) + "." + tag.replace(".", "_");
+        //                String sql = "select last_row(*) from " + point + " where point_time>='"
+        //                        + DateFormatUtils.format(ts - year_time, "yyyy-MM-dd HH:mm:ss:SSS") + "'"
+        //                        + " and point_time <='" + DateFormatUtils.format(ts, "yyyy-MM-dd HH:mm:ss:SSS") + "'";
+        //                ResultSet rs = config.getConnect().createStatement().executeQuery(sql);
+        //                while (rs.next()) {
+        //                    if (entry.getKey() == TsDataType.DOUBLE)
+        //                        tsData = new DoubleTsData(ts, (short) 0, rs.getDouble(2));
+        //                    if (entry.getKey() == TsDataType.BOOLEAN)
+        //                        tsData = new BooleanTsData(ts, (short) 0, rs.getBoolean(2));
+        //                    result.put(tag, tsData);
+        //                }
+        //            }
+        //        }
 
         return result;
     }
@@ -205,7 +208,7 @@ public class TaosHistoryDao implements IHistoryDao {
             List<Future<List<TsData>>> results = new LinkedList<>();
             String sql = getHistory(tsQuery);
             log.info("2->" + sql);
-            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE,tsQuery.getStartTs());
+            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE, tsQuery.getStartTs());
             Future<List<TsData>> submit = taskConfig.getExecutor().submit(task);
             results.add(submit);
             //返回结果
@@ -220,66 +223,63 @@ public class TaosHistoryDao implements IHistoryDao {
     //DoubleTsData{ts='', status='0', value='442.01'}
     public List<TsData> getLongTsDataHistory(TsQuery tsQuery) throws Exception {
         List<TsData> tsDataList = new ArrayList<>();
-//        Connection connect = config.getConnect();
+        //        Connection connect = config.getConnect();
 
         try {
             //存储线程的返回值
             List<Future<List<TsData>>> results = new LinkedList<>();
             String sql = getHistory(tsQuery);
-            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE,tsQuery.getStartTs());
+            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE, tsQuery.getStartTs());
             Future<List<TsData>> submit = taskConfig.getExecutor().submit(task);
             results.add(submit);
 
             //返回结果
             tsDataList = results.get(0).get();
 
-//            Statement st = connect.createStatement();
-//            String sql = getHistory(tsQuery);
-//            ResultSet rs = st.executeQuery(sql);
-//            while (rs.next()) {
-//                tsDataList.add(new LongTsData(rs.getLong(1), (short) 0, rs.getLong(2)));
-//            }
+            //            Statement st = connect.createStatement();
+            //            String sql = getHistory(tsQuery);
+            //            ResultSet rs = st.executeQuery(sql);
+            //            while (rs.next()) {
+            //                tsDataList.add(new LongTsData(rs.getLong(1), (short) 0, rs.getLong(2)));
+            //            }
         } catch (Exception e) {
             log.error(e.getMessage());
-        }
-        finally {
-//            if (connect != null)
-//                connect.close();
+        } finally {
+            //            if (connect != null)
+            //                connect.close();
         }
 
         return tsDataList;
     }
 
 
-
     public List<TsData> getBooleanTsDataHistory(TsQuery tsQuery) throws Exception {
         List<TsData> tsDataList = new ArrayList<>();
-//        Connection connect = config.getConnect();
+        //        Connection connect = config.getConnect();
 
         try {
             //存储线程的返回值
             List<Future<List<TsData>>> results = new LinkedList<>();
             String sql = getHistory(tsQuery);
             log.info("2->" + sql);
-            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE,tsQuery.getStartTs());
+            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE, tsQuery.getStartTs());
             Future<List<TsData>> submit = taskConfig.getExecutor().submit(task);
             results.add(submit);
 
             //返回结果
             tsDataList = results.get(0).get();
 
-//            Statement st = connect.createStatement();
-//            String sql = getHistory(tsQuery);
-//            ResultSet rs = st.executeQuery(sql);
-//            while (rs.next()) {
-//                tsDataList.add(new BooleanTsData(rs.getLong(1), (short) 0, rs.getBoolean(2)));
-//            }
+            //            Statement st = connect.createStatement();
+            //            String sql = getHistory(tsQuery);
+            //            ResultSet rs = st.executeQuery(sql);
+            //            while (rs.next()) {
+            //                tsDataList.add(new BooleanTsData(rs.getLong(1), (short) 0, rs.getBoolean(2)));
+            //            }
         } catch (Exception e) {
             log.error(e.getMessage());
-        }
-        finally {
-//            if (connect != null)
-//                connect.close();
+        } finally {
+            //            if (connect != null)
+            //                connect.close();
         }
 
         return tsDataList;
@@ -288,31 +288,30 @@ public class TaosHistoryDao implements IHistoryDao {
 
     public List<TsData> getStringTsDataHistory(TsQuery tsQuery) throws Exception {
         List<TsData> tsDataList = new ArrayList<>();
-//        Connection connect = config.getConnect();
+        //        Connection connect = config.getConnect();
 
         try {
             //存储线程的返回值
             List<Future<List<TsData>>> results = new LinkedList<>();
             String sql = getHistory(tsQuery);
-            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE,tsQuery.getStartTs());
+            TaskCallableList task = new TaskCallableList(tdUtil.getConnect(), sql, TsDataType.DOUBLE, tsQuery.getStartTs());
             Future<List<TsData>> submit = taskConfig.getExecutor().submit(task);
             results.add(submit);
 
             //返回结果
             tsDataList = results.get(0).get();
 
-//            Statement st = connect.createStatement();
-//            String sql = getHistory(tsQuery);
-//            ResultSet rs = st.executeQuery(sql);
-//            while (rs.next()) {
-//                tsDataList.add(new StringTsData(rs.getLong(1), (short) 0, rs.getString(2)));
-//            }
+            //            Statement st = connect.createStatement();
+            //            String sql = getHistory(tsQuery);
+            //            ResultSet rs = st.executeQuery(sql);
+            //            while (rs.next()) {
+            //                tsDataList.add(new StringTsData(rs.getLong(1), (short) 0, rs.getString(2)));
+            //            }
         } catch (Exception e) {
             log.error(e.getMessage());
-        }
-        finally {
-//            if (connect != null)
-//                connect.close();
+        } finally {
+            //            if (connect != null)
+            //                connect.close();
         }
 
         return tsDataList;
@@ -369,17 +368,17 @@ public class TaosHistoryDao implements IHistoryDao {
         // TODO： select interp(*) from xxx where _c0 = xxxx:xx:xx fill(prev）
 
         // sb.append("select last_row(*) from ").append(point);
-//      sb.append(" where point_time <="+ts);
+        //      sb.append(" where point_time <="+ts);
         sb.append("select last_row(*) from gdnxxny.`").append(tag);
         sb.append("` where ts>=");
         sb.append(ts);
-//        sb.append(" fill(prev)");
+        //        sb.append(" fill(prev)");
 
-//        sb.append("select last_row(*) from ").append(point);
-//        sb.append(" where point_time>='");
-//        sb.append(ts - half_year_time);
-//        sb.append("'");
-//        sb.append(" and point_time <='" + DateFormatUtils.format(ts, "yyyy-MM-dd HH:mm:ss:SSS") + "'");
+        //        sb.append("select last_row(*) from ").append(point);
+        //        sb.append(" where point_time>='");
+        //        sb.append(ts - half_year_time);
+        //        sb.append("'");
+        //        sb.append(" and point_time <='" + DateFormatUtils.format(ts, "yyyy-MM-dd HH:mm:ss:SSS") + "'");
 
         return sb.toString();
     }

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/TaosLatestDao.java

@@ -1,9 +1,9 @@
-package com.gyee.wisdom.dao.redistaos;
+package com.gyee.gaia.dao.redistaos;
 
+import com.gyee.gaia.dao.redistaos.config.TaosConfig;
+import com.gyee.gaia.dao.timeseries.ILatestDao;
+import com.gyee.gaia.dao.timeseries.TaosDao;
 import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.dao.redistaos.config.TaosConfig;
-import com.gyee.wisdom.dao.timeseries.ILatestDao;
-import com.gyee.wisdom.dao.timeseries.TaosDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -40,6 +40,7 @@ public class TaosLatestDao implements ILatestDao {
 
     /**
      * 查询多测点最新数据
+     *
      * @param tsPoints
      * @return
      * @throws Exception
@@ -103,7 +104,9 @@ public class TaosLatestDao implements ILatestDao {
         final StringBuilder sql = new StringBuilder("SELECT last_row(*) from stag_double where tbname in (");
 
         Map<String, String> pointMap = new HashMap<>();
-        for (TsPoint tsPoint : pointList) {pointMap.put(tsPoint.getId(), tsPoint.getUniformCode());}
+        for (TsPoint tsPoint : pointList) {
+            pointMap.put(tsPoint.getId(), tsPoint.getUniformCode());
+        }
         for (Map.Entry<String, String> entry : pointMap.entrySet()) {
             sql.append("'");
             sql.append(entry.getKey());
@@ -147,7 +150,7 @@ public class TaosLatestDao implements ILatestDao {
                 double value = obj.getTsData().getDoubleValue().get();
 
                 sb.append("`").append(point).append("` USING stag_double (organization) TAGS(")
-                        .append(obj.getTagName().substring(0,obj.getTagName().indexOf(".")))
+                        .append(obj.getTagName().substring(0, obj.getTagName().indexOf(".")))
                         .append(") values (").append(time).append(",").append(value).append(")");
             }
             sb.append(";");
@@ -276,12 +279,12 @@ public class TaosLatestDao implements ILatestDao {
             mp.put("pointid", tsPointData.getTagName());
             mp.put("value", String.valueOf(tsPointData.getTsData().getDoubleValue().get()));
             long ts = tsPointData.getTsData().getTs();
-            mp.put("timestamp", String.valueOf(ts/1000));
+            mp.put("timestamp", String.valueOf(ts / 1000));
             mp.put("datetime", sdf.get().format(ts));
             mp.put("status", "0");
             try {
                 jedisPool.getResource().hmset(tsPointData.getTagName(), mp);
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
                 return false;
             }
@@ -293,9 +296,9 @@ public class TaosLatestDao implements ILatestDao {
         for (Map.Entry<TsDataType, List<TsPointData>> entry : pointGroup.entrySet()) {
             List<TsPointData> pointDataList = entry.getValue();
             int count = 0;
-            if(entry.getKey()==TsDataType.DOUBLE){
+            if (entry.getKey() == TsDataType.DOUBLE) {
                 count = writeDoubleLatest(pointDataList);
-            }else if(entry.getKey()==TsDataType.BOOLEAN){
+            } else if (entry.getKey() == TsDataType.BOOLEAN) {
                 count = writeIntLatest(pointDataList);
             }
             writeCount = writeCount + count;
@@ -315,10 +318,10 @@ public class TaosLatestDao implements ILatestDao {
             for (TsPointData obj : list) {
                 long time = obj.getTsData().getTs();
                 String point = obj.getTagName();
-                int value = obj.getTsData().getBooleanValue().get()?1:0;
+                int value = obj.getTsData().getBooleanValue().get() ? 1 : 0;
 
                 sb.append("`").append(point).append("` USING stag_double (organization) TAGS(")
-                        .append(obj.getTagName().substring(0,obj.getTagName().indexOf(".")))
+                        .append(obj.getTagName().substring(0, obj.getTagName().indexOf(".")))
                         .append(") values (").append(time).append(",").append(value).append(")");
             }
             sb.append(";");
@@ -341,7 +344,7 @@ public class TaosLatestDao implements ILatestDao {
 
         for (String tag : tagNames) {
             // String point = TaosCovertUtil.coverStationPrefix(tag) + "." + tag.replace(".", "_");
-            String  sql = "select last_row(*) from gdnxxny.`" + tag +"`";
+            String sql = "select last_row(*) from gdnxxny.`" + tag + "`";
 
             TaskCallable task = new TaskCallable(config.getConnect(), sql, 0, tag, TsDataType.DOUBLE);
             Future<Map<String, TsData>> submit = taskConfig.getExecutor().submit(task);
@@ -385,8 +388,8 @@ public class TaosLatestDao implements ILatestDao {
         List<Future<Map<String, TsData>>> results = new LinkedList<>();
 
         for (String tag : tagNames) {
-//            String point = TaosCovertUtil.coverStationPrefix(tag) + "." + tag.replace(".", "_");
-            String sql = "select last_row(*) from gdnxxny.`" + tag +"`";
+            //            String point = TaosCovertUtil.coverStationPrefix(tag) + "." + tag.replace(".", "_");
+            String sql = "select last_row(*) from gdnxxny.`" + tag + "`";
             log.info("1->" + sql);
             TaskCallable task = new TaskCallable(config.getConnect(), sql, 0, tag, TsDataType.BOOLEAN);
             Future<Map<String, TsData>> submit = taskConfig.getExecutor().submit(task);

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/TaskCallable.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.redistaos;
+package com.gyee.gaia.dao.redistaos;
 
 import com.gyee.wisdom.common.data.timeseries.*;
 import lombok.extern.slf4j.Slf4j;

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/TaskCallableList.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.redistaos;
+package com.gyee.gaia.dao.redistaos;
 
 import com.gyee.wisdom.common.data.timeseries.*;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +40,7 @@ public class TaskCallableList implements Callable {
             long timeShift = 0;
             while (rs.next()) {
                 long ts = rs.getLong(1);
-                if (timeShift==0) {
+                if (timeShift == 0) {
                     timeShift = this.startTs - ts;
                 }
                 ts += timeShift;
@@ -50,7 +50,7 @@ public class TaskCallableList implements Callable {
                 else if (this.type == TsDataType.STRING) tsData = new StringTsData(ts, (short) 0, rs.getString(2));
                 else if (this.type == TsDataType.LONG) tsData = new LongTsData(ts, (short) 0, rs.getLong(2));
 
-                if (tsData == null){
+                if (tsData == null) {
                     if (this.type == TsDataType.DOUBLE)
                         tsData = new DoubleTsData(System.currentTimeMillis(), (short) 0, 0);
                     else if (this.type == TsDataType.BOOLEAN)

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/ThreadPoolTaskConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.redistaos;
+package com.gyee.gaia.dao.redistaos;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -13,22 +13,34 @@ public class ThreadPoolTaskConfig {
      *  当队列满了，就继续创建线程，当线程数量大于等于maxPoolSize后，开始使用拒绝策略拒绝
      */
 
-    /** 核心线程数（默认线程数） */
+    /**
+     * 核心线程数（默认线程数）
+     */
     private static final int corePoolSize = 100;
-    /** 最大线程数 */
+    /**
+     * 最大线程数
+     */
     private static final int maxPoolSize = 500;
-    /** 允许线程空闲时间（单位：默认为秒） */
+    /**
+     * 允许线程空闲时间（单位：默认为秒）
+     */
     private static final int keepAliveTime = 60;
-    /** 缓冲队列大小 */
+    /**
+     * 缓冲队列大小
+     */
     private static final int queueCapacity = 500;
-    /** 允许等待最长时间 */
+    /**
+     * 允许等待最长时间
+     */
     private static final int awaitTime = 10;
-    /** 线程池名前缀 */
+    /**
+     * 线程池名前缀
+     */
     private static final String threadNamePrefix = "GYEE-Thread-";
 
     private ThreadPoolTaskExecutor executor;
 
-    public ThreadPoolTaskExecutor getExecutor(){
+    public ThreadPoolTaskExecutor getExecutor() {
         if (executor == null)
             executor = taskExecutor();
 
@@ -36,7 +48,7 @@ public class ThreadPoolTaskConfig {
     }
 
 
-    private ThreadPoolTaskExecutor taskExecutor(){
+    private ThreadPoolTaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(corePoolSize);
         executor.setMaxPoolSize(maxPoolSize);

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.redistaos.config;
+package com.gyee.gaia.dao.redistaos.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

timeseries/dao-redis-taos/src/main/java/com/gyee/wisdom/dao/redistaos/config/TaosConfig.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.redistaos.config;
+package com.gyee.gaia.dao.redistaos.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import lombok.extern.slf4j.Slf4j;

timeseries/dao-redis/src/main/java/com/gyee/wisdom/dao/redis/RedisHistoryDao.java

@@ -1,11 +1,13 @@
-package com.gyee.wisdom.dao.redis;
+package com.gyee.gaia.dao.redis;
+
+import com.gyee.gaia.dao.timeseries.IHistoryDao;
+import com.gyee.gaia.dao.timeseries.RedisDao;
 import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.dao.timeseries.IHistoryDao;
-import com.gyee.wisdom.dao.timeseries.RedisDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 @Component
 @RedisDao
@@ -13,7 +15,6 @@ import java.util.*;
 public class RedisHistoryDao implements IHistoryDao {
 
 
-
     //获取统计值方法  avg,max,min数据
     public List<DoubleStatData> getDoubleStatDataHistory(TsQuery tsQuery) throws Exception {
         return null;
@@ -29,7 +30,6 @@ public class RedisHistoryDao implements IHistoryDao {
     }
 
 
-
     public List<TsData> getTsDataHistory(TsQuery tsQuery) throws Exception {
         return null;
     }

timeseries/dao-redis/src/main/java/com/gyee/wisdom/dao/redis/RedisLatestDao.java

@@ -1,18 +1,18 @@
-package com.gyee.wisdom.dao.redis;
+package com.gyee.gaia.dao.redis;
 
 
-import com.alibaba.fastjson.JSONObject;
+import com.gyee.gaia.dao.timeseries.ILatestDao;
+import com.gyee.gaia.dao.timeseries.RedisDao;
+import com.gyee.wisdom.common.data.timeseries.*;
 import com.gyee.wisdom.common.utils.ByteUtil;
 import com.gyee.wisdom.it235.util.RedisValUtil;
-import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.dao.timeseries.ILatestDao;
-import com.gyee.wisdom.dao.timeseries.RedisDao;
 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.stream.Collectors;
 
 
@@ -50,30 +50,30 @@ public class RedisLatestDao implements ILatestDao {
         }
 
 
-//        Map<String, TsData> result = new HashMap<>();
-//        for (TsPoint tsPoint:tsPoints){
-//            try {
-//                int index = Integer.parseInt(tsPoint.getTag());
-//                if (index == 3) {
-//                    //王博版redis读取
-//                    byte[] dataBytes = redisValUtil.getBytes(index, tsPoint.getId());
-//                    double val = ByteUtil.getDouble(dataBytes,0);
-//                    long ts = ByteUtil.getLong2(dataBytes,8);
-//                    DoubleTsData doubleTsData = new DoubleTsData(ts, (short) 0, val);
-//                    result.put(tsPoint.getId(), doubleTsData);
-//                }
-////                String s = redisValUtil.get(index, tsPoint.getId()).toString();
-////                if (s != null) {
-////                    DoubleTsData doubleTsData = TsDataParser.parseWBString(s);
-////                    if (doubleTsData != null)
-////                        result.put(tsPoint.getId(), doubleTsData);
-////                } else {
-////                    log.error(tsPoint.getId() + ": 空值！");
-////                }
-//            }catch (Exception e){
-//                log.error(e.getMessage());
-//            }
-//        }
+        //        Map<String, TsData> result = new HashMap<>();
+        //        for (TsPoint tsPoint:tsPoints){
+        //            try {
+        //                int index = Integer.parseInt(tsPoint.getTag());
+        //                if (index == 3) {
+        //                    //王博版redis读取
+        //                    byte[] dataBytes = redisValUtil.getBytes(index, tsPoint.getId());
+        //                    double val = ByteUtil.getDouble(dataBytes,0);
+        //                    long ts = ByteUtil.getLong2(dataBytes,8);
+        //                    DoubleTsData doubleTsData = new DoubleTsData(ts, (short) 0, val);
+        //                    result.put(tsPoint.getId(), doubleTsData);
+        //                }
+        ////                String s = redisValUtil.get(index, tsPoint.getId()).toString();
+        ////                if (s != null) {
+        ////                    DoubleTsData doubleTsData = TsDataParser.parseWBString(s);
+        ////                    if (doubleTsData != null)
+        ////                        result.put(tsPoint.getId(), doubleTsData);
+        ////                } else {
+        ////                    log.error(tsPoint.getId() + ": 空值！");
+        ////                }
+        //            }catch (Exception e){
+        //                log.error(e.getMessage());
+        //            }
+        //        }
         return resultTest;
     }
 

timeseries/dao-simulator/src/main/java/com/gyee/wisdom/dao/simulator/SimulatorDataChangeDao.java

@@ -1,10 +1,9 @@
-package com.gyee.wisdom.dao.simulator;
+package com.gyee.gaia.dao.simulator;
 
+import com.gyee.gaia.dao.timeseries.IDataChangeDao;
+import com.gyee.gaia.dao.timeseries.SimulatorDao;
 import com.gyee.wisdom.common.data.timeseries.TsData;
 import com.gyee.wisdom.common.data.timeseries.TsPoint;
-import com.gyee.wisdom.dao.timeseries.EDosDao;
-import com.gyee.wisdom.dao.timeseries.IDataChangeDao;
-import com.gyee.wisdom.dao.timeseries.SimulatorDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +16,7 @@ import java.util.Map;
 public class SimulatorDataChangeDao implements IDataChangeDao {
 
 
-    public void registerTopic(String topic, List<TsPoint> tsPoints)  {
+    public void registerTopic(String topic, List<TsPoint> tsPoints) {
 
     }
 
@@ -26,7 +25,7 @@ public class SimulatorDataChangeDao implements IDataChangeDao {
     }
 
     public Map<String, TsData> getTopicDataChange(String topic) {
-            return null;
+        return null;
     }
 
 

timeseries/dao-simulator/src/main/java/com/gyee/wisdom/dao/simulator/SimulatorHistoryDao.java

@@ -1,14 +1,10 @@
-package com.gyee.wisdom.dao.simulator;
+package com.gyee.gaia.dao.simulator;
 
+import com.gyee.gaia.dao.timeseries.IHistoryDao;
+import com.gyee.gaia.dao.timeseries.SimulatorDao;
 import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.common.exception.WisdomException;
-import com.gyee.wisdom.dao.timeseries.EDosDao;
-import com.gyee.wisdom.dao.timeseries.IHistoryDao;
-import com.gyee.wisdom.dao.timeseries.SimulatorDao;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -17,7 +13,6 @@ import java.util.Map;
 public class SimulatorHistoryDao implements IHistoryDao {
 
 
-
     public List<TsData> getTsDataHistory(TsQuery tsQuery) throws Exception {
         return null;
     }
@@ -31,7 +26,6 @@ public class SimulatorHistoryDao implements IHistoryDao {
     }
 
 
-
     @Override
     public List<DoubleStatData> getDoubleStatDataHistory(TsQuery tsQuery) throws Exception {
         return null;

timeseries/dao-simulator/src/main/java/com/gyee/wisdom/dao/simulator/SimulatorLatestDao.java

@@ -1,12 +1,9 @@
-package com.gyee.wisdom.dao.simulator;
+package com.gyee.gaia.dao.simulator;
 
+import com.gyee.gaia.dao.timeseries.ILatestDao;
+import com.gyee.gaia.dao.timeseries.SimulatorDao;
 import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.common.utils.DateUtil;
-import com.gyee.wisdom.dao.timeseries.EDosDao;
-import com.gyee.wisdom.dao.timeseries.ILatestDao;
-import com.gyee.wisdom.dao.timeseries.SimulatorDao;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -26,7 +23,7 @@ public class SimulatorLatestDao implements ILatestDao {
             long ts = new Date().getTime();
             for (int i = 0; i < ids.length; i++) {
                 if (tsPoints.get(i).getTsDataType() == TsDataType.BOOLEAN) {
-                    int i1 = (int)(Math.random()*1000)+1;
+                    int i1 = (int) (Math.random() * 1000) + 1;
                     boolean bvalue = (i1 == 5 ? true : false);
 
                     BooleanTsData tsData = new BooleanTsData(ts, (short) 0, bvalue);

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/AlertRuleEntity.java

@@ -1,21 +1,22 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
+
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.AlertRule;
-import com.gyee.wisdom.common.data.alarm.Alertsnap;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.*;
+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 = "alertrule2")
-public class AlertRuleEntity implements ToData<AlertRule>,Serializable{
+public class AlertRuleEntity implements ToData<AlertRule>, Serializable {
     private static final long serialVersionUID = -8348826240826071549L;
     @Id
     @Column(name = "id")
@@ -50,7 +51,7 @@ public class AlertRuleEntity implements ToData<AlertRule>,Serializable{
     private String project;        //工程
     @Column(name = "electrical")
     private String electrical;     //电气
-    @Column(name="relatedparts")
+    @Column(name = "relatedparts")
     private String relatedParts;//关联部件
 
     @Override
@@ -61,22 +62,22 @@ public class AlertRuleEntity implements ToData<AlertRule>,Serializable{
     }
 
     public AlertRuleEntity(AlertRule ar) {
-            this.id = ar.getId();
-            this.name = ar.getName();   //名称
-            this.expression = ar.getExpression();     //表达式
-            this.description  = ar.getDescription();    //描述
-            this.tag= ar.getTag();    //标签
-            this.rank = ar.getRank();
-            this.enabled = ar.isEnabled();
-            this.modelId = ar.getModelId();
-            this.ednaValue = ar.getEdnaValue();    //报警值
-            this.category = ar.getCategory();      //报警类别
-            this.range = ar.getRange();      //范围
-            this.station=ar.getStation();    //场站
-            this.windturbine=ar.getWindturbine();    //风机
-            this.line=ar.getLine();           //线路
-            this.project=ar.getProject();        //工程
-            this.electrical=ar.getElectrical();     //电气
+        this.id = ar.getId();
+        this.name = ar.getName();   //名称
+        this.expression = ar.getExpression();     //表达式
+        this.description = ar.getDescription();    //描述
+        this.tag = ar.getTag();    //标签
+        this.rank = ar.getRank();
+        this.enabled = ar.isEnabled();
+        this.modelId = ar.getModelId();
+        this.ednaValue = ar.getEdnaValue();    //报警值
+        this.category = ar.getCategory();      //报警类别
+        this.range = ar.getRange();      //范围
+        this.station = ar.getStation();    //场站
+        this.windturbine = ar.getWindturbine();    //风机
+        this.line = ar.getLine();           //线路
+        this.project = ar.getProject();        //工程
+        this.electrical = ar.getElectrical();     //电气
     }
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/AlerthistoryEntity.java

@@ -1,10 +1,9 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.Alerthistory;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
 import javax.persistence.*;
@@ -16,7 +15,7 @@ import java.util.Date;
 @Entity
 @Table(name = "alerthistory_new")
 //@GenericGenerator(name = "NXFD_ALERTHISTORY_NEW", strategy = "NXFD_ALERTHISTORY_NEW")
-public class AlerthistoryEntity  implements ToData<Alerthistory>,Serializable{
+public class AlerthistoryEntity implements ToData<Alerthistory>, Serializable {
 
     private static final long serialVersionUID = -9116357102786246345L;
     @Id
@@ -43,26 +42,26 @@ public class AlerthistoryEntity  implements ToData<Alerthistory>,Serializable{
 
     @Override
     public Alerthistory toData() {
-        if(this!=null) {
+        if (this != null) {
             Alerthistory alerthistory = new Alerthistory();
             BeanUtils.copyProperties(this, alerthistory);
             return alerthistory;
-        }else {
+        } else {
             return null;
         }
     }
 
-    public AlerthistoryEntity(Alerthistory alerthistory){
+    public AlerthistoryEntity(Alerthistory alerthistory) {
 
         this.id = alerthistory.getId();
         this.alertTime = alerthistory.getAlertTime();
-        this.messageType =alerthistory.getMessageType();
+        this.messageType = alerthistory.getMessageType();
         this.operator = alerthistory.getOperator();
-        this.snapId =alerthistory.getSnapId();
+        this.snapId = alerthistory.getSnapId();
         this.isConfirmed = alerthistory.getIsConfirmed();
         this.confirmTime = alerthistory.getConfirmTime();
         this.confirmPerson = alerthistory.getConfirmPerson();
-        this.dataInfo =alerthistory.getDataInfo();
+        this.dataInfo = alerthistory.getDataInfo();
 
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/AlerthistoryNewEntity.java

@@ -1,14 +1,15 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.Alerthistory;
 import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -17,13 +18,13 @@ import java.util.Date;
 @Entity
 @Table(name = "alerthistory_new")
 //@GenericGenerator(name = "NXFD_ALERTHISTORY_NEW", strategy = "NXFD_ALERTHISTORY_NEW")
-public class AlerthistoryNewEntity implements ToData<AlerthistoryNew>,Serializable{
+public class AlerthistoryNewEntity implements ToData<AlerthistoryNew>, Serializable {
 
     private static final long serialVersionUID = -9116357102786246345L;
     @Id
     @Column(name = "id")
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_ALERTHISTORY_NEW")
-//    @SequenceGenerator(name = "NXFD_ALERTHISTORY_NEW", sequenceName = "NXFD_ALERTHISTORY_NEW")
+    //    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_ALERTHISTORY_NEW")
+    //    @SequenceGenerator(name = "NXFD_ALERTHISTORY_NEW", sequenceName = "NXFD_ALERTHISTORY_NEW")
     private Long id;
     @Column(name = "alerttime")
     private Date alertTime;
@@ -44,26 +45,26 @@ public class AlerthistoryNewEntity implements ToData<AlerthistoryNew>,Serializab
 
     @Override
     public AlerthistoryNew toData() {
-        if(this!=null) {
+        if (this != null) {
             AlerthistoryNew alerthistory = new AlerthistoryNew();
             BeanUtils.copyProperties(this, alerthistory);
             return alerthistory;
-        }else {
+        } else {
             return null;
         }
     }
 
-    public AlerthistoryNewEntity(AlerthistoryNew alerthistory){
+    public AlerthistoryNewEntity(AlerthistoryNew alerthistory) {
 
         this.id = alerthistory.getId();
         this.alertTime = alerthistory.getAlertTime();
-        this.messageType =alerthistory.getMessageType();
+        this.messageType = alerthistory.getMessageType();
         this.operator = alerthistory.getOperator();
-        this.snapId =alerthistory.getSnapId();
+        this.snapId = alerthistory.getSnapId();
         this.isConfirmed = alerthistory.getIsConfirmed();
         this.confirmTime = alerthistory.getConfirmTime();
         this.confirmPerson = alerthistory.getConfirmPerson();
-        this.dataInfo =alerthistory.getDataInfo();
+        this.dataInfo = alerthistory.getDataInfo();
 
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/AlertsnapEntity.java

@@ -1,12 +1,15 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
+
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.Alertsnap;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +18,12 @@ import java.util.Date;
 @NoArgsConstructor
 @Table(name = "alertsnap_new")
 //@GenericGenerator(name = "NXFD_ALERTSNAP_NEW", strategy = "NXFD_ALERTSNAP_NEW")
-public class AlertsnapEntity implements ToData<Alertsnap>,Serializable{
+public class AlertsnapEntity implements ToData<Alertsnap>, Serializable {
     private static final long serialVersionUID = -8348826240826071549L;
     @Id
     @Column(name = "id")
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_ALERTSNAP_NEW")
-//    @SequenceGenerator(name = "NXFD_ALERTSNAP_NEW", sequenceName = "NXFD_ALERTSNAP_NEW")
+    //    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_ALERTSNAP_NEW")
+    //    @SequenceGenerator(name = "NXFD_ALERTSNAP_NEW", sequenceName = "NXFD_ALERTSNAP_NEW")
     private Long id;
     @Column(name = "stationid")
     private String stationId;
@@ -81,41 +84,41 @@ public class AlertsnapEntity implements ToData<Alertsnap>,Serializable{
     public Alertsnap toData() {
 
         Alertsnap alertsnap = new Alertsnap();
-        BeanUtils.copyProperties(this,alertsnap);
+        BeanUtils.copyProperties(this, alertsnap);
         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.isConfirmed = 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();
+        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.isConfirmed = 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();
 
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/AlertsnapNewEntity.java

@@ -1,13 +1,15 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
+
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.Alertsnap;
 import com.gyee.wisdom.common.data.alarm.AlertsnapNew;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-//import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -16,12 +18,12 @@ import java.util.Date;
 @NoArgsConstructor
 @Table(name = "alertsnap")
 //@GenericGenerator(name = "NXFD_ALERTSNAP_NEW", strategy = "NXFD_ALERTSNAP_NEW")
-public class AlertsnapNewEntity implements ToData<AlertsnapNew>,Serializable{
+public class AlertsnapNewEntity implements ToData<AlertsnapNew>, Serializable {
     private static final long serialVersionUID = -8348826240826071549L;
     @Id
     @Column(name = "id")
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_ALERTSNAP_NEW")
-//    @SequenceGenerator(name = "NXFD_ALERTSNAP_NEW", sequenceName = "NXFD_ALERTSNAP_NEW")
+    //    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_ALERTSNAP_NEW")
+    //    @SequenceGenerator(name = "NXFD_ALERTSNAP_NEW", sequenceName = "NXFD_ALERTSNAP_NEW")
     private Long id;
     @Column(name = "stationid")
     private String stationId;
@@ -82,41 +84,41 @@ public class AlertsnapNewEntity implements ToData<AlertsnapNew>,Serializable{
     public AlertsnapNew toData() {
 
         AlertsnapNew alertsnap = new AlertsnapNew();
-        BeanUtils.copyProperties(this,alertsnap);
+        BeanUtils.copyProperties(this, alertsnap);
         return alertsnap;
 
     }
 
     public AlertsnapNewEntity(AlertsnapNew 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.isConfirmed = 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();
+        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.isConfirmed = 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();
 
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/ElectricalTestingPointAIEntity.java

@@ -1,8 +1,7 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointAI;
-import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointAi;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -17,7 +16,7 @@ import java.io.Serializable;
 @Data
 @Entity
 @NoArgsConstructor
-@Table(name="electricaltestingpointai")
+@Table(name = "electricaltestingpointai")
 public class ElectricalTestingPointAIEntity implements ToData<ElectricalTestingPointAI>, Serializable {
     @Id
     @Column(name = "id")
@@ -60,7 +59,7 @@ public class ElectricalTestingPointAIEntity implements ToData<ElectricalTestingP
     @Override
     public ElectricalTestingPointAI toData() {
         ElectricalTestingPointAI electricalTestingPointAI = new ElectricalTestingPointAI();
-        BeanUtils.copyProperties(this,electricalTestingPointAI);
+        BeanUtils.copyProperties(this, electricalTestingPointAI);
         return electricalTestingPointAI;
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/ElectricalTestingPointDIEntity.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointDI;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/FaultHistoryEntity.java

@@ -1,11 +1,9 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
 import com.gyee.wisdom.common.data.alarm.FaultHistory;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
 import javax.persistence.*;
@@ -16,13 +14,13 @@ import java.util.Date;
 @NoArgsConstructor
 @Entity
 @Table(name = "faulthistory")
-public class FaultHistoryEntity implements ToData<FaultHistory>,Serializable{
+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(strategy = GenerationType.SEQUENCE, generator = "SEQ_FAULTHISTORY")
+    //    @SequenceGenerator(name = "SEQ_FAULTHISTORY", sequenceName = "NXFD_FAULTHISTORY_ID")
     @GeneratedValue
     private Long id;
     @Column(name = "faulttime")
@@ -42,21 +40,21 @@ public class FaultHistoryEntity implements ToData<FaultHistory>,Serializable{
 
     @Override
     public FaultHistory toData() {
-        if(this!=null) {
+        if (this != null) {
             FaultHistory history = new FaultHistory();
             BeanUtils.copyProperties(this, history);
             return history;
-        }else {
+        } else {
             return null;
         }
     }
 
-    public FaultHistoryEntity(FaultHistory history){
+    public FaultHistoryEntity(FaultHistory history) {
 
         this.id = history.getId();
         this.faultTime = history.getFaultTime();
         this.operator = history.getOperator();
-        this.snapId =history.getSnapId();
+        this.snapId = history.getSnapId();
         this.confirmType = history.getConfirmType();
         this.confirmTime = history.getConfirmTime();
         this.confirmPerson = history.getConfirmPerson();

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/FaultSnapEntity.java

@@ -1,9 +1,9 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
+
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.FaultSnap;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.GenericGenerator;
 import org.springframework.beans.BeanUtils;
 
 import javax.persistence.*;
@@ -14,12 +14,12 @@ import java.util.Date;
 @Entity
 @NoArgsConstructor
 @Table(name = "faultsnap")
-public class FaultSnapEntity implements ToData<FaultSnap>,Serializable{
+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(strategy = GenerationType.SEQUENCE, generator = "SEQ_FAULTSNAP")
+    //    @SequenceGenerator(name = "SEQ_FAULTSNAP", sequenceName = "NXFD_FAULTSNAP_ID")
     @GeneratedValue
     private Long id;
     @Column(name = "stationid")
@@ -65,33 +65,33 @@ public class FaultSnapEntity implements ToData<FaultSnap>,Serializable{
     public FaultSnap toData() {
 
         FaultSnap snap = new FaultSnap();
-        BeanUtils.copyProperties(this,snap);
+        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();
+        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();
     }
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/GyeeLineEntity.java

@@ -1,9 +1,7 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.GyeeLine;
-import com.gyee.wisdom.common.data.windturbine.Line;
-import com.gyee.wisdom.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -15,7 +13,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
- *author:wangjw
+ * author:wangjw
  */
 @Data
 @NoArgsConstructor
@@ -24,27 +22,41 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "line")
 public class GyeeLineEntity implements ToData<GyeeLine> {
-    /** 主键ID */
+    /**
+     * 主键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 */
+    /**
+     * 项目id
+     */
     @Column(name = "projectid")
     private String projectId;
-    /** 顺序 */
+    /**
+     * 顺序
+     */
     @Column(name = "ordernum")
     private Integer orderNum;
-    /** 装机容量*/
+    /**
+     * 装机容量
+     */
     @Column(name = "capacity")
     private Double capacity;
     /*装机单位*/
@@ -82,7 +94,7 @@ public class GyeeLineEntity implements ToData<GyeeLine> {
 
     @Override
     public GyeeLine toData() {
-        if(this!=null) {
+        if (this != null) {
             GyeeLine line = new GyeeLine();
             line.setId(this.id);
             line.setCode(this.code);
@@ -94,7 +106,7 @@ public class GyeeLineEntity implements ToData<GyeeLine> {
             line.setCapacityUnit(this.getCapacityUnit());
             line.setQuantity(this.getQuantity());
             return line;
-        }else{
+        } else {
             return null;
         }
 /*        line.setListwindturbine(DataUtil.convertDataList(this.listwindturbines));

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/GyeePowerStationEntity.java

@@ -1,9 +1,7 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.GyeePowerStation;
-import com.gyee.wisdom.common.data.windturbine.PowerStation;
-import com.gyee.wisdom.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -137,7 +135,7 @@ public class GyeePowerStationEntity implements ToData<GyeePowerStation> {
      private List<ProjectEntity> listprojetentity;*/
 
     public GyeePowerStationEntity(GyeePowerStation station) {
-        this.id=station.getId();
+        this.id = station.getId();
         this.code = station.getCode();
         this.name = station.getName();
         this.address = station.getAddress();
@@ -165,7 +163,7 @@ public class GyeePowerStationEntity implements ToData<GyeePowerStation> {
 
     @Override
     public GyeePowerStation toData() {
-        if(this!=null) {
+        if (this != null) {
             GyeePowerStation station = new GyeePowerStation();
             station.setId(this.id);
             station.setCode(this.code);
@@ -187,7 +185,7 @@ public class GyeePowerStationEntity implements ToData<GyeePowerStation> {
             station.setAltitude(this.altitude);
             /*station.setListproject(DataUtil.convertDataList(this.listprojetentity));*/
             return station;
-        }else{
+        } else {
             return null;
         }
     }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/GyeeProjectEntity.java

@@ -1,9 +1,7 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.GyeeProject;
-import com.gyee.wisdom.common.data.windturbine.Project;
-import com.gyee.wisdom.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -23,23 +21,35 @@ import java.util.Date;
 @Entity
 @Table(name = "project")
 public class GyeeProjectEntity implements ToData<GyeeProject> {
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     @Id
     @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 */
+    /**
+     * 风机id
+     */
     @Column(name = "windpowerstationid")
     private String stationId;
-    /** 装机容量*/
+    /**
+     * 装机容量
+     */
     @Column(name = "capacity")
     private Double capacity;
     /*装机单位*/
@@ -77,16 +87,16 @@ public class GyeeProjectEntity implements ToData<GyeeProject> {
         this.capacityUnit = project.getCapacityUnit();
         this.quantity = project.getQuantity();
         this.model = project.getModel();
-        this.commissionDate=project.getCommissionDate();
-        this.masterPhone=project.getMasterPhone();
-        this.shiftFormanPhone=project.getShiftForemanPhone();
-        this.shiftForman=project.getShiftForeman();
-        this.orderNum=project.getOrderNum();
+        this.commissionDate = project.getCommissionDate();
+        this.masterPhone = project.getMasterPhone();
+        this.shiftFormanPhone = project.getShiftForemanPhone();
+        this.shiftForman = project.getShiftForeman();
+        this.orderNum = project.getOrderNum();
     }
 
     @Override
     public GyeeProject toData() {
-        if(this!=null) {
+        if (this != null) {
             GyeeProject project = new GyeeProject();
             project.setId(this.id);
             project.setCode(this.code);
@@ -103,7 +113,7 @@ public class GyeeProjectEntity implements ToData<GyeeProject> {
             project.setShiftForemanPhone(this.shiftFormanPhone);
             project.setOrderNum(this.orderNum);
             return project;
-        }else{
+        } else {
             return null;
         }
     }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/GyeeWindturbineEntity.java

@@ -1,9 +1,7 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.GyeeWindturbine;
-import com.gyee.wisdom.common.data.windturbine.Windturbine;
-import com.gyee.wisdom.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -23,45 +21,71 @@ import java.util.Date;
 @Entity
 @Table(name = "windturbine")
 public class GyeeWindturbineEntity implements ToData<GyeeWindturbine> {
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     @Id
     /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
     @Column(name = "id")
     private String id;
-    /** 编码 */
+    /**
+     * 编码
+     */
     @Column(name = "code")
     private String code;
-    /** 风场id */
+    /**
+     * 风场id
+     */
     @Column(name = "windpowerstationid")
     private String windPowerStationId;
-    /** 经度*/
+    /**
+     * 经度
+     */
     @Column(name = "longitude")
     private Double longitude;
-    /** 纬度 */
+    /**
+     * 纬度
+     */
     @Column(name = "latitude")
     private Double latitude;
-    /** 模型id */
+    /**
+     * 模型id
+     */
     @Column(name = "modelid")
     private String modelId;
-    /** 状态 */
+    /**
+     * 状态
+     */
     @Column(name = "status")
     private String status;
-    /** 项目id */
+    /**
+     * 项目id
+     */
     @Column(name = "projectid")
     private String projectId;
-    /** 线路id */
+    /**
+     * 线路id
+     */
     @Column(name = "lineid")
     private String lineId;
-    /** 首次并网的时间 */
+    /**
+     * 首次并网的时间
+     */
     @Column(name = "firstintegratedtime")
     private Date firstIntegratedTime;
-    /** app注册ID */
+    /**
+     * app注册ID
+     */
     @Column(name = "photo")
     private String photo;
-    /** app注册ID */
+    /**
+     * app注册ID
+     */
     @Column(name = "name")
     private String name;
-    /** app注册ID */
+    /**
+     * app注册ID
+     */
     @Column(name = "standardid")
     private String standardid;
 /*    @ManyToOne(cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
@@ -72,7 +96,6 @@ public class GyeeWindturbineEntity implements ToData<GyeeWindturbine> {
     private ModelEntity model;*/
 
 
-
     public GyeeWindturbineEntity(GyeeWindturbine win) {
         this.id = win.getId();
         this.code = win.getCode();
@@ -86,7 +109,7 @@ public class GyeeWindturbineEntity implements ToData<GyeeWindturbine> {
         this.firstIntegratedTime = win.getFirstIntegratedTime();
         this.photo = win.getPhoto();
         this.name = win.getName();
-        this.standardid=win.getStandardid();
+        this.standardid = win.getStandardid();
 /*        this.line=new LineEntity(win.getLine());
         this.model=new ModelEntity(win.getModel());*/
     }
@@ -94,7 +117,7 @@ public class GyeeWindturbineEntity implements ToData<GyeeWindturbine> {
 
     @Override
     public GyeeWindturbine toData() {
-        if(this!=null) {
+        if (this != null) {
             GyeeWindturbine win = new GyeeWindturbine();
             win.setId(id);
             win.setCode(code);
@@ -112,7 +135,7 @@ public class GyeeWindturbineEntity implements ToData<GyeeWindturbine> {
 /*        win.setLine(line.toData());
         win.setModel(model.toData());*/
             return win;
-        }else{
+        } else {
             return null;
         }
     }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/ScadaBJEntity.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.AlertRule;
 import com.gyee.wisdom.common.data.alarm.ScadaBJ;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +16,7 @@ import java.io.Serializable;
 @Entity
 @NoArgsConstructor
 @Table(name = "scadabj")
-public class ScadaBJEntity implements ToData<ScadaBJ>,Serializable{
+public class ScadaBJEntity implements ToData<ScadaBJ>, Serializable {
     private static final long serialVersionUID = -8348826240826071549L;
     @Id
     @Column(name = "id")

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/ScadaFaultEntity.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.ScadaBJ;
 import com.gyee.wisdom.common.data.alarm.ScadaFault;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +16,7 @@ import java.io.Serializable;
 @Entity
 @NoArgsConstructor
 @Table(name = "scadafault")
-public class ScadaFaultEntity implements ToData<ScadaFault>,Serializable{
+public class ScadaFaultEntity implements ToData<ScadaFault>, Serializable {
     private static final long serialVersionUID = -8348826240826071779L;
     @Id
     @Column(name = "id")

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/WarningClassifyEntity.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.Warning;
 import com.gyee.wisdom.common.data.alarm.WarningClassify;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,8 +15,8 @@ import java.io.Serializable;
 @Data
 @Entity
 @NoArgsConstructor
-@Table(name="warningclassify")
-public class WarningClassifyEntity implements ToData<WarningClassify>,Serializable{
+@Table(name = "warningclassify")
+public class WarningClassifyEntity implements ToData<WarningClassify>, Serializable {
 
 
     @Id
@@ -26,16 +25,15 @@ public class WarningClassifyEntity implements ToData<WarningClassify>,Serializab
     private String name;
 
 
-
     @Override
     public WarningClassify toData() {
         WarningClassify warning = new WarningClassify();
-        BeanUtils.copyProperties(this,warning);
+        BeanUtils.copyProperties(this, warning);
         return warning;
     }
 
 
-    public WarningClassifyEntity(WarningClassify warning){
+    public WarningClassifyEntity(WarningClassify warning) {
         this.id = warning.getId();
         this.name = warning.getName();
     }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/WarningEntity.java

@@ -1,8 +1,7 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.Warning;
-import com.gyee.wisdom.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -16,8 +15,8 @@ import java.io.Serializable;
 @Data
 @Entity
 @NoArgsConstructor
-@Table(name="warning2")
-public class WarningEntity  implements ToData<Warning>,Serializable{
+@Table(name = "warning2")
+public class WarningEntity implements ToData<Warning>, Serializable {
 
     private static final long serialVersionUID = -3888921205274103285L;
     @Id
@@ -52,41 +51,40 @@ public class WarningEntity  implements ToData<Warning>,Serializable{
     private Double standardTime;
     @Column(name = "isreset")
     private Integer isReset;
-//    @Column(name = "warningtypeid")
-//    private String warningTypeId;
-    @Column(name="relatedparts")
+    //    @Column(name = "warningtypeid")
+    //    private String warningTypeId;
+    @Column(name = "relatedparts")
     private String relatedParts;
 
-    @Column(name="enabled")
+    @Column(name = "enabled")
     private int enabled;
 
     @Override
     public Warning toData() {
         Warning warning = new Warning();
-        BeanUtils.copyProperties(this,warning);
+        BeanUtils.copyProperties(this, warning);
         return warning;
     }
 
 
-
-    public WarningEntity(Warning 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.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.sequenceNumber = warning.getSequenceNumber();
+        this.characterIstic = warning.getCharacterIstic();
+        this.modelId = warning.getModelId();
         this.codeName = warning.getCodeName();
-        this.ednaValue=warning.getEdnaValue();
+        this.ednaValue = warning.getEdnaValue();
         this.display = warning.getDisplay();
-        this.warningClassifyId  = warning.getWarningClassifyId();
+        this.warningClassifyId = warning.getWarningClassifyId();
         this.standardTime = warning.getStandardTime();
         this.isReset = warning.getIsReset();
-//        this.warningTypeId = warning.getWarningTypeId();
+        //        this.warningTypeId = warning.getWarningTypeId();
         this.enabled = warning.getEnabled();
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/WarningfjEntity.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.Warningfj;
@@ -15,8 +15,8 @@ import java.io.Serializable;
 @Data
 @Entity
 @NoArgsConstructor
-@Table(name="warning")
-public class WarningfjEntity implements ToData<Warningfj>,Serializable{
+@Table(name = "warning")
+public class WarningfjEntity implements ToData<Warningfj>, Serializable {
 
 
     private static final long serialVersionUID = 6290530262693880489L;
@@ -58,36 +58,35 @@ public class WarningfjEntity implements ToData<Warningfj>,Serializable{
 
     @Override
     public Warningfj toData() {
-        if(this!=null) {
+        if (this != null) {
             Warningfj warning = new Warningfj();
-            BeanUtils.copyProperties(this,warning);
+            BeanUtils.copyProperties(this, warning);
             return warning;
-        }else{
+        } else {
             return null;
         }
     }
 
 
+    public WarningfjEntity(Warningfj warning) {
 
-    public WarningfjEntity(Warningfj 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();
+        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();
 
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/WarningsyzEntity.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
 
 import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.Warningfj;
 import com.gyee.wisdom.common.data.alarm.Warningsyz;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,8 +15,8 @@ import java.io.Serializable;
 @Data
 @Entity
 @NoArgsConstructor
-@Table(name="warningsyz")
-public class WarningsyzEntity implements ToData<Warningsyz>,Serializable {
+@Table(name = "warningsyz")
+public class WarningsyzEntity implements ToData<Warningsyz>, Serializable {
 
 
     private static final long serialVersionUID = 7086505699466420713L;
@@ -38,27 +37,28 @@ public class WarningsyzEntity implements ToData<Warningsyz>,Serializable {
     private String levelid;
     @Column(name = "enabled")
     private int enabled;
+
     @Override
     public Warningsyz toData() {
-        if(this!=null) {
+        if (this != null) {
             Warningsyz warning = new Warningsyz();
-            BeanUtils.copyProperties(this,warning);
+            BeanUtils.copyProperties(this, warning);
             return warning;
-        }else{
+        } else {
             return null;
         }
 
     }
 
-    public WarningsyzEntity(Warningsyz warning){
-          this.id=warning.getId();
-          this.pointkey=warning.getPointkey();
-          this.description=warning.getDescription();
-          this.area1=warning.getArea1();
-          this.area2=warning.getArea2();
-          this.stationid=warning.getStationid();
-          this.levelid=warning.getLevelid();
-          this.enabled=warning.getEnabled();
+    public WarningsyzEntity(Warningsyz warning) {
+        this.id = warning.getId();
+        this.pointkey = warning.getPointkey();
+        this.description = warning.getDescription();
+        this.area1 = warning.getArea1();
+        this.area2 = warning.getArea2();
+        this.stationid = warning.getStationid();
+        this.levelid = warning.getLevelid();
+        this.enabled = warning.getEnabled();
     }
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/Entity/WindturbineTestingpointDiEntity.java

@@ -1,4 +1,5 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
+package com.gyee.gaia.sql.alarm.Entity;
+
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointDi;
 import lombok.Data;
@@ -10,11 +11,12 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
+
 @Data
 @Entity
 @NoArgsConstructor
-@Table(name="windturbinetestingpointdi")
-public class WindturbineTestingpointDiEntity implements ToData<WindturbineTestingpointDi>,Serializable {
+@Table(name = "windturbinetestingpointdi")
+public class WindturbineTestingpointDiEntity implements ToData<WindturbineTestingpointDi>, Serializable {
 
     private static final long serialVersionUID = 7484745276334585848L;
     @Id
@@ -58,29 +60,29 @@ public class WindturbineTestingpointDiEntity implements ToData<WindturbineTestin
     @Override
     public WindturbineTestingpointDi toData() {
         WindturbineTestingpointDi windturbineTestingpointDi = new WindturbineTestingpointDi();
-        BeanUtils.copyProperties(this,windturbineTestingpointDi);
+        BeanUtils.copyProperties(this, windturbineTestingpointDi);
         return windturbineTestingpointDi;
     }
 
 
     public WindturbineTestingpointDiEntity(WindturbineTestingpointDi windturbineTestingpointDi) {
-            this.id = windturbineTestingpointDi.getId();
-            this.code = windturbineTestingpointDi.getCode();
-            this.name = windturbineTestingpointDi.getName();
-            this.model = windturbineTestingpointDi.getModel();
-            this.valueunit = windturbineTestingpointDi.getValueunit();
-            this.englishName = windturbineTestingpointDi.getEnglishName();
-            this.typeId = windturbineTestingpointDi.getTypeId();
-            this.modelId = windturbineTestingpointDi.getModelId();
-            this.maxval = windturbineTestingpointDi.getMaxval();
-            this.minval = windturbineTestingpointDi.getMinval();
-            this.reasonableMaxVal = windturbineTestingpointDi.getReasonableMaxVal();
-            this.reasonableMinVal = windturbineTestingpointDi.getReasonableMinVal();
-            this.windturbineId =windturbineTestingpointDi.getWindturbineId();
-            this.uniformcode = windturbineTestingpointDi.getUniformcode();
-            this.shortId = windturbineTestingpointDi.getShortId();
-            this.longId = windturbineTestingpointDi.getLongId();
-            this.windpowerstationId = windturbineTestingpointDi.getWindpowerstationId();
-            this.realTimeId = windturbineTestingpointDi.getRealTimeId();
+        this.id = windturbineTestingpointDi.getId();
+        this.code = windturbineTestingpointDi.getCode();
+        this.name = windturbineTestingpointDi.getName();
+        this.model = windturbineTestingpointDi.getModel();
+        this.valueunit = windturbineTestingpointDi.getValueunit();
+        this.englishName = windturbineTestingpointDi.getEnglishName();
+        this.typeId = windturbineTestingpointDi.getTypeId();
+        this.modelId = windturbineTestingpointDi.getModelId();
+        this.maxval = windturbineTestingpointDi.getMaxval();
+        this.minval = windturbineTestingpointDi.getMinval();
+        this.reasonableMaxVal = windturbineTestingpointDi.getReasonableMaxVal();
+        this.reasonableMinVal = windturbineTestingpointDi.getReasonableMinVal();
+        this.windturbineId = windturbineTestingpointDi.getWindturbineId();
+        this.uniformcode = windturbineTestingpointDi.getUniformcode();
+        this.shortId = windturbineTestingpointDi.getShortId();
+        this.longId = windturbineTestingpointDi.getLongId();
+        this.windpowerstationId = windturbineTestingpointDi.getWindpowerstationId();
+        this.realTimeId = windturbineTestingpointDi.getRealTimeId();
     }
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaAlertRuleDao.java

@@ -1,10 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.AlertRuleDao;
+import com.gyee.gaia.sql.alarm.repository.AlertRuleRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.AlertRule;
-import com.gyee.wisdom.dao.alarm.AlertRuleDao;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlertRuleRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,18 +14,18 @@ import java.util.List;
 public class JpaAlertRuleDao implements AlertRuleDao {
     @Autowired
     private AlertRuleRepository alertRuleRepository;
+
     @Override
     public List<AlertRule> findAll() {
-        List<AlertRule> result=DataUtil.convertDataList(alertRuleRepository.findAll());
+        List<AlertRule> result = DataUtil.convertDataList(alertRuleRepository.findAll());
         return result;
     }
 
     @Override
-    public List<AlertRule>  findByEnabled(boolean enbaled) {
-        List<AlertRule> result=DataUtil.convertDataList(alertRuleRepository.findByEnabled(enbaled));
+    public List<AlertRule> findByEnabled(boolean enbaled) {
+        List<AlertRule> result = DataUtil.convertDataList(alertRuleRepository.findByEnabled(enbaled));
         return result;
     }
 
 
-
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaAlerthistoryDao.java

@@ -1,11 +1,11 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.AlarmhistoryDao;
+import com.gyee.gaia.sql.alarm.Entity.AlerthistoryEntity;
+import com.gyee.gaia.sql.alarm.repository.AlerthistoryRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.Alerthistory;
-import com.gyee.wisdom.dao.alarm.AlarmhistoryDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlerthistoryRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -18,15 +18,16 @@ import java.util.List;
 public class JpaAlerthistoryDao implements AlarmhistoryDao {
     @Autowired
     private AlerthistoryRepository alerthistoryRepository;
+
     @Override
     public List<Alerthistory> findAll() {
-        List<Alerthistory> listalertsnap=DataUtil.convertDataList(alerthistoryRepository.findAll());
+        List<Alerthistory> listalertsnap = DataUtil.convertDataList(alerthistoryRepository.findAll());
         return listalertsnap;
     }
 
     @Override
     public Alerthistory findById(Long id) {
-        Alerthistory alerthistory=alerthistoryRepository.findById(id).get().toData();
+        Alerthistory alerthistory = alerthistoryRepository.findById(id).get().toData();
         return alerthistory;
     }
 
@@ -44,23 +45,23 @@ public class JpaAlerthistoryDao implements AlarmhistoryDao {
     @Override
     public void save(List<Alerthistory> alerthistorys) {
         ArrayList<AlerthistoryEntity> entities = new ArrayList<>();
-        for(Alerthistory his : alerthistorys) {
+        for (Alerthistory his : alerthistorys) {
             AlerthistoryEntity et = new AlerthistoryEntity(his);
             entities.add(et);
         }
         try {
             alerthistoryRepository.saveAll(entities);
             alerthistoryRepository.flush();
-        }catch (Exception e){
-            log.error("--------保存报警历史信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------保存报警历史信息error--------{}", e.getMessage());
         }
 
     }
 
-//    @Override
-//    public Alerthistory findByprojectId(String id) {
-//        return alerthistoryRepository.findAllById(id).toData();
-//    }
+    //    @Override
+    //    public Alerthistory findByprojectId(String id) {
+    //        return alerthistoryRepository.findAllById(id).toData();
+    //    }
 
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaAlerthistoryNewDao.java

@@ -1,14 +1,11 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.AlarmhistoryNewDao;
+import com.gyee.gaia.sql.alarm.Entity.AlerthistoryNewEntity;
+import com.gyee.gaia.sql.alarm.repository.AlerthistoryNewRepository;
 import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.alarm.Alerthistory;
 import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
-import com.gyee.wisdom.dao.alarm.AlarmhistoryNewDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryNewEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlerthistoryNewRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlerthistoryRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,15 +18,16 @@ import java.util.List;
 public class JpaAlerthistoryNewDao implements AlarmhistoryNewDao {
     @Autowired
     private AlerthistoryNewRepository alerthistoryNewRepository;
+
     @Override
     public List<AlerthistoryNew> findAll() {
-        List<AlerthistoryNew> listalertsnap=DataUtil.convertDataList(alerthistoryNewRepository.findAll());
+        List<AlerthistoryNew> listalertsnap = DataUtil.convertDataList(alerthistoryNewRepository.findAll());
         return listalertsnap;
     }
 
     @Override
     public AlerthistoryNew findById(String id) {
-        AlerthistoryNew alerthistory=alerthistoryNewRepository.findById(id).get().toData();
+        AlerthistoryNew alerthistory = alerthistoryNewRepository.findById(id).get().toData();
         return alerthistory;
     }
 
@@ -47,15 +45,15 @@ public class JpaAlerthistoryNewDao implements AlarmhistoryNewDao {
     @Override
     public void save(List<AlerthistoryNew> alerthistorys) {
         ArrayList<AlerthistoryNewEntity> entities = new ArrayList<>();
-        for(AlerthistoryNew his : alerthistorys) {
+        for (AlerthistoryNew his : alerthistorys) {
             AlerthistoryNewEntity et = new AlerthistoryNewEntity(his);
             entities.add(et);
         }
         try {
             alerthistoryNewRepository.saveAll(entities);
             alerthistoryNewRepository.flush();
-        }catch (Exception e){
-            log.error("--------保存报警历史信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------保存报警历史信息error--------{}", e.getMessage());
         }
 
     }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaAlertsnapDao.java

@@ -1,25 +1,23 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.AlarmsnapDao;
+import com.gyee.gaia.sql.alarm.Entity.AlerthistoryEntity;
+import com.gyee.gaia.sql.alarm.Entity.AlertsnapEntity;
+import com.gyee.gaia.sql.alarm.repository.AlerthistoryRepository;
+import com.gyee.gaia.sql.alarm.repository.AlertsnapRepository;
 import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.alarm.Alerthistory;
 import com.gyee.wisdom.common.data.alarm.Alertsnap;
-import com.gyee.wisdom.dao.alarm.AlarmsnapDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlerthistoryRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlertsnapRepository;
 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 JpaAlertsnapDao implements AlarmsnapDao{
+public class JpaAlertsnapDao implements AlarmsnapDao {
     @Autowired
     private AlertsnapRepository alertsnapRepository;
 
@@ -28,13 +26,13 @@ public class JpaAlertsnapDao implements AlarmsnapDao{
 
     @Override
     public List<Alertsnap> findAll() {
-        List<Alertsnap> listalertsnap=DataUtil.convertDataList(alertsnapRepository.findAll());
+        List<Alertsnap> listalertsnap = DataUtil.convertDataList(alertsnapRepository.findAll());
         return listalertsnap;
     }
 
     @Override
     public Alertsnap findById(Long id) {
-        Alertsnap alertsnap=alertsnapRepository.findById(id).get().toData();
+        Alertsnap alertsnap = alertsnapRepository.findById(id).get().toData();
         return alertsnap;
     }
 
@@ -46,21 +44,21 @@ public class JpaAlertsnapDao implements AlarmsnapDao{
 
     @Override
     public Alertsnap save(Alertsnap alertsnap) {
-       return alertsnapRepository.saveAndFlush(new AlertsnapEntity(alertsnap)).toData();
+        return alertsnapRepository.saveAndFlush(new AlertsnapEntity(alertsnap)).toData();
     }
 
     @Override
     public void save(List<Alertsnap> alertsnaps) {
         ArrayList<AlertsnapEntity> entities = new ArrayList<>();
-        for(Alertsnap his : alertsnaps) {
+        for (Alertsnap his : alertsnaps) {
             AlertsnapEntity et = new AlertsnapEntity(his);
             entities.add(et);
         }
-        try{
+        try {
             List<AlertsnapEntity> results = alertsnapRepository.saveAll(entities);
 
             ArrayList<AlerthistoryEntity> hisEntities = new ArrayList<>();
-            for(AlertsnapEntity snapEntity : results) {
+            for (AlertsnapEntity snapEntity : results) {
                 AlerthistoryEntity hisE = createAlerthistoryEntity(snapEntity);
                 hisEntities.add(hisE);
             }
@@ -68,8 +66,8 @@ public class JpaAlertsnapDao implements AlarmsnapDao{
 
             alertsnapRepository.flush();
             alerthistoryRepository.flush();
-        }catch (Exception e){
-            log.error("--------保存报警信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------保存报警信息error--------{}", e.getMessage());
         }
     }
 
@@ -95,36 +93,36 @@ public class JpaAlertsnapDao implements AlarmsnapDao{
     }
 
 
-//    @Override
-//    public Alertsnap findByprojectId(Long id) {
-//        return alertsnapRepository.findAllById(id).toData();
-//    }
+    //    @Override
+    //    public Alertsnap findByprojectId(Long id) {
+    //        return alertsnapRepository.findAllById(id).toData();
+    //    }
 
     @Override
     public Alertsnap findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue) {
-       AlertsnapEntity alertsnapEntity = alertsnapRepository.findByWindturbineIdAndAlertValue(windturbineid,alertvalue);
-        if(alertsnapEntity!=null) {
+        AlertsnapEntity alertsnapEntity = alertsnapRepository.findByWindturbineIdAndAlertValue(windturbineid, alertvalue);
+        if (alertsnapEntity != null) {
             return alertsnapEntity.toData();
-        }else {
+        } else {
             return null;
         }
     }
 
     @Override
     public Alertsnap findByStationIdAndAlertValue(String stationId, int alertvalue) {
-        AlertsnapEntity alertsnapEntity = alertsnapRepository.findByStationIdAndAlertValue(stationId,alertvalue);
-        if(alertsnapEntity!=null) {
+        AlertsnapEntity alertsnapEntity = alertsnapRepository.findByStationIdAndAlertValue(stationId, alertvalue);
+        if (alertsnapEntity != null) {
             return alertsnapEntity.toData();
-        }else {
+        } else {
             return null;
         }
     }
 
 
     @Override
-    public Alertsnap findByTestingpointkey(String testingpointkey){
+    public Alertsnap findByTestingpointkey(String testingpointkey) {
         AlertsnapEntity alertsnapEntity = alertsnapRepository.findByTestingpointKey(testingpointkey);
-        return alertsnapEntity==null?null:alertsnapEntity.toData();
+        return alertsnapEntity == null ? null : alertsnapEntity.toData();
     }
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaAlertsnapNewDao.java

@@ -1,13 +1,11 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.AlarmsnapNewDao;
+import com.gyee.gaia.sql.alarm.Entity.AlertsnapNewEntity;
+import com.gyee.gaia.sql.alarm.repository.AlertsnapNewRepository;
 import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.alarm.Alertsnap;
 import com.gyee.wisdom.common.data.alarm.AlertsnapNew;
-import com.gyee.wisdom.dao.alarm.AlarmsnapNewDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapNewEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.AlertsnapNewRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -17,18 +15,19 @@ import java.util.List;
 
 @Component
 @Slf4j
-public class JpaAlertsnapNewDao implements AlarmsnapNewDao{
+public class JpaAlertsnapNewDao implements AlarmsnapNewDao {
     @Autowired
     private AlertsnapNewRepository alertsnapNewRepository;
+
     @Override
     public List<AlertsnapNew> findAll() {
-        List<AlertsnapNew> listalertsnap=DataUtil.convertDataList(alertsnapNewRepository.findAll());
+        List<AlertsnapNew> listalertsnap = DataUtil.convertDataList(alertsnapNewRepository.findAll());
         return listalertsnap;
     }
 
     @Override
     public AlertsnapNew findById(String id) {
-        AlertsnapNew alertsnap=alertsnapNewRepository.findById(id).get().toData();
+        AlertsnapNew alertsnap = alertsnapNewRepository.findById(id).get().toData();
         return alertsnap;
     }
 
@@ -36,6 +35,7 @@ public class JpaAlertsnapNewDao implements AlarmsnapNewDao{
     public int countById(Long id) {
         return alertsnapNewRepository.countById(id);
     }
+
     @Override
     public void deletebyid(String id) {
         alertsnapNewRepository.deleteById(id);
@@ -44,21 +44,21 @@ public class JpaAlertsnapNewDao implements AlarmsnapNewDao{
 
     @Override
     public AlertsnapNew save(AlertsnapNew alertsnap) {
-       return alertsnapNewRepository.saveAndFlush(new AlertsnapNewEntity(alertsnap)).toData();
+        return alertsnapNewRepository.saveAndFlush(new AlertsnapNewEntity(alertsnap)).toData();
     }
 
     @Override
     public void save(List<AlertsnapNew> alertsnaps) {
         ArrayList<AlertsnapNewEntity> entities = new ArrayList<>();
-        for(AlertsnapNew his : alertsnaps) {
+        for (AlertsnapNew his : alertsnaps) {
             AlertsnapNewEntity et = new AlertsnapNewEntity(his);
             entities.add(et);
         }
-        try{
+        try {
             alertsnapNewRepository.saveAll(entities);
             alertsnapNewRepository.flush();
-        }catch (Exception e){
-            log.error("--------保存报警信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------保存报警信息error--------{}", e.getMessage());
         }
 
 
@@ -66,29 +66,29 @@ public class JpaAlertsnapNewDao implements AlarmsnapNewDao{
 
     @Override
     public AlertsnapNew findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue) {
-       AlertsnapNewEntity alertsnapEntity = alertsnapNewRepository.findByWindturbineIdAndAlertValue(windturbineid,alertvalue);
-        if(alertsnapEntity!=null) {
+        AlertsnapNewEntity alertsnapEntity = alertsnapNewRepository.findByWindturbineIdAndAlertValue(windturbineid, alertvalue);
+        if (alertsnapEntity != null) {
             return alertsnapEntity.toData();
-        }else {
+        } else {
             return null;
         }
     }
 
     @Override
     public AlertsnapNew findByStationIdAndAlertValue(String stationId, int alertvalue) {
-        AlertsnapNewEntity alertsnapEntity = alertsnapNewRepository.findByStationIdAndAlertValue(stationId,alertvalue);
-        if(alertsnapEntity!=null) {
+        AlertsnapNewEntity alertsnapEntity = alertsnapNewRepository.findByStationIdAndAlertValue(stationId, alertvalue);
+        if (alertsnapEntity != null) {
             return alertsnapEntity.toData();
-        }else {
+        } else {
             return null;
         }
     }
 
 
     @Override
-    public AlertsnapNew findByTestingpointkey(String testingpointkey){
+    public AlertsnapNew findByTestingpointkey(String testingpointkey) {
         AlertsnapNewEntity alertsnapEntity = alertsnapNewRepository.findByTestingpointKey(testingpointkey);
-        return alertsnapEntity==null?null:alertsnapEntity.toData();
+        return alertsnapEntity == null ? null : alertsnapEntity.toData();
     }
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaElectricalTestingPointAIDao.java

@@ -1,10 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.ElectricalTestingPointAIDao;
+import com.gyee.gaia.sql.alarm.Entity.ElectricalTestingPointAIEntity;
+import com.gyee.gaia.sql.alarm.repository.ElectricalTestingPointAIRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointAI;
-import com.gyee.wisdom.dao.alarm.ElectricalTestingPointAIDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.ElectricalTestingPointAIEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.ElectricalTestingPointAIRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-
 @Component
 public class JpaElectricalTestingPointAIDao implements ElectricalTestingPointAIDao {
 
@@ -27,7 +26,7 @@ public class JpaElectricalTestingPointAIDao implements ElectricalTestingPointAID
     @Override
     public List<ElectricalTestingPointAI> findByUniformcodeNameWindpowerstationid(String uniformcode, String name, String windpowerstationid) {
 
-        return findTest(uniformcode,name,windpowerstationid);
+        return findTest(uniformcode, name, windpowerstationid);
     }
 
     public List<ElectricalTestingPointAI> findTest(String uniformcode, String name, String windpowerstationid) {
@@ -37,10 +36,10 @@ public class JpaElectricalTestingPointAIDao implements ElectricalTestingPointAID
 
                 List<Predicate> predicates = new ArrayList<>();
                 if (uniformcode != null && !uniformcode.trim().equals("")) {
-                    predicates.add(criteriaBuilder.like(root.get("uniformCode"), "%" + uniformcode + "%" ));
+                    predicates.add(criteriaBuilder.like(root.get("uniformCode"), "%" + uniformcode + "%"));
                 }
                 if (name != null && !name.trim().equals("")) {
-                    predicates.add(criteriaBuilder.like(root.get("name"),"%" + name + "%" ));
+                    predicates.add(criteriaBuilder.like(root.get("name"), "%" + name + "%"));
                 }
                 if (windpowerstationid != null && !windpowerstationid.trim().equals("")) {
                     predicates.add(criteriaBuilder.equal(root.get("windPowerStationId"), windpowerstationid));
@@ -54,5 +53,4 @@ public class JpaElectricalTestingPointAIDao implements ElectricalTestingPointAID
     }
 
 
-
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaElectricalTestingPointDIDao.java

@@ -1,10 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.ElectricalTestingPointDIDao;
+import com.gyee.gaia.sql.alarm.Entity.ElectricalTestingPointDIEntity;
+import com.gyee.gaia.sql.alarm.repository.ElectricalTestingPointDIRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointDI;
-import com.gyee.wisdom.dao.alarm.ElectricalTestingPointDIDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.ElectricalTestingPointDIEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.ElectricalTestingPointDIRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@ public class JpaElectricalTestingPointDIDao implements ElectricalTestingPointDID
     @Override
     public List<ElectricalTestingPointDI> findByUniformcodeNameWindpowerstationid(String uniformcode, String name, String windpowerstationid) {
 
-        return findTest(uniformcode,name,windpowerstationid);
+        return findTest(uniformcode, name, windpowerstationid);
     }
 
     public List<ElectricalTestingPointDI> findTest(String uniformcode, String name, String windpowerstationid) {
@@ -35,10 +35,10 @@ public class JpaElectricalTestingPointDIDao implements ElectricalTestingPointDID
 
                 List<Predicate> predicates = new ArrayList<>();
                 if (uniformcode != null && !uniformcode.trim().equals("")) {
-                    predicates.add(criteriaBuilder.like(root.get("uniformCode"), "%" + uniformcode + "%" ));
+                    predicates.add(criteriaBuilder.like(root.get("uniformCode"), "%" + uniformcode + "%"));
                 }
                 if (name != null && !name.trim().equals("")) {
-                    predicates.add(criteriaBuilder.like(root.get("name"),"%" + name + "%" ));
+                    predicates.add(criteriaBuilder.like(root.get("name"), "%" + name + "%"));
                 }
                 if (windpowerstationid != null && !windpowerstationid.trim().equals("")) {
                     predicates.add(criteriaBuilder.equal(root.get("windPowerStationId"), windpowerstationid));

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaFaultHistoryDao.java

@@ -1,10 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.FaultHistoryDao;
+import com.gyee.gaia.sql.alarm.Entity.FaultHistoryEntity;
+import com.gyee.gaia.sql.alarm.repository.FaultHistoryRepository;
 import com.gyee.wisdom.common.data.alarm.FaultHistory;
-import com.gyee.wisdom.dao.alarm.FaultHistoryDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.FaultHistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.FaultHistoryRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +20,6 @@ public class JpaFaultHistoryDao implements FaultHistoryDao {
     private FaultHistoryRepository historyRepository;
 
 
-
     @Override
     public void save(FaultHistory faultHistory) {
         historyRepository.saveAndFlush(new FaultHistoryEntity(faultHistory));
@@ -29,15 +28,15 @@ public class JpaFaultHistoryDao implements FaultHistoryDao {
     @Override
     public void save(List<FaultHistory> faultHistorys) {
         ArrayList<FaultHistoryEntity> entities = new ArrayList<>();
-        for(FaultHistory his : faultHistorys) {
+        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());
+        } catch (Exception e) {
+            log.error("--------保存报警历史信息error--------{}", e.getMessage());
         }
 
     }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaFaultSnapDao.java

@@ -1,12 +1,11 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
-import com.gyee.wisdom.common.data.DataUtil;
+import com.gyee.gaia.dao.alarm.FaultSnapDao;
+import com.gyee.gaia.sql.alarm.Entity.FaultHistoryEntity;
+import com.gyee.gaia.sql.alarm.Entity.FaultSnapEntity;
+import com.gyee.gaia.sql.alarm.repository.FaultHistoryRepository;
+import com.gyee.gaia.sql.alarm.repository.FaultSnapRepository;
 import com.gyee.wisdom.common.data.alarm.FaultSnap;
-import com.gyee.wisdom.dao.alarm.FaultSnapDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.FaultHistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.FaultSnapEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.FaultHistoryRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.FaultSnapRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -16,7 +15,7 @@ import java.util.List;
 
 @Component
 @Slf4j
-public class JpaFaultSnapDao implements FaultSnapDao{
+public class JpaFaultSnapDao implements FaultSnapDao {
     @Autowired
     private FaultSnapRepository faultSnapRepository;
 
@@ -25,29 +24,29 @@ public class JpaFaultSnapDao implements FaultSnapDao{
 
     @Override
     public FaultSnap save(FaultSnap alertsnap) {
-       return faultSnapRepository.saveAndFlush(new FaultSnapEntity(alertsnap)).toData();
+        return faultSnapRepository.saveAndFlush(new FaultSnapEntity(alertsnap)).toData();
     }
 
     @Override
     public void save(List<FaultSnap> alertsnaps) {
         ArrayList<FaultSnapEntity> entities = new ArrayList<>();
-        for(FaultSnap his : alertsnaps) {
+        for (FaultSnap his : alertsnaps) {
             FaultSnapEntity et = new FaultSnapEntity(his);
             entities.add(et);
         }
-        try{
+        try {
             List<FaultSnapEntity> results = faultSnapRepository.saveAll(entities);
             faultSnapRepository.flush();
             ArrayList<FaultHistoryEntity> hisEntities = new ArrayList<>();
-            for(FaultSnapEntity snapEntity : results) {
+            for (FaultSnapEntity snapEntity : results) {
                 FaultHistoryEntity hisE = createFaultHistoryEntity(snapEntity);
                 hisEntities.add(hisE);
             }
             faultHistoryRepository.saveAll(hisEntities);
             faultHistoryRepository.flush();
 
-        }catch (Exception e){
-            log.error("--------保存报警信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------保存报警信息error--------{}", e.getMessage());
         }
 
     }
@@ -60,7 +59,7 @@ public class JpaFaultSnapDao implements FaultSnapDao{
         his.setOperator(snap.getLastUpdatePerson());
         his.setConfirmType(0);
 
-        if (snap.getIsOpened() != 0 )
+        if (snap.getIsOpened() != 0)
             his.setMessageType(1);
         else
             his.setMessageType(3);
@@ -70,38 +69,38 @@ public class JpaFaultSnapDao implements FaultSnapDao{
 
     @Override
     public FaultSnap findByWindturbineIdAndAlertValue(String windturbineid, int alertvalue) {
-       FaultSnapEntity alertsnapEntity = faultSnapRepository.findByWindturbineIdAndAlertValue(windturbineid,alertvalue);
-        if(alertsnapEntity!=null) {
+        FaultSnapEntity alertsnapEntity = faultSnapRepository.findByWindturbineIdAndAlertValue(windturbineid, alertvalue);
+        if (alertsnapEntity != null) {
             return alertsnapEntity.toData();
-        }else {
+        } else {
             return null;
         }
     }
 
     @Override
     public FaultSnap findByStationIdAndAlertValue(String stationId, int alertvalue) {
-        FaultSnapEntity alertsnapEntity = faultSnapRepository.findByStationIdAndAlertValue(stationId,alertvalue);
-        if(alertsnapEntity!=null) {
+        FaultSnapEntity alertsnapEntity = faultSnapRepository.findByStationIdAndAlertValue(stationId, alertvalue);
+        if (alertsnapEntity != null) {
             return alertsnapEntity.toData();
-        }else {
+        } else {
             return null;
         }
     }
 
     @Override
-    public FaultSnap findByTestingpointkey(String testingpointkey){
+    public FaultSnap findByTestingpointkey(String testingpointkey) {
         FaultSnapEntity alertsnapEntity = faultSnapRepository.findByTestingpointKey(testingpointkey);
-        return alertsnapEntity==null?null:alertsnapEntity.toData();
+        return alertsnapEntity == null ? null : alertsnapEntity.toData();
     }
 
     @Override
-    public List<FaultSnap> findAllFaultWindturbineId(){
-        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;
+    public List<FaultSnap> findAllFaultWindturbineId() {
+        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;
     }
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaGyeeLineDao.java

@@ -1,32 +1,29 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.IGyeeLineDao;
+import com.gyee.gaia.sql.alarm.Entity.GyeeLineEntity;
+import com.gyee.gaia.sql.alarm.repository.GyeeLineRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeeLine;
-import com.gyee.wisdom.dao.alarm.IGyeeLineDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeeLineEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.GyeeLineRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Component
-public class JpaGyeeLineDao implements IGyeeLineDao{
+public class JpaGyeeLineDao implements IGyeeLineDao {
     @Autowired
     private GyeeLineRepository gyeelineRepository;
+
     @Override
     public List<GyeeLine> findAll() {
-        List<GyeeLine> listline=DataUtil.convertDataList(gyeelineRepository.findAll());
+        List<GyeeLine> listline = DataUtil.convertDataList(gyeelineRepository.findAll());
         return listline;
     }
 
     @Override
     public GyeeLine findById(String id) {
-        GyeeLine gyeeline=gyeelineRepository.findById(id).get().toData();
+        GyeeLine gyeeline = gyeelineRepository.findById(id).get().toData();
         return gyeeline;
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaGyeePowerStationDao.java

@@ -1,14 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.IGyeePowerStationDao;
+import com.gyee.gaia.sql.alarm.Entity.GyeePowerStationEntity;
+import com.gyee.gaia.sql.alarm.repository.GyeePowerStationRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeePowerStation;
-import com.gyee.wisdom.common.data.windturbine.PowerStation;
-import com.gyee.wisdom.dao.alarm.IGyeePowerStationDao;
-import com.gyee.wisdom.dao.sql.Windturbine.entity.PowerStationEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.PowerStationRepository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeePowerStationEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.GyeePowerStationRepository;
-import com.gyee.wisdom.dao.windturbine.IPowerStationDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -26,7 +22,7 @@ public class JpaGyeePowerStationDao implements IGyeePowerStationDao {
 
     @Override
     public List<GyeePowerStation> getAll() {
-        List<GyeePowerStationEntity> pe=gyeepowerStationRepository.findAll();
+        List<GyeePowerStationEntity> pe = gyeepowerStationRepository.findAll();
         List<GyeePowerStation> stationList = DataUtil.convertDataList(gyeepowerStationRepository.findAll());
 
         return stationList;
@@ -34,8 +30,8 @@ public class JpaGyeePowerStationDao implements IGyeePowerStationDao {
 
     @Override
     public List<GyeePowerStation> getListByPage(int pageIndex, int pageSize) {
-        Sort sort =  Sort.by(Sort.Direction.DESC, "createTime"); //创建时间降序排序
-        Pageable pageable =  PageRequest.of(pageIndex, pageSize, sort);
+        Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); //创建时间降序排序
+        Pageable pageable = PageRequest.of(pageIndex, pageSize, sort);
         Page<GyeePowerStationEntity> entityPage = gyeepowerStationRepository.findAll(pageable);
         List<GyeePowerStation> stationList = DataUtil.convertDataList(entityPage.getContent());
         return stationList;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaGyeeProjectDao.java

@@ -1,14 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.IGyeeProjectDao;
+import com.gyee.gaia.sql.alarm.Entity.GyeeProjectEntity;
+import com.gyee.gaia.sql.alarm.repository.GyeeProjectRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeeProject;
-import com.gyee.wisdom.common.data.windturbine.Project;
-import com.gyee.wisdom.dao.alarm.IGyeeProjectDao;
-import com.gyee.wisdom.dao.sql.Windturbine.entity.ProjectEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.ProjectRepository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeeProjectEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.GyeeProjectRepository;
-import com.gyee.wisdom.dao.windturbine.IProjectDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -41,7 +37,7 @@ public class JpaGyeeProjectDao implements IGyeeProjectDao {
 
     @Override
     public List<GyeeProject> findbyStationId(String stationId) {
-        List<GyeeProjectEntity> lpe=gyeeprojectRepository.findByStationIdEquals(stationId);
+        List<GyeeProjectEntity> lpe = gyeeprojectRepository.findByStationIdEquals(stationId);
         return DataUtil.convertDataList(
                 gyeeprojectRepository.findByStationIdEquals(stationId)
         );

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaGyeeWindturbineDao.java

@@ -1,23 +1,18 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.IGyeeWindturbineDao;
+import com.gyee.gaia.sql.alarm.Entity.GyeeWindturbineEntity;
+import com.gyee.gaia.sql.alarm.repository.GyeePowerStationRepository;
+import com.gyee.gaia.sql.alarm.repository.GyeeWindturbineRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeeWindturbine;
-import com.gyee.wisdom.common.data.windturbine.Windturbine;
-import com.gyee.wisdom.dao.alarm.IGyeeWindturbineDao;
-import com.gyee.wisdom.dao.sql.Windturbine.entity.WindturbineEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.PowerStationRepository;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.WindturbineRepository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeeWindturbineEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.GyeePowerStationRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.GyeeWindturbineRepository;
-import com.gyee.wisdom.dao.windturbine.IWindturbineDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 /**
- * @author songwb<songwb@aliyun.com>
+ * @author songwb<songwb @ aliyun.com>
  */
 @Component
 public class JpaGyeeWindturbineDao implements IGyeeWindturbineDao {
@@ -28,32 +23,31 @@ public class JpaGyeeWindturbineDao implements IGyeeWindturbineDao {
     private GyeePowerStationRepository powerStationRepository;
 
 
-
     @Override
     public void del(String id) {
         windturbineRepository.deleteById(id);
     }
+
     //修改暂时不接入
     @Override
     public void save(GyeeWindturbine win) {
-        GyeeWindturbineEntity we=new GyeeWindturbineEntity(win);
+        GyeeWindturbineEntity we = new GyeeWindturbineEntity(win);
         windturbineRepository.save(we);
         System.out.println();
     }
 
     @Override
     public List<GyeeWindturbine> find() {
-       return DataUtil.convertDataList(windturbineRepository.findAll());
+        return DataUtil.convertDataList(windturbineRepository.findAll());
     }
 
 
     @Override
     public GyeeWindturbine findbyid(String id) {
-       return  windturbineRepository.findById(id).get().toData();
+        return windturbineRepository.findById(id).get().toData();
     }
 
-    public List<GyeeWindturbine> findByStationId(String stationId)
-    {
+    public List<GyeeWindturbine> findByStationId(String stationId) {
         return DataUtil.convertDataList(windturbineRepository.findByWindPowerStationId(stationId));
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaScadaBJDao.java

@@ -1,10 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.ScadaBJDao;
+import com.gyee.gaia.sql.alarm.repository.ScadaBJRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ScadaBJ;
-import com.gyee.wisdom.dao.alarm.ScadaBJDao;
-import com.gyee.wisdom.dao.sql.alarm.repository.ScadaBJRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,16 +17,15 @@ public class JpaScadaBJDao implements ScadaBJDao {
 
     @Override
     public List<ScadaBJ> findAll() {
-        List<ScadaBJ> result=DataUtil.convertDataList(scadaBJRepository.findAll());
+        List<ScadaBJ> result = DataUtil.convertDataList(scadaBJRepository.findAll());
         return result;
     }
 
     @Override
-    public List<ScadaBJ>  findByEnabled(boolean enbaled) {
-        List<ScadaBJ> result=DataUtil.convertDataList(scadaBJRepository.findByEnabled(enbaled));
+    public List<ScadaBJ> findByEnabled(boolean enbaled) {
+        List<ScadaBJ> result = DataUtil.convertDataList(scadaBJRepository.findByEnabled(enbaled));
         return result;
     }
 
 
-
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaScadaFaultDao.java

@@ -1,13 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.ScadaFaultDao;
+import com.gyee.gaia.sql.alarm.repository.ScadaFaultRepository;
 import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.alarm.ScadaBJ;
 import com.gyee.wisdom.common.data.alarm.ScadaFault;
-import com.gyee.wisdom.dao.alarm.ScadaBJDao;
-import com.gyee.wisdom.dao.alarm.ScadaFaultDao;
-import com.gyee.wisdom.dao.sql.alarm.repository.ScadaBJRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.ScadaFaultRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -20,13 +17,13 @@ public class JpaScadaFaultDao implements ScadaFaultDao {
 
     @Override
     public List<ScadaFault> findAll() {
-        List<ScadaFault> result=DataUtil.convertDataList(scadaRepository.findAll());
+        List<ScadaFault> result = DataUtil.convertDataList(scadaRepository.findAll());
         return result;
     }
 
     @Override
-    public List<ScadaFault>  findByEnabled(boolean enbaled) {
-        List<ScadaFault> result=DataUtil.convertDataList(scadaRepository.findByEnabled(enbaled));
+    public List<ScadaFault> findByEnabled(boolean enbaled) {
+        List<ScadaFault> result = DataUtil.convertDataList(scadaRepository.findByEnabled(enbaled));
         return result;
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaWarningDao.java

@@ -1,17 +1,16 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.WarningDao;
+import com.gyee.gaia.sql.alarm.Entity.WarningEntity;
+import com.gyee.gaia.sql.alarm.repository.WarningClassifyRepository;
+import com.gyee.gaia.sql.alarm.repository.WarningRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.Warning;
 import com.gyee.wisdom.common.data.alarm.WarningClassify;
-import com.gyee.wisdom.dao.alarm.WarningDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.WarningClassifyRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.WarningRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-
 import java.util.List;
 
 @Component
@@ -64,6 +63,7 @@ public class JpaWarningDao implements WarningDao {
     public List<Warning> findByModelId(String modelid) {
         return DataUtil.convertDataList(warningRepository.findByModelId(modelid));
     }
+
     @Override
     public List<Warning> findByModelIdIn(String[] modelids) {
         return DataUtil.convertDataList(warningRepository.findByModelIdIn(modelids));
@@ -73,6 +73,7 @@ public class JpaWarningDao implements WarningDao {
     public List<Warning> findByIsReset(Integer isReset) {
         return DataUtil.convertDataList(warningRepository.findByIsReset(isReset));
     }
+
     @Override
     public List<Warning> findByEnabled(Integer enabled) {
         return DataUtil.convertDataList(warningRepository.findByEnabled(enabled));

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaWarningfjDao.java

@@ -1,31 +1,30 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
 
+import com.gyee.gaia.dao.alarm.WarningfjDao;
+import com.gyee.gaia.sql.alarm.Entity.WarningfjEntity;
+import com.gyee.gaia.sql.alarm.repository.WarningfjRepository;
 import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.alarm.Warning;
 import com.gyee.wisdom.common.data.alarm.Warningfj;
-import com.gyee.wisdom.dao.alarm.WarningfjDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningfjEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.WarningfjRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-
 import java.util.List;
 
 @Component
 public class JpaWarningfjDao implements WarningfjDao {
     @Autowired
     private WarningfjRepository warningfjRepository;
+
     @Override
     public List<Warningfj> findAll() {
-        List<Warningfj> warning=DataUtil.convertDataList(warningfjRepository.findAll());
+        List<Warningfj> warning = DataUtil.convertDataList(warningfjRepository.findAll());
         return warning;
     }
 
     @Override
     public Warningfj findById(String id) {
-        Warningfj warning=warningfjRepository.findById(id).get().toData();
+        Warningfj warning = warningfjRepository.findById(id).get().toData();
         return warning;
     }
 
@@ -46,14 +45,14 @@ public class JpaWarningfjDao implements WarningfjDao {
     }
 
     @Override
-    public Warningfj findByEdnavalueAndModelId(int ednavalue,String modelId){
-        List<WarningfjEntity> warningfjEntityList = warningfjRepository.findByEdnaValueAndModelId(ednavalue,modelId);
-        WarningfjEntity warningfjEntity= new WarningfjEntity();
-        if(warningfjEntityList.size() != 0){
-            warningfjEntity=warningfjEntityList.get(0);
-        }else{
+    public Warningfj findByEdnavalueAndModelId(int ednavalue, String modelId) {
+        List<WarningfjEntity> warningfjEntityList = warningfjRepository.findByEdnaValueAndModelId(ednavalue, modelId);
+        WarningfjEntity warningfjEntity = new WarningfjEntity();
+        if (warningfjEntityList.size() != 0) {
+            warningfjEntity = warningfjEntityList.get(0);
+        } else {
             return null;
         }
-            return warningfjEntity.toData();
-        }
+        return warningfjEntity.toData();
+    }
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaWarningrecordsDao.java

@@ -1,11 +1,9 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
-import com.gyee.wisdom.common.data.alarm.Alerthistory;
+import com.gyee.gaia.dao.alarm.WarningrecordsDao;
+import com.gyee.gaia.sql.alarm.Entity.WarningrecordsEntity;
+import com.gyee.gaia.sql.alarm.repository.WarningrecordsRepository;
 import com.gyee.wisdom.common.data.alarm.Warningrecords;
-import com.gyee.wisdom.dao.alarm.WarningrecordsDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningrecordsEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.WarningrecordsRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,23 +27,23 @@ public class JpaWarningrecordsDao implements WarningrecordsDao {
     public void saveList(Warningrecords warningrecords) {
         try {
             warningrecordsRepository.saveAndFlush(new WarningrecordsEntity(warningrecords));
-        }catch (Exception e){
-            log.error("--------warningrecordsRepository信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------warningrecordsRepository信息error--------{}", e.getMessage());
         }
     }
 
     @Override
     public void batchSave(List<Warningrecords> lst) {
         ArrayList<WarningrecordsEntity> entities = new ArrayList<>();
-        for(Warningrecords his : lst) {
+        for (Warningrecords his : lst) {
             WarningrecordsEntity et = new WarningrecordsEntity(his);
             entities.add(et);
         }
         try {
             warningrecordsRepository.saveAll(entities);
             warningrecordsRepository.flush();
-        }catch (Exception e){
-            log.error("--------保存报警历史信息error--------{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("--------保存报警历史信息error--------{}", e.getMessage());
         }
     }
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaWarningsyzDao.java

@@ -1,12 +1,10 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
+
+import com.gyee.gaia.dao.alarm.WarningsyzDao;
+import com.gyee.gaia.sql.alarm.Entity.WarningsyzEntity;
+import com.gyee.gaia.sql.alarm.repository.WarningsyzRepository;
 import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.alarm.Warningfj;
 import com.gyee.wisdom.common.data.alarm.Warningsyz;
-import com.gyee.wisdom.dao.alarm.WarningsyzDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningfjEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningsyzEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.WarningfjRepository;
-import com.gyee.wisdom.dao.sql.alarm.repository.WarningsyzRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -16,15 +14,16 @@ import java.util.List;
 public class JpaWarningsyzDao implements WarningsyzDao {
     @Autowired
     private WarningsyzRepository warningsyzRepository;
+
     @Override
     public List<Warningsyz> findAll() {
-        List<Warningsyz> warning= DataUtil.convertDataList(warningsyzRepository.findAll());
+        List<Warningsyz> warning = DataUtil.convertDataList(warningsyzRepository.findAll());
         return warning;
     }
 
     @Override
     public Warningsyz findById(String id) {
-        Warningsyz warningsyz=warningsyzRepository.findById(id).get().toData();
+        Warningsyz warningsyz = warningsyzRepository.findById(id).get().toData();
         return warningsyz;
     }
 
@@ -45,11 +44,12 @@ public class JpaWarningsyzDao implements WarningsyzDao {
     }
 
     @Override
-    public Warningsyz findByDescription(String description){
+    public Warningsyz findByDescription(String description) {
         return warningsyzRepository.findByDescription(description).toData();
     }
+
     @Override
-    public Warningsyz findByPointkey(String id){
+    public Warningsyz findByPointkey(String id) {
         return warningsyzRepository.findByPointkey(id).toData();
     }
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaWindturbinetestingpointAiDao.java

@@ -1,9 +1,9 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.WindturbinetestingpointAiDao;
+import com.gyee.gaia.sql.alarm.repository.WindturbinetestingpointAiRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointAi;
-import com.gyee.wisdom.dao.alarm.WindturbinetestingpointAiDao;
-import com.gyee.wisdom.dao.sql.alarm.repository.WindturbinetestingpointAiRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,11 +17,11 @@ public class JpaWindturbinetestingpointAiDao implements WindturbinetestingpointA
 
     @Override
     public List<WindturbineTestingpointAi> getWindturbinetestingpointAiByModelAndUniformcode(String model, String uniformcode) {
-       return DataUtil.convertDataList(windturbinetestingpointAiRepository.getWindturbinetestingpointAiByModelAndUniformcode(model,uniformcode));
+        return DataUtil.convertDataList(windturbinetestingpointAiRepository.getWindturbinetestingpointAiByModelAndUniformcode(model, uniformcode));
     }
 
     @Override
     public List<WindturbineTestingpointAi> getWindturbinetestingpointAiByModelAndUniformcodeIn(String model, String[] uniformcodes) {
-        return DataUtil.convertDataList(windturbinetestingpointAiRepository.getWindturbinetestingpointAiByModelAndUniformcodeIn(model,uniformcodes));
+        return DataUtil.convertDataList(windturbinetestingpointAiRepository.getWindturbinetestingpointAiByModelAndUniformcodeIn(model, uniformcodes));
     }
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/JpaWindturbinetestingpointDiDao.java

@@ -1,41 +1,43 @@
-package com.gyee.wisdom.dao.sql.alarm;
+package com.gyee.gaia.sql.alarm;
 
+import com.gyee.gaia.dao.alarm.WindturbinetestingpointDiDao;
+import com.gyee.gaia.sql.alarm.Entity.WindturbineTestingpointDiEntity;
+import com.gyee.gaia.sql.alarm.repository.WindturbinetestingpointDiRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointDi;
-import com.gyee.wisdom.dao.alarm.WindturbinetestingpointDiDao;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WindturbineTestingpointDiEntity;
-import com.gyee.wisdom.dao.sql.alarm.repository.WindturbinetestingpointDiRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+
 @Component
 public class JpaWindturbinetestingpointDiDao implements WindturbinetestingpointDiDao {
     @Autowired
     private WindturbinetestingpointDiRepository windturbinetestingpointDiRepository;
+
     @Override
     public List<WindturbineTestingpointDi> findAll() {
-        List<WindturbineTestingpointDi> windturbinetestingpointDiEntityList= DataUtil.convertDataList(windturbinetestingpointDiRepository.findAll());
+        List<WindturbineTestingpointDi> windturbinetestingpointDiEntityList = DataUtil.convertDataList(windturbinetestingpointDiRepository.findAll());
         return windturbinetestingpointDiEntityList;
     }
 
     @Override
     public WindturbineTestingpointDi findById(String id) {
-        WindturbineTestingpointDi windturbineTestingpointDi=windturbinetestingpointDiRepository.findById(id).get().toData();
+        WindturbineTestingpointDi windturbineTestingpointDi = windturbinetestingpointDiRepository.findById(id).get().toData();
         return windturbineTestingpointDi;
     }
 
     @Override
     public List<WindturbineTestingpointDi> getAllWindturbinetestingpointDiByWindpowerstationId(String windpowerstationid) {
-        return  DataUtil.convertDataList(windturbinetestingpointDiRepository.getAllWindturbinetestingpointDiByWindpowerstationId(windpowerstationid));
+        return DataUtil.convertDataList(windturbinetestingpointDiRepository.getAllWindturbinetestingpointDiByWindpowerstationId(windpowerstationid));
     }
 
     @Override
     public List<WindturbineTestingpointDi> findByUniformcode(String id) {
         List<WindturbineTestingpointDiEntity> windturbineTestingpointDiEntityList = windturbinetestingpointDiRepository.findByUniformcode(id);
-        List<WindturbineTestingpointDi> windturbineTestingpointDiList =new ArrayList<>();
-        for(WindturbineTestingpointDiEntity windturbineTestingpointDiEntity:windturbineTestingpointDiEntityList){
+        List<WindturbineTestingpointDi> windturbineTestingpointDiList = new ArrayList<>();
+        for (WindturbineTestingpointDiEntity windturbineTestingpointDiEntity : windturbineTestingpointDiEntityList) {
             windturbineTestingpointDiList.add(windturbineTestingpointDiEntity.toData());
         }
         return windturbineTestingpointDiList;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/AlertRuleRepository.java

@@ -1,5 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertRuleEntity;
+package com.gyee.gaia.sql.alarm.repository;
+
+import com.gyee.gaia.sql.alarm.Entity.AlertRuleEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/AlerthistoryNewRepository.java

@@ -1,8 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryNewEntity;
+import com.gyee.gaia.sql.alarm.Entity.AlerthistoryNewEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/AlerthistoryRepository.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlerthistoryEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapEntity;
+import com.gyee.gaia.sql.alarm.Entity.AlerthistoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/AlertsnapNewRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapNewEntity;
+package com.gyee.gaia.sql.alarm.repository;
+
+import com.gyee.gaia.sql.alarm.Entity.AlertsnapNewEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -11,7 +11,10 @@ public interface AlertsnapNewRepository extends JpaRepository<AlertsnapNewEntity
 
 
     AlertsnapNewEntity findByWindturbineIdAndAlertValue(String windturbineId, int alertValue);
+
     AlertsnapNewEntity findByStationIdAndAlertValue(String stationId, int alertValue);
+
     AlertsnapNewEntity findByTestingpointKey(String testingpointkey);
+
     int countById(Long id);
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/AlertsnapRepository.java

@@ -1,16 +1,18 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertsnapEntity;
+package com.gyee.gaia.sql.alarm.repository;
+
+import com.gyee.gaia.sql.alarm.Entity.AlertsnapEntity;
 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 AlertsnapRepository extends JpaRepository<AlertsnapEntity, Long>, JpaSpecificationExecutor {
     AlertsnapEntity findAllById(Long id);
-    AlertsnapEntity findByWindturbineIdAndAlertValue(String windturbineId,int alertValue);
-    AlertsnapEntity findByStationIdAndAlertValue(String stationId,int alertValue);
+
+    AlertsnapEntity findByWindturbineIdAndAlertValue(String windturbineId, int alertValue);
+
+    AlertsnapEntity findByStationIdAndAlertValue(String stationId, int alertValue);
+
     AlertsnapEntity findByTestingpointKey(String testingpointkey);
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/ElectricalTestingPointAIRepository.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.common.data.point.ElectricalTestingPoint;
-import com.gyee.wisdom.dao.sql.alarm.Entity.ElectricalTestingPointAIEntity;
+import com.gyee.gaia.sql.alarm.Entity.ElectricalTestingPointAIEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/ElectricalTestingPointDIRepository.java

@@ -1,13 +1,11 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
 
-import com.gyee.wisdom.dao.sql.alarm.Entity.ElectricalTestingPointDIEntity;
+import com.gyee.gaia.sql.alarm.Entity.ElectricalTestingPointDIEntity;
 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 ElectricalTestingPointDIRepository extends JpaRepository<ElectricalTestingPointDIEntity, String>, JpaSpecificationExecutor {
     ElectricalTestingPointDIEntity findAllById(String id);

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/FaultHistoryRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.dao.sql.alarm.Entity.FaultHistoryEntity;
+import com.gyee.gaia.sql.alarm.Entity.FaultHistoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/FaultSnapRepository.java

@@ -1,5 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.FaultSnapEntity;
+package com.gyee.gaia.sql.alarm.repository;
+
+import com.gyee.gaia.sql.alarm.Entity.FaultSnapEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -18,6 +19,6 @@ public interface FaultSnapRepository extends JpaRepository<FaultSnapEntity, Long
     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")
+    @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();
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/GyeeLineRepository.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.dao.sql.Windturbine.entity.LineEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeeLineEntity;
+import com.gyee.gaia.sql.alarm.Entity.GyeeLineEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -12,6 +11,6 @@ import java.util.List;
 @Repository
 public interface GyeeLineRepository extends JpaRepository<GyeeLineEntity, String>, JpaSpecificationExecutor {
 
-   List<GyeeLineEntity> findFirstByProjectId(String projectId);
+    List<GyeeLineEntity> findFirstByProjectId(String projectId);
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/GyeePowerStationRepository.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.dao.sql.Windturbine.entity.PowerStationEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeePowerStationEntity;
+import com.gyee.gaia.sql.alarm.Entity.GyeePowerStationEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/GyeeProjectRepository.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.dao.sql.Windturbine.entity.ProjectEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeeProjectEntity;
+import com.gyee.gaia.sql.alarm.Entity.GyeeProjectEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -12,7 +11,7 @@ import java.util.List;
 @Repository
 public interface GyeeProjectRepository extends JpaRepository<GyeeProjectEntity, String>, JpaSpecificationExecutor {
 
-  /*  ModelEntity findFirstByUserName(String userName);*/
+    /*  ModelEntity findFirstByUserName(String userName);*/
     List<GyeeProjectEntity> findByStationIdEquals(String stationId);
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/GyeeWindturbineRepository.java

@@ -1,7 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
+package com.gyee.gaia.sql.alarm.repository;
 
-import com.gyee.wisdom.dao.sql.Windturbine.entity.WindturbineEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.GyeeWindturbineEntity;
+import com.gyee.gaia.sql.alarm.Entity.GyeeWindturbineEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -12,7 +11,7 @@ import java.util.List;
 @Repository
 public interface GyeeWindturbineRepository extends JpaRepository<GyeeWindturbineEntity, String>, JpaSpecificationExecutor {
 
-  /*  ModelEntity findFirstByUserName(String userName);*/
-  List<GyeeWindturbineEntity> findByWindPowerStationId(String stationId);
+    /*  ModelEntity findFirstByUserName(String userName);*/
+    List<GyeeWindturbineEntity> findByWindPowerStationId(String stationId);
 
 }

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/ScadaBJRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.AlertRuleEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.ScadaBJEntity;
+package com.gyee.gaia.sql.alarm.repository;
+
+import com.gyee.gaia.sql.alarm.Entity.ScadaBJEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/alarm/repository/ScadaFaultRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.ScadaBJEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.ScadaFaultEntity;
+package com.gyee.gaia.sql.alarm.repository;
+
+import com.gyee.gaia.sql.alarm.Entity.ScadaFaultEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;