部分实体类修改6

state/wind/src/main/java/com/gyee/gaia/state/wind/service/Status8Service.java

@@ -1,8 +1,8 @@
 package com.gyee.gaia.state.wind.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.gaia.sql.Windturbine.IEquipmentService;
-import com.gyee.gaia.sql.point.ITestingPointService;
+import com.gyee.gaia.dao.sql.Windturbine.IEquipmentService;
+import com.gyee.gaia.dao.sql.point.ITestingPointService;
 import com.gyee.gaia.state.wind.config.Status8Properties;
 import com.gyee.gaia.state.wind.config.WindturbineGroup;
 import com.gyee.gaia.state.wind.entity.StationInfo;

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/point/TestingPointMapper.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.point;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.wisdom.common.data.point.TestingPoint;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.gyee.wisdom.common.data.point.TestingPoint;
  * @author gfhd
  * @since 2023-04-24
  */
+@Mapper
 public interface TestingPointMapper extends BaseMapper<TestingPoint> {
 
 }

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/windturbine/EquipmentMapper.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.wisdom.common.data.windturbine.Equipment;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.gyee.wisdom.common.data.windturbine.Equipment;
  * @author gfhd
  * @since 2023-04-23
  */
+@Mapper
 public interface EquipmentMapper extends BaseMapper<Equipment> {
 
 }

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/windturbine/LineMapper.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.wisdom.common.data.windturbine.Line;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.gyee.wisdom.common.data.windturbine.Line;
  * @author gfhd
  * @since 2023-04-23
  */
+@Mapper
 public interface LineMapper extends BaseMapper<Line> {
 
 }

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/windturbine/PowerstationMapper.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.wisdom.common.data.windturbine.Powerstation;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.gyee.wisdom.common.data.windturbine.Powerstation;
  * @author gfhd
  * @since 2023-04-23
  */
+@Mapper
 public interface PowerstationMapper extends BaseMapper<Powerstation> {
 
 }

timeseries/dao-interface/src/main/java/com/gyee/gaia/dao/windturbine/ProjectMapper.java

@@ -2,6 +2,7 @@ package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gyee.wisdom.common.data.windturbine.Project;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.gyee.wisdom.common.data.windturbine.Project;
  * @author gfhd
  * @since 2023-04-23
  */
+@Mapper
 public interface ProjectMapper extends BaseMapper<Project> {
 
 }

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/ModelConstants.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql;
+package com.gyee.gaia.dao.sql;
 
 /**
  * 字符串常量池

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/EquipmentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.gaia.dao.windturbine.EquipmentMapper;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/IEquipmentService.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.wisdom.common.data.windturbine.Equipment;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/ILineService.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.wisdom.common.data.windturbine.Line;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/IPowerstationService.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.wisdom.common.data.windturbine.Powerstation;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/IProjectService.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.wisdom.common.data.windturbine.Project;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/LineServiceImpl.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.gaia.dao.windturbine.LineMapper;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/PowerstationServiceImpl.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.gaia.dao.windturbine.PowerstationMapper;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/Windturbine/ProjectServiceImpl.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.Windturbine;
+package com.gyee.gaia.dao.sql.Windturbine;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.gaia.dao.windturbine.ProjectMapper;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.alarm.Entity;
+package com.gyee.gaia.dao.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/gaia/sql/alarm/Entity/FaultHistoryEntity.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/alarm/Entity/WarningrecordsEntity.java

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

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

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

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/alarm/Entity/WindturbineTestingpointAiEntity.java

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

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

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

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 
 import com.gyee.gaia.dao.alarm.AlertRuleDao;
-import com.gyee.gaia.sql.alarm.repository.AlertRuleRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.AlertRuleRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.AlertRule;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,9 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 
+import com.gyee.gaia.dao.sql.alarm.Entity.AlerthistoryEntity;
 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.gaia.dao.sql.alarm.repository.AlerthistoryRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.Alerthistory;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,9 +1,9 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.AlerthistoryNewEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.AlerthistoryNewRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,11 +1,11 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 
+import com.gyee.gaia.dao.sql.alarm.Entity.AlerthistoryEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.AlertsnapEntity;
 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.gaia.dao.sql.alarm.repository.AlerthistoryRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.AlertsnapRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.Alertsnap;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,9 +1,9 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 
+import com.gyee.gaia.dao.sql.alarm.Entity.AlertsnapNewEntity;
 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.gaia.dao.sql.alarm.repository.AlertsnapNewRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.AlertsnapNew;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.ElectricalTestingPointAIEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.ElectricalTestingPointAIRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointAI;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
+import com.gyee.gaia.dao.sql.alarm.Entity.ElectricalTestingPointDIEntity;
 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.gaia.dao.sql.alarm.repository.ElectricalTestingPointDIRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointDI;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,9 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.FaultHistoryEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.FaultHistoryRepository;
 import com.gyee.wisdom.common.data.alarm.FaultHistory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 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.gaia.dao.sql.alarm.Entity.FaultHistoryEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.FaultSnapEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.FaultHistoryRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.FaultSnapRepository;
 import com.gyee.wisdom.common.data.alarm.FaultSnap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.GyeeLineEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.GyeeLineRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeeLine;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
+import com.gyee.gaia.dao.sql.alarm.Entity.GyeePowerStationEntity;
 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.gaia.dao.sql.alarm.repository.GyeePowerStationRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeePowerStation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
+import com.gyee.gaia.dao.sql.alarm.Entity.GyeeProjectEntity;
 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.gaia.dao.sql.alarm.repository.GyeeProjectRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeeProject;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,9 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
+import com.gyee.gaia.dao.sql.alarm.Entity.GyeeWindturbineEntity;
 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.gaia.dao.sql.alarm.repository.GyeePowerStationRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.GyeeWindturbineRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.GyeeWindturbine;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 
 import com.gyee.gaia.dao.alarm.ScadaBJDao;
-import com.gyee.gaia.sql.alarm.repository.ScadaBJRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.ScadaBJRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ScadaBJ;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 
 import com.gyee.gaia.dao.alarm.ScadaFaultDao;
-import com.gyee.gaia.sql.alarm.repository.ScadaFaultRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.ScadaFaultRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.ScadaFault;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.WarningEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.WarningClassifyRepository;
+import com.gyee.gaia.dao.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;

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

@@ -1,9 +1,9 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.WarningfjEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.WarningfjRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.Warningfj;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
+import com.gyee.gaia.dao.sql.alarm.Entity.WarningrecordsEntity;
 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.gaia.dao.sql.alarm.repository.WarningrecordsRepository;
 import com.gyee.wisdom.common.data.alarm.Warningrecords;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.WarningsyzEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.WarningsyzRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.Warningsyz;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.sql.alarm;
 
 import com.gyee.gaia.dao.alarm.WindturbinetestingpointAiDao;
-import com.gyee.gaia.sql.alarm.repository.WindturbinetestingpointAiRepository;
+import com.gyee.gaia.dao.sql.alarm.repository.WindturbinetestingpointAiRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointAi;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.alarm;
+package com.gyee.gaia.dao.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.gaia.dao.sql.alarm.Entity.WindturbineTestingpointDiEntity;
+import com.gyee.gaia.dao.sql.alarm.repository.WindturbinetestingpointDiRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointDi;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.AlertRuleEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/AlerthistoryNewRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.AlerthistoryNewEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/AlerthistoryRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.AlerthistoryEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/AlertsnapNewRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.AlertsnapNewEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.AlertsnapNewEntity;
 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/gaia/sql/alarm/repository/AlertsnapRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.AlertsnapEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.AlertsnapEntity;
 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/gaia/sql/alarm/repository/ElectricalTestingPointAIRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.ElectricalTestingPointAIEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/ElectricalTestingPointDIRepository.java

@@ -1,7 +1,7 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
 
-import com.gyee.gaia.sql.alarm.Entity.ElectricalTestingPointDIEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.ElectricalTestingPointDIEntity;
 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/gaia/sql/alarm/repository/FaultHistoryRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.FaultHistoryEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/FaultSnapRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.FaultSnapEntity;
+import com.gyee.gaia.dao.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;

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

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.GyeeLineEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.GyeeLineEntity;
 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/gaia/sql/alarm/repository/GyeePowerStationRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.GyeePowerStationEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/GyeeProjectRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.GyeeProjectEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.GyeeProjectEntity;
 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/gaia/sql/alarm/repository/GyeeWindturbineRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.GyeeWindturbineEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.GyeeWindturbineEntity;
 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/gaia/sql/alarm/repository/ScadaBJRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.ScadaBJEntity;
+import com.gyee.gaia.dao.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/gaia/sql/alarm/repository/ScadaFaultRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.ScadaFaultEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.ScadaFaultEntity;
 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/gaia/sql/alarm/repository/WarningClassifyRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WarningClassifyEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WarningClassifyEntity;
 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/gaia/sql/alarm/repository/WarningRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WarningEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WarningEntity;
 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/gaia/sql/alarm/repository/WarningfjRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WarningfjEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WarningfjEntity;
 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/gaia/sql/alarm/repository/WarningrecordsRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WarningrecordsEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WarningrecordsEntity;
 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/gaia/sql/alarm/repository/WarningsyzRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WarningsyzEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WarningsyzEntity;
 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/gaia/sql/alarm/repository/WindturbinetestingpointAiRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WindturbineTestingpointAiEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WindturbineTestingpointAiEntity;
 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/gaia/sql/alarm/repository/WindturbinetestingpointDiRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.alarm.repository;
+package com.gyee.gaia.dao.sql.alarm.repository;
 
-import com.gyee.gaia.sql.alarm.Entity.WindturbineTestingpointDiEntity;
+import com.gyee.gaia.dao.sql.alarm.Entity.WindturbineTestingpointDiEntity;
 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/gaia/sql/control/JpaControlLogDao.java

@@ -1,8 +1,8 @@
-package com.gyee.gaia.sql.control;
+package com.gyee.gaia.dao.sql.control;
 
 import com.gyee.gaia.dao.control.IControlLogDao;
-import com.gyee.gaia.sql.control.entity.ControlLogEntity;
-import com.gyee.gaia.sql.control.repository.ControlLogRepository;
+import com.gyee.gaia.dao.sql.control.entity.ControlLogEntity;
+import com.gyee.gaia.dao.sql.control.repository.ControlLogRepository;
 import com.gyee.wisdom.common.data.control.ControlLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/control/JpaGycpCmdInfoDao.java

@@ -1,7 +1,7 @@
-package com.gyee.gaia.sql.control;
+package com.gyee.gaia.dao.sql.control;
 
 import com.gyee.gaia.dao.control.IGycpCmdInfoDao;
-import com.gyee.gaia.sql.control.repository.GycpCmdInfoRepository;
+import com.gyee.gaia.dao.sql.control.repository.GycpCmdInfoRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.control.GycpCmdInfo;
 import org.springframework.beans.factory.annotation.Autowired;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/control/JpaInputOrOutputSpeedTotalDao.java

@@ -1,7 +1,7 @@
-package com.gyee.gaia.sql.control;
+package com.gyee.gaia.dao.sql.control;
 
 import com.gyee.gaia.dao.control.IInputOrOutputSpeedTotalDao;
-import com.gyee.gaia.sql.control.repository.InputOrOutputSpeedTotalRepository;
+import com.gyee.gaia.dao.sql.control.repository.InputOrOutputSpeedTotalRepository;
 import com.gyee.wisdom.common.data.DataUtil;
 import com.gyee.wisdom.common.data.control.InputOrOutputSpeedTotal;
 import org.springframework.beans.factory.annotation.Autowired;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/control/entity/ControlLogEntity.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.control.entity;
+package com.gyee.gaia.dao.sql.control.entity;
 
-import com.gyee.gaia.sql.ModelConstants;
+import com.gyee.gaia.dao.sql.ModelConstants;
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.control.ControlLog;
 import lombok.Data;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/control/entity/GycpCmdInfoEntity.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.control.entity;
+package com.gyee.gaia.dao.sql.control.entity;
 
-import com.gyee.gaia.sql.ModelConstants;
+import com.gyee.gaia.dao.sql.ModelConstants;
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.control.GycpCmdInfo;
 import lombok.Data;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/control/entity/InputOrOutputSpeedTotalEntity.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.control.entity;
+package com.gyee.gaia.dao.sql.control.entity;
 
-import com.gyee.gaia.sql.ModelConstants;
+import com.gyee.gaia.dao.sql.ModelConstants;
 import com.gyee.wisdom.common.data.ToData;
 import com.gyee.wisdom.common.data.control.InputOrOutputSpeedTotal;
 import lombok.Data;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/control/repository/ControlLogRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.control.repository;
+package com.gyee.gaia.dao.sql.control.repository;
 
-import com.gyee.gaia.sql.control.entity.ControlLogEntity;
+import com.gyee.gaia.dao.sql.control.entity.ControlLogEntity;
 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/gaia/sql/control/repository/GycpCmdInfoRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.control.repository;
+package com.gyee.gaia.dao.sql.control.repository;
 
-import com.gyee.gaia.sql.control.entity.GycpCmdInfoEntity;
+import com.gyee.gaia.dao.sql.control.entity.GycpCmdInfoEntity;
 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/gaia/sql/control/repository/InputOrOutputSpeedTotalRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.control.repository;
+package com.gyee.gaia.dao.sql.control.repository;
 
-import com.gyee.gaia.sql.control.entity.InputOrOutputSpeedTotalEntity;
+import com.gyee.gaia.dao.sql.control.entity.InputOrOutputSpeedTotalEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

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

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

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/feature/entity/FeatureStatEntity.java

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

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/feature/repository/FeatureStatRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.feature.repository;
+package com.gyee.gaia.dao.sql.feature.repository;
 
-import com.gyee.gaia.sql.feature.entity.FeatureStatEntity;
+import com.gyee.gaia.dao.sql.feature.entity.FeatureStatEntity;
 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/gaia/sql/lobsystem/entity/SystemAlertHistoryEntity.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.lobsystem.entity;
+package com.gyee.gaia.dao.sql.lobsystem.entity;
 
-import com.gyee.gaia.sql.ModelConstants;
+import com.gyee.gaia.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/lobsystem/entity/SystemAlertRuleEntity.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.lobsystem.entity;
+package com.gyee.gaia.dao.sql.lobsystem.entity;
 
-import com.gyee.gaia.sql.ModelConstants;
+import com.gyee.gaia.dao.sql.ModelConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/lobsystem/entity/SystemAlertSnapEntity.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.lobsystem.entity;
+package com.gyee.gaia.dao.sql.lobsystem.entity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/lobsystem/entity/SystemLobEntity.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.lobsystem.entity;
+package com.gyee.gaia.dao.sql.lobsystem.entity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/lobsystem/entity/SystemTestingPointEntity.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.lobsystem.entity;
+package com.gyee.gaia.dao.sql.lobsystem.entity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/lobsystem/entity/SystemThingEntity.java

@@ -1,4 +1,4 @@
-package com.gyee.gaia.sql.lobsystem.entity;
+package com.gyee.gaia.dao.sql.lobsystem.entity;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

timeseries/dao-sql/src/main/java/com/gyee/gaia/sql/lobsystem/repository/SystemAlertHistoryRepository.java

@@ -1,6 +1,6 @@
-package com.gyee.gaia.sql.lobsystem.repository;
+package com.gyee.gaia.dao.sql.lobsystem.repository;
 
-import com.gyee.gaia.sql.lobsystem.entity.SystemAlertHistoryEntity;
+import com.gyee.gaia.dao.sql.lobsystem.entity.SystemAlertHistoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;