部分实体类修改3

common/data/build.gradle

@@ -2,4 +2,5 @@ buildscript {
 }
 
 dependencies {
-}
+    api "com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion"
+}

common/data/src/main/java/com/gyee/wisdom/common/data/windturbine/EquipmentModel.java

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

common/data/src/main/java/com/gyee/wisdom/common/data/windturbine/Windturbine.java

@@ -1,29 +0,0 @@
-package com.gyee.wisdom.common.data.windturbine;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class Windturbine  implements Serializable{
-    private String id;
-    private String code;
-    private String windPowerStationId;
-    private Double longitude;
-    private Double latitude;
-    private String modelId;
-    private String status;
-    private String projectId;
-    private String lineId;
-    private Date firstIntegratedTime;
-    private String photo;
-    private String name;
-    private String standardId;
-    private Line line;
-    private EquipmentModel model;
-    public String getCodeToName(){
-        return name.replaceAll("第\\S*台风机",code+"风机");
-    }
-}

electricity/meter/README.md

@@ -1,9 +1,10 @@
 # gaia
-## electricity  发电量计算
+
+## electricity 发电量计算
+
 ### meter 电计量数据读取、实际发电量、用电量等电量指标的计算
 
-1. 对照底码表，实现线路发电量、场站发电量、上网电量、购网电量、厂用电量的计算
-2、实现风机的日发电量、场站scada发电量
+1. 对照底码表，实现线路发电量、场站发电量、上网电量、购网电量、厂用电量的计算 2、实现风机的日发电量、场站scada发电量
 
 
 

electricity/meter/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {
@@ -31,11 +32,11 @@ dependencies {
 //    implementation("$bootGroup:spring-boot-starter-websocket")
 
 
-    implementation ("org.postgresql:postgresql:$postgresqlDriverVersion")
+    implementation("org.postgresql:postgresql:$postgresqlDriverVersion")
     implementation "com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion"
     implementation "com.baomidou:mybatis-plus-generator:$mybatisPlusVersion"
-    implementation ("com.alibaba:druid:$alibabaDruidVersion")
-    implementation ("com.alibaba:fastjson:$fastjsonVersion")
+    implementation("com.alibaba:druid:$alibabaDruidVersion")
+    implementation("com.alibaba:fastjson:$fastjsonVersion")
 
     implementation("$bootGroup:spring-boot-starter-test")
     implementation("com.xuxueli:xxl-job-core:$xxlJobVersion")

gradle.properties

@@ -1,10 +1,8 @@
 group=com.gyee.gaia
 version=1.0.0
 description=Gyee first micoroservice project
-
 sourceCompatibility=1.8
 targetCompatibility=1.8
-
 # Abbr
 bootGroup=org.springframework.boot
 cloudGroup=org.springframework.cloud
@@ -44,5 +42,5 @@ postgresqlDriverVersion=42.4.0
 taosVersion2=2.0.39
 taosVersion3=3.0.3
 xxlJobVersion=2.3.0
-mybatisPlusVersion=3.1.1
+mybatisPlusVersion=3.5.2
 jedisVersion=4.2.3

state/wind/README.md

@@ -1,5 +1,7 @@
 # gaia
-## state  电力设备运行状态计算
+
+## state 电力设备运行状态计算
+
 ### wind 风机机风电场状态计算
 
 

state/wind/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {
@@ -25,20 +26,18 @@ dependencyManagement {
 dependencies {
     implementation project(":common:utils")
     implementation project(":common:data")
+    implementation project(":timeseries:dao-interface")
+    implementation project(":timeseries:dao-sql")
 
     implementation("$bootGroup:spring-boot-starter-web")
     implementation("$bootGroup:spring-boot-starter-undertow")
     implementation("$bootGroup:spring-boot-starter-websocket")
-    implementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-jul:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-api:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion")
-
-    implementation ("org.postgresql:postgresql:$postgresqlDriverVersion")
-    implementation "com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion"
-    implementation "com.baomidou:mybatis-plus-generator:$mybatisPlusVersion"
-    implementation ("com.alibaba:druid:$alibabaDruidVersion")
-    implementation ("com.alibaba:fastjson:$fastjsonVersion")
+
+    implementation("org.postgresql:postgresql:$postgresqlDriverVersion")
+//    implementation "com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion"
+//    implementation "com.baomidou:mybatis-plus-generator:$mybatisPlusVersion"
+    implementation("com.alibaba:druid:$alibabaDruidVersion")
+    implementation("com.alibaba:fastjson:$fastjsonVersion")
 
     implementation("$bootGroup:spring-boot-starter-test")
     implementation("com.xuxueli:xxl-job-core:$xxlJobVersion")

state/wind/src/main/resources/application-nx.yaml

@@ -0,0 +1,141 @@
+calculate:
+  status8:
+    serviceUrl: http://192.168.1.82:8011/ts
+    #离线判定时间（单位：秒）
+    offlineInterval: 300
+    #扫描线程轮询时间（单位：毫秒）
+    readThreadInterval: 1000
+    #计算线程轮询时间（单位：毫秒）
+    calcThreadInterval: 1000
+    #风机的8种原始状态：0-停机、 1-上电、2-待机、3-启动、4-并网、5-故障、6-维护、 7-离线
+    fjztUniformCode: FJZT8
+    gzztUniformCode: GZZT
+    tjtsUniformCode: TJTS8
+    sdtsUniformCode: SDTS8
+    djtsUniformCode: DJTS8
+    qdtsUniformCode: QDTS8
+    bwtsUniformCode: BWTS8
+    gztsUniformCode: GZTS8
+    whtsUniformCode: WHTS8
+    lxtsUniformCode: LXTS8
+    windturbineGroups:
+      - station: SBQ_FDC
+        modelid: UP82_2
+        TJ: DI059
+        SD: DI057
+        DJ: DI054
+        QD: DI053,DI056
+        BW: DI058
+        GZ: DI139
+        WH: DI055
+        #有功功率 -- AI130, 风速 -- AI005, 发电机转速 -- AI128, 转子转速 -- AI014, 偏航位置 -- AI034
+        LX: AI005,AI128,AI014,AI034
+        YGGL: AI130
+      - station: SBQ_FDC
+        modelid: UP97
+        TJ: DI059
+        SD: DI057
+        DJ: DI054
+        QD: DI053,DI056
+        BW: DI058
+        GZ: DI139
+        WH: DI055
+        #有功功率 -- AI130, 风速 -- AI007, 发电机转速 -- AI128, 转子转速 -- AI014
+        LX: AI007,AI128,AI014
+        YGGL: AI130
+      - station: SBQ_FDC
+        modelid: UP105-2000-S
+        TJ: DI1884
+        SD: DI1886
+        DJ: DI1888
+        QD: DI1881,DI1889
+        BW: DI1885
+        GZ: NFDLZY_FXF #DI1882
+        WH: DI1883
+        #有功功率 -- AI130, 风速 -- AI022, 发电机转速 -- AI128, 叶轮转速 -- AI012, 偏航位置 -- AI034
+        LX: AI022,AI128,AI012,AI034
+        YGGL: AI130
+      - station: NSS_FDC
+        modelid: UP82
+        TJ: DI059
+        SD: DI057
+        DJ: DI054
+        QD: DI053,DI056
+        BW: DI058
+        GZ: DI139
+        WH: DI055
+        #有功功率 -- AI130, 风速 -- AI005, 发电机转速 -- AI128, 转子转速 -- AI014, 偏航位置 -- AI034
+        LX: AI005,AI128,AI014,AI034
+        YGGL: AI130
+      - station: MHS_FDC
+        modelid: UP77
+        TJ: DI059
+        SD: DI057
+        DJ: DI054
+        QD: DI053,DI056
+        BW: DI058
+        GZ: DI139
+        WH: DI055
+        #有功功率 -- AI130, 风速 -- AI005, 发电机转速 -- AI128, 转子转速 -- AI014, 偏航位置 -- AI034
+        LX: AI005,AI128,AI014,AI034
+        YGGL: AI130
+      - station: MHS_FDC
+        modelid: UP105-2000-S
+        TJ: DI1884
+        SD: DI1886
+        DJ: DI1888
+        QD: DI1881,DI1889
+        BW: DI1885
+        GZ: NFDLZY_FXF #DI1882
+        WH: DI1883
+        #有功功率 -- AI130, 风速 -- AI022, 发电机转速 -- AI128, 叶轮转速 -- AI012, 偏航位置 -- AI034
+        LX: AI022,AI128,AI012,AI034
+        YGGL: AI130
+      - station: XS_FDC
+        modelid: UP105-2000-S
+        TJ: DI1884
+        SD: DI1886
+        DJ: DI1888
+        QD: DI1881,DI1889
+        BW: DI1885
+        GZ: NFDLZY_FXF #DI1882
+        WH: DI1883
+        #有功功率 -- AI130, 风速 -- AI022, 发电机转速 -- AI128, 叶轮转速 -- AI012, 偏航位置 -- AI034
+        LX: AI022,AI128,AI012,AI034
+        YGGL: AI130
+      - station: XS_FDC
+        modelid: UP97
+        TJ: DI059
+        SD: DI057
+        DJ: DI054
+        QD: DI053,DI056
+        BW: DI058
+        GZ: DI139
+        WH: DI055
+        #有功功率 -- AI130, 风速 -- AI007, 发电机转速 -- AI128, 转子转速 -- AI014
+        LX: AI007,AI128,AI014
+        YGGL: AI130
+      - station: QS_FDC
+        modelid: CCWE-1500
+        TJ: DI819
+        SD:
+        DJ: DI818
+        QD:
+        BW: DI816
+        GZ: DI820
+        WH:
+        #有功功率 -- AI130, 风速 -- AI022, 发电机转速 -- AI223, 转子转速 -- AI181
+        LX: AI022,AI223,AI181,AI130
+        YGGL: FJZTREAD   #风机运行状态码借用
+      - station: QS_FDC
+        modelid: UP105-2000-S
+        TJ: DI1884
+        SD: DI1886
+        DJ: DI1888
+        QD: DI1881,DI1889
+        BW: DI1885
+        GZ: NFDLZY_FXF #DI1882
+        WH: DI1883
+        #有功功率 -- AI130, 风速 -- AI022, 发电机转速 -- AI128, 叶轮转速 -- AI012, 偏航位置 -- AI034
+        LX: AI022,AI128,AI012,AI034
+        YGGL: AI130

state/wind/src/main/resources/bootstrap.yaml

@@ -6,15 +6,15 @@ spring:
     name: state-wind
   profiles:
     # 环境配置
-    active: dev
+    active: nx
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.10.18:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.10.18:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -26,9 +26,9 @@ spring:
     type: SIMPLE
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.181.218:5432/testdb
-    username: postgres
-    password: 123
+    url: jdbc:postgresql://192.168.10.18:5432/nx_dev
+    username: gdprod
+    password: gyee123
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       max-active: 20

timeseries/dao-golden/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {

timeseries/dao-interface/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {

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

@@ -1,137 +0,0 @@
-package com.gyee.wisdom.dao.hepler;
-
-public class PageVo {
-
-	private int page;
-	private int rows;
-	private int total;
-	private int count;
-	private int prev;
-	private int next;
-	private boolean isprev;
-	private boolean isnext;
-	private String url;
-	private Object list;
-
-	public PageVo() {
-	}
-
-	public PageVo(int page, int rows, int total, Object list) {
-		this.page = page;
-		this.rows = rows;
-		this.total = total;
-		this.list = list;
-	}
-
-	public int getPage() {
-		page = page < getCount() ? page : getCount();
-		page = page < 1 ? 1 : page;
-		return page;
-	}
-
-	public void setPage(int page) {
-		this.page = page;
-	}
-
-	public int getRows() {
-		return rows;
-	}
-
-	public void setRows(int rows) {
-		this.rows = rows;
-	}
-
-	public int getTotal() {
-		return total;
-	}
-
-	public void setTotal(int total) {
-		this.total = total;
-	}
-
-	public int getCount() {
-		if (rows == 0)
-			return 0;
-		count = total / rows;
-		if (total % rows != 0)
-			count++;
-		count = count == 0 ? 1 : count;
-		return count;
-	}
-
-	public int getPrev() {
-		prev = getPage() - 1;
-		prev = prev < 1 ? 1 : prev;
-		return prev;
-	}
-
-	public void setPrev(int prev) {
-		this.prev = prev;
-	}
-
-	public int getNext() {
-		next = getPage() + 1;
-		next = next > getCount() ? getCount() : next;
-		return next;
-	}
-
-	public void setNext(int next) {
-		this.next = next;
-	}
-
-	public boolean isIsprev() {
-		isprev = false;
-		if ((getCount() > 1) && (page > 1))
-			isprev = true;
-		return isprev;
-	}
-
-	public void setIsprev(boolean isprev) {
-		this.isprev = isprev;
-	}
-
-	public boolean isIsnext() {
-		isnext = false;
-		if ((getCount() > 1) && (getCount() > getPage()))
-			isnext = true;
-		return isnext;
-	}
-
-	public void setIsnext(boolean isnext) {
-		this.isnext = isnext;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public void setCount(int count) {
-		this.count = count;
-	}
-
-	public Object getList() {
-		return list;
-	}
-
-	public void setList(Object list) {
-		this.list = list;
-	}
-
-	public String getPreurl() {
-		if (url != null) {
-			return url.concat("/") + getPrev();
-		}
-		return null;
-	}
-
-	public String getNexturl() {
-		if (url != null) {
-			return url.concat("/") + getNext();
-		}
-		return null;
-	}
-}

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

@@ -1,21 +0,0 @@
-package com.gyee.wisdom.dao.point;
-
-import com.gyee.wisdom.common.data.point.PowerStationTestingPoint;
-import com.gyee.wisdom.common.data.point.TestingPoint;
-
-import java.util.List;
-
-public interface ITestingPointDao {
-
-    List<TestingPoint> getAll();
-
-    List<TestingPoint>getListByPage(int pageIndex, int pageSize);
-
-    TestingPoint getPointById(String id);
-
-    void save(TestingPoint newPoint);
-
-    void delete(String id);
-
-    void  update(TestingPoint point);
-}

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

@@ -1,33 +0,0 @@
-package com.gyee.wisdom.dao.system;
-
-import com.gyee.wisdom.common.data.system.model.User;
-import java.util.List;
-
-
-public interface IUserDao {
-
-     List<User> getUser(String userName, String telePhone, String email) ;
-
-     void add(User user) ;
-
-     void update(User user) ;
-
-     void updateRoles(String uid, List<String> rids) ;
-
-     User get(String id) ;
-
-     boolean contains(String name) ;
-
-     List<User> list() ;
-
-     boolean hasResourcePermission(String uid,String resourceCode) ;
-
-     void remove(String id) ;
-
-     void switchStatus(String id,boolean disabled);
-
-     User findByUserName(String username) ;
-
-     User findByPhone(String phone) ;
-
-}

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

@@ -1,45 +0,0 @@
-package com.gyee.wisdom.dao.system;
-
-import com.gyee.wisdom.common.data.system.model.User;
-
-import java.util.List;
-
-
-public interface IUserDao2 {
-
-     List<User> findAll();
-
-     User findByUserName(String userName);
-
-     User findById(String id);
-
-     User save(User t);
-
-     boolean removeById(String id);
-
-     List<User> findByCondition(String userName, String telePhone, String email);
-
-     List<User> getUser(String userName, String telePhone, String email) ;
-
-     void add(User user) ;
-
-     void update(User user) ;
-
-     void updateRoles(String uid, List<String> rids) ;
-
-     User get(String id) ;
-
-     boolean contains(String name) ;
-
-     List<User> list() ;
-
-     boolean hasResourcePermission(String uid,String resourceCode) ;
-
-     void remove(String id) ;
-
-     void switchStatus(String id,boolean disabled);
-
-
-     User findByPhone(String phone) ;
-
-}

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

@@ -1,13 +0,0 @@
-package com.gyee.wisdom.dao.windturbine;
-
-import com.gyee.wisdom.common.data.windturbine.Line;
-
-import java.util.List;
-
-public interface ILineDao {
-    public List<Line> findAll();
-    public Line findById(String id);
-    public void  deletebyid(String id);
-    public void save(Line line);
-    public List<Line> findByprojectId(String id);
-}

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

@@ -1,12 +0,0 @@
-package com.gyee.wisdom.dao.windturbine;
-
-import com.gyee.wisdom.common.data.windturbine.EquipmentModel;
-
-import java.util.List;
-
-public interface IModelDao {
-    public List<EquipmentModel> findAll();
-    public EquipmentModel findById(String id);
-    public void  deletebyid(String id);
-    public void save(EquipmentModel equipmentModel);
-}

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

@@ -1,21 +0,0 @@
-package com.gyee.wisdom.dao.windturbine;
-
-import com.gyee.wisdom.common.data.windturbine.PowerStation;
-
-import java.util.List;
-
-public interface IPowerStationDao  {
-    List<PowerStation> getAll();
-
-    List<PowerStation> getListByPage(int pageIndex, int pageSize);
-
-    PowerStation getStationById(String id);
-
-    List<PowerStation> getStationByIdIn(String[] ids);
-
-    void add(PowerStation newStation);
-
-    void delete(String id);
-
-    void   update(PowerStation station);
-}

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

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

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

@@ -1,19 +0,0 @@
-package com.gyee.wisdom.dao.windturbine;
-
-import com.gyee.wisdom.common.data.windturbine.Windturbine;
-
-import java.util.List;
-
-public interface IWindturbineDao {
-      public void del(String id);
-      public void save(Windturbine win);
-      public List<Windturbine> find();
-      public Windturbine findbyid(String id);
-      public List<Windturbine> findByStationId(String stationId);
-      public List<Windturbine> findByProjectId(String projectId);
-      public List<Windturbine> findByLineId(String lineId);
-      public List<Windturbine> findByModelId(String modelId);
-      public List<Windturbine> findByModelIdIn(String[] modelIds);
-      public List<Windturbine> findByStationIdAndModelId(String stationId, String modelId);
-
-}

timeseries/dao-redis-taos/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {
@@ -22,7 +23,7 @@ dependencies {
     implementation project(":timeseries:dao-interface")
 //    implementation fileTree(dir: 'src/main/lib', include: '*.jar')
 //    implementation("$bootGroup:spring-boot-starter-log4j2")
-    implementation ("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion2"){
+    implementation("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion2") {
         exclude group: 'com.alibaba', module: 'fastjson'
     }
     implementation("com.alibaba:druid-spring-boot-starter:$alibabaDruidVersion")

timeseries/dao-redis/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {

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

@@ -1,31 +0,0 @@
-package com.gyee.wisdom.dao.redis;
-
-import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.dao.timeseries.IDataChangeDao;
-import com.gyee.wisdom.dao.timeseries.RedisDao;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-@Component
-@RedisDao
-@Slf4j
-public class RedisDataChangeDao implements IDataChangeDao {
-
-
-    public void registerTopic(String topic, List<TsPoint> tsPoints)  {
-
-
-    }
-
-    public void unRegisterTopic(String topic) {
-
-    }
-
-    public Map<String, TsData> getTopicDataChange(String topic) {
-        return null;
-    }
-
-
-}

timeseries/dao-simulator/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {

timeseries/dao-sql/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {

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

@@ -1,161 +0,0 @@
-package com.gyee.wisdom.dao.sql;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.scheduling.support.SimpleTriggerContext;
-
-/**
- * 字符串常量池
- */
-public class ModelConstants {
-
-    private ModelConstants() {
-    }
-
-    public static final String ID_ = "id";
-    public static final String USER_ = "gyee_user";
-    public static final String USER_NAME = "user_Name";
-    public static final String PASSWORD_ = "password";
-    public static final String SALT_ = "salt";
-    public static final String EMAIL_ = "email";
-    public static final String DISABLED_ = "disabled";
-    public static final String CREATE_TIME = "create_Time";
-    public static final String LAST_TIME = "last_Time";
-    public static final String CHINESE_NAME = "chinese_Name";
-    public static final String CONTRACT_TEL = "contract_Tel";
-    public static final String REGISTION_ID = "registion_Id";
-
-    public static final String ROLE_ = "gyee_role";
-    public static final String NAME_ = "name";
-    public static final String DESCRITION_ = "description";
-
-    public static final String USER_ROLE = "gyee_user_role";
-    public static final String USER_ID = "user_id";
-    public static final String ROLE_ID = "role_id";
-
-    /*
-     * author:Wanghs
-     * */
-    public static final String MENU_ = "gyee_menu";//menu表
-    public static final String LABLEL_ = "label";
-    public static final String PAHT_ = "path";
-    public static final String ORDER_NO = "order_no";
-    public static final String LAYER_ = "layer";
-    public static final String URL_ = "url";
-    public static final String TYPE_ = "type";
-    public static final String STYLE_ = "style";
-
-    public static final String ROLE_MENU = "gyee_role_menu";
-    public static final String MENU_ID = "menu_id";
-
-    public static final String POWER_STATION="power_station";
-    public static final  String CODE_="code";
-    public static final String STATION_NAME="station_name";
-    public static final String ADDRESS_="address";
-    public static final String TELEPHONE_="telephone";
-    public static final String CAPACITY_="capacity";
-    public static final String CAPACITY_UNIT="capacity_unit";
-    public static final String QUANTITY="quantity";
-    public static final String SHORT_NAME="short_name";
-    public static final String LONGITUDE_="longitude";
-    public static final String LATITUDE_="latitude";
-    public static final String COMPANY_ID="company_id";
-    public static final String SYSTEM_MENU_FACT="system_manu_fact";
-    public static final String HEAD_FARM="head_farm";
-    public static final String HEAD_FARM_PHONE="head_farm_phone";
-    public static final String MODEL_="model";
-    public static final String ORDER_NUM="order_num";
-    public static final String HEIGHT_="height";
-    public static final String MODEL_ID="model_id";
-    public static final String WINDTURBINE_ID="windturbine_id";
-
-    /*
-     * author:wangjw
-     * */
-    //风机
-    public static final String WINDTURBINE_="windturbine";
-    public static final String WINPOWERSATIONID_="station_id";
-    public static final String MODELID_="model_id";
-    public static final String STATUS_="status";
-    public static final String PROJECT_ID="project_id";
-    public static final String LINEID_="line_id";
-    public static final String FIRST_INTEGRATED_TIME="first_integrated_time";
-    public static final String PHOTO_="photo";
-    public static final String IS_STANDARD="is_standard";
-    //项目
-    public static final String PROJECT_="project";
-    public static final String STATION_ID="station_id";
-    public static final String PRIJECT_="project";
-    public static final String ANAME_="aname";
-    public static final String COMMISSION_DATE="commission_date";
-    public static final String MASTER_PHONE="master_phone";
-    public static final String SHIFT_FOREMAN="shift_foreman";
-    public static final String SHIFT_FOREMAN_PHONE="shift_foreman_phone";
-    //线路
-    public static final String EQUIPMENT_MODEL="equipment_model";
-    public static final String LINE_="line";
-    public static final String STATION_CODE="station_code";
-    //模型
-    public static final String POWER_PRODUCTION="power_production";
-    public static final String CUTIN_WIND_SPEED="cutin_wind_speed";
-    public static final String RATED_WIND_SPEED="rated_wind_speed";
-    public static final String CUTOUT_WIND_SPEED="cutout_wind_speed";
-    public static final String WINDTURBINE_MANUFACTURER_ID="windturbine_manufacturer_id";
-    public static final String UNIT_="unit";
-    public static final String SWEPT_AREA="swept_area";
-    public static final String EQUIPMENT_CATEGORY="equipment_category";
-    public static final String LINE_ID="line_id";
-    public static final String CATEGORY_="category";
-
-    public static final String TESTING_POINT="testing_point";//测点表
-    public static final String TYPE_ID="type_id";
-    public static final String MAX_VAL="max_val";
-    public static final String MIN_VAL="min_val";
-    public static final String REASONABLE_MAX_VAL="reasonable_max_val";
-    public static final String REASONABLE_MIN_VAL="reasonable_min_val";
-    public static final String VALUE_UNIT="value_unit";
-    public static final String ENGLISH_NAME="english_name";
-    public static final String UNIFORM_CODE="uniform_code";
-    public static final String DATA_TYPE="data_type";
-
-
-    public static final String POWER_STATION_TESTING_POINT="power_station_testing_point";//风电场测点表
-    public static final String LEVEL_TYPE_TESTING_POINT="level_type_testing_point";//风电场抽象测点表
-    public static final String ELECTRICAL_TESTING_POINT="electrical_testing_point";//电气测点
-    public static final String WINDTURBINE_TESTING_POINT="windturbine_testing_point";//风机测点
-
-    public static final String DATA_DICTIONARY="data_dictionary";//数据字典
-    public static final String ENABLED_="enabled";
-
-    public static final String TOPIC_="gyee_topic";//主题表
-    public static final String UNIFORM_CODES="UNIFORMCODES";
-    public static final String DESCRIPTION_="description";
-
-    public static final String THING_TYPE="thing_type";//主题表
-    public static final String THING_ID="thing_id";
-
-    public  static final String TOPIC_POINT="gyee_topic_point";
-    public  static final String TOPIC_ID="topic_id";
-    public  static final String POINT="point";
-
-    public static final String VIEW_TOPIC_POINT="view_topic_point";
-    public static final String POINT_NAME="point_name";
-    public static final String POINT_TYPE="point_type";
-    public static final String POINT_ID="point_id";
-
-
-    public static final String GYEE_POINT="gyee_point";
-
-
-    public static final  String GYCP_CMD_INFO="gycp_cmd_info";
-    public static  final String CMD_ID="cmd_id";
-    public static  final String CMD_VALUE="cmd_value";
-    public static  final String Time="time";
-    public static  final String ISSUCCESS="is_success";
-    public static  final String CONTROL_ERRORS_CODE="control_errors_code";
-
-    public static  final String INPUT_OR_OUTPUT_SPEED_TOTAL="inputoroutputspeedtotal";
-    public static  final String WINDTURBINEID="windturbineid";
-    public static  final String INPUT_SMALL="inputsmall";
-    public static  final String RECORDE_DATE="recorddate";
-    public static  final String CONTROL_INFO="control_info";
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/JpaLineDao.java

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

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/JpaModelDao.java

@@ -1,40 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine;
-
-import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.windturbine.EquipmentModel;
-import com.gyee.wisdom.dao.windturbine.IModelDao;
-import com.gyee.wisdom.dao.sql.Windturbine.entity.ModelEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.ModelRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class JpaModelDao implements IModelDao
-{
-    @Autowired
-    private ModelRepository modelRepository;
-
-
-    @Override
-    public List<EquipmentModel> findAll() {
-        return DataUtil.convertDataList(modelRepository.findAll());
-    }
-
-    @Override
-    public EquipmentModel findById(String id) {
-        return modelRepository.findById(id).get().toData();
-    }
-
-    @Override
-    public void deletebyid(String id) {
-        modelRepository.deleteById(id);
-    }
-
-    @Override
-    public void save(EquipmentModel equipmentModel) {
-        modelRepository.save(new ModelEntity(equipmentModel));
-    }
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/JpaPowerStationDao.java

@@ -1,66 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine;
-
-import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.windturbine.PowerStation;
-
-import com.gyee.wisdom.dao.sql.Windturbine.entity.PowerStationEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.PowerStationRepository;
-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;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class JpaPowerStationDao implements IPowerStationDao {
-
-    @Autowired
-    public PowerStationRepository powerStationRepository;
-
-    @Override
-    public List<PowerStation> getAll() {
-        powerStationRepository.findAll();
-        List<PowerStation> stationList = DataUtil.convertDataList(powerStationRepository.findAll());
-
-        return stationList;
-    }
-
-    @Override
-    public List<PowerStation> getListByPage(int pageIndex, int pageSize) {
-        Sort sort =  Sort.by(Sort.Direction.DESC, "createTime"); //创建时间降序排序
-        Pageable pageable =  PageRequest.of(pageIndex, pageSize, sort);
-        Page<PowerStationEntity> entityPage = powerStationRepository.findAll(pageable);
-        List<PowerStation> stationList = DataUtil.convertDataList(entityPage.getContent());
-        return stationList;
-
-    }
-
-    @Override
-    public PowerStation getStationById(String id) {
-        return powerStationRepository.findById(id).get().toData();
-    }
-    @Override
-    public List<PowerStation> getStationByIdIn(String[] ids) {
-        return DataUtil.convertDataList(powerStationRepository.findByIdIn(ids));
-    }
-
-    @Override
-    public void add(PowerStation newStation) {
-        PowerStationEntity stationEntity = new PowerStationEntity(newStation);
-        powerStationRepository.save(stationEntity);
-    }
-
-    @Override
-    public void delete(String id) {
-        powerStationRepository.deleteById(id);
-    }
-
-    @Override
-    public void update(PowerStation station) {
-        powerStationRepository.save(new PowerStationEntity(station));
-    }
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/JpaProjectDao.java

@@ -1,44 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine;
-
-import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.windturbine.Project;
-import com.gyee.wisdom.dao.windturbine.IProjectDao;
-import com.gyee.wisdom.dao.sql.Windturbine.entity.ProjectEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.ProjectRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-@Component
-public class JpaProjectDao implements IProjectDao {
-    @Autowired
-    private ProjectRepository projectRepository;
-
-    @Override
-    public void delete(String id) {
-        projectRepository.deleteById(id);
-    }
-
-    @Override
-    public void save(Project project) {
-        projectRepository.save(new ProjectEntity(project));
-    }
-
-    @Override
-    public List<Project> findAll() {
-        return DataUtil.convertDataList(projectRepository.findAll());
-    }
-
-    @Override
-    public Project findbyid(String id) {
-        return projectRepository.findById(id).get().toData();
-    }
-
-    @Override
-    public List<Project> findbyStationId(String stationId) {
-        List<ProjectEntity> lpe=projectRepository.findByStationIdEquals(stationId);
-        return DataUtil.convertDataList(
-                projectRepository.findByStationIdEquals(stationId)
-        );
-    }
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/JpaWindturbineDao.java

@@ -1,80 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine;
-
-import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.windturbine.Windturbine;
-import com.gyee.wisdom.dao.sql.Windturbine.entity.WindturbineEntity;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.WindturbineRepository;
-import com.gyee.wisdom.dao.sql.Windturbine.repsoitory.PowerStationRepository;
-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>
- */
-@Component
-public class JpaWindturbineDao implements IWindturbineDao {
-
-    @Autowired
-    private WindturbineRepository windturbineRepository;
-    @Autowired
-    private PowerStationRepository powerStationRepository;
-
-
-
-    @Override
-    public void del(String id) {
-        windturbineRepository.deleteById(id);
-    }
-    //修改暂时不接入
-    @Override
-    public void save(Windturbine win) {
-        WindturbineEntity we=new WindturbineEntity(win);
-        windturbineRepository.save(we);
-        System.out.println();
-    }
-
-    @Override
-    public List<Windturbine> find() {
-       return DataUtil.convertDataList(windturbineRepository.findAll());
-    }
-
-
-    @Override
-    public Windturbine findbyid(String id) {
-       return  windturbineRepository.findById(id).get().toData();
-    }
-
-    public List<Windturbine> findByStationId(String stationId)
-    {
-        return DataUtil.convertDataList(windturbineRepository.findByWindPowerStationId(stationId));
-    }
-
-    public List<Windturbine> findByProjectId(String projectId)
-    {
-        return DataUtil.convertDataList(windturbineRepository.findByProjectId(projectId));
-    }
-
-    public List<Windturbine> findByLineId(String lineId)
-    {
-        return DataUtil.convertDataList(windturbineRepository.findByLineId(lineId));
-    }
-
-    public List<Windturbine> findByModelId(String modelId)
-    {
-        return DataUtil.convertDataList(windturbineRepository.findByModelId(modelId));
-    }
-    public List<Windturbine> findByModelIdIn(String[] modelIds)
-    {
-        return DataUtil.convertDataList(windturbineRepository.findByModelIdIn(modelIds));
-    }
-
-    public List<Windturbine> findByStationIdAndModelId(String stationId, String modelId)
-    {
-        return DataUtil.convertDataList(windturbineRepository.findByWindPowerStationIdAndModelId(stationId, modelId));
-    }
-
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/entity/LineEntity.java

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

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/entity/ModelEntity.java

@@ -1,115 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine.entity;
-
-import com.gyee.wisdom.common.data.windturbine.EquipmentModel;
-import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.dao.sql.ModelConstants;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.*;
-import java.math.BigDecimal;
-
-
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = ModelConstants.EQUIPMENT_MODEL)
-public class ModelEntity implements ToData<EquipmentModel> {
-    /** 主键ID */
-    @Id
-    /*@GeneratedValue(strategy = GenerationType.IDENTITY)*/
-    @Column(name = ModelConstants.ID_)
-    private String id;
-    /** 编码 */
-    @Column(name = ModelConstants.CODE_)
-    private String code;
-    /** 名称 */
-    @Column(name = ModelConstants.NAME_)
-    private String name;
-    /** 地址*/
-    @Column(name = ModelConstants.DESCRITION_)
-    private String descrition;
-    /** 项目id */
-    @Column(name = ModelConstants.POWER_PRODUCTION)
-    private Double powerProduction;
-    /** 顺序 */
-    @Column(name = ModelConstants.CUTIN_WIND_SPEED)
-    private Double cutinWindSpeed;
-    @Column(name = ModelConstants.RATED_WIND_SPEED)
-    private Double ratedWindSpeed;
-    @Column(name = ModelConstants.CUTOUT_WIND_SPEED)
-    private Double cutoutWindSpeed;
-    /** 装机容量*/
-    @Column(name = ModelConstants.WINDTURBINE_MANUFACTURER_ID)
-    private String windturbineManufacturerId;
-    /*装机单位*/
-    @Column(name = ModelConstants.UNIT_)
-    private String unit;
-    @Column(name = ModelConstants.PHOTO_)
-    private String photo;
-    /*装机数量*/
-    @Column(name = ModelConstants.SWEPT_AREA)
-    private Double sweptArea;
-    /*风场编号*/
-    @Column(name = ModelConstants.EQUIPMENT_CATEGORY)
-    private Integer equipmentCategory;
-/*
-    @OneToMany(mappedBy=ModelConstants.ID_,cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
-    private List<WindturbineEntity> listwindturbine;
-
-*/
-
-    public ModelEntity(EquipmentModel model) {
-        this.id=model.getId();
-        this.code=model.getCode();
-        this.name=model.getName();
-        this.descrition=model.getDescription();
-        this.powerProduction=model.getPowerProduction();
-        this.cutinWindSpeed=model.getCutinWindSpeed();
-        this.ratedWindSpeed=model.getRatedWindSpeed();
-        this.cutoutWindSpeed=model.getCutinWindSpeed();
-        this.windturbineManufacturerId=model.getWindturbineManufacturerId();
-        this.unit=model.getUnit();
-        this.photo=model.getPhoto();
-        this.sweptArea=model.getSweptArea();
-        this.equipmentCategory=model.getEquipmentCategory();
-/*        List<WindturbineEntity> windturbinelist=new ArrayList<WindturbineEntity>();
-        for(Windturbine windturbine:model.getListwindturbine()){
-            WindturbineEntity wind=  new WindturbineEntity(windturbine);
-            windturbinelist.add(wind);
-        }
-        listwindturbine=windturbinelist;*/
-    }
-
-
-    @Override
-    public EquipmentModel toData() {
-        if(this!=null) {
-            EquipmentModel equipmentModel = new EquipmentModel();
-            equipmentModel.setId(this.id);
-            equipmentModel.setCode(this.code);
-            equipmentModel.setName(this.name);
-            equipmentModel.setDescription(this.descrition);
-            equipmentModel.setPowerProduction(this.powerProduction);
-            equipmentModel.setCutinWindSpeed(this.cutinWindSpeed);
-            equipmentModel.setWindturbineManufacturerId(this.windturbineManufacturerId);
-            equipmentModel.setUnit(this.getUnit());
-            equipmentModel.setSweptArea(this.getSweptArea());
-            equipmentModel.setEquipmentCategory(this.getEquipmentCategory());
-            equipmentModel.setPhoto(this.getPhoto());
-            equipmentModel.setRatedWindSpeed(this.getRatedWindSpeed());
-            equipmentModel.setCutoutWindSpeed(this.getCutoutWindSpeed());
-            equipmentModel.setEquipmentCategory(this.getEquipmentCategory());
-            /*equipmentModel.setListwindturbine(DataUtil.convertDataList(this.getListwindturbine()));*/
-            return equipmentModel;
-        }else{
-            return null;
-        }
-    }
-
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/entity/PowerStationEntity.java

@@ -1,207 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine.entity;
-
-import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.windturbine.PowerStation;
-import com.gyee.wisdom.dao.sql.ModelConstants;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.*;
-
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = "windpowerstation")
-public class PowerStationEntity implements ToData<PowerStation> {
-    
-//      `ID` varchar(50) NOT NULL,
-//  `CODE` varchar(50) DEFAULT NULL,
-//  `NAME` varchar(50) NOT NULL,
-//  `ADDRESS` varchar(200) DEFAULT NULL,
-//  `TELEPHONE` varchar(50) DEFAULT NULL,
-//  `CAPACITY` float(18,2) DEFAULT NULL,
-//  `CAPACITYUNIT` varchar(50) DEFAULT NULL,
-//  `QUANTITY` int(11) DEFAULT NULL,
-//  `ANAME` varchar(50) DEFAULT NULL,
-//  `LONGITUDE` float(18,2) DEFAULT NULL,
-//  `LATITUDE` float(18,2) DEFAULT NULL,
-//  `PHOTO` varchar(50) DEFAULT NULL,
-//  `COMPANYID` varchar(50) DEFAULT NULL,
-//  `SYSTEMMANUFACT` varchar(100) DEFAULT NULL,
-//  `HEADFARM` varchar(50) DEFAULT NULL,
-//  `HEADFARMPHONE` varchar(50) DEFAULT NULL,
-//  `MODEL` varchar(100) DEFAULT NULL,
-//  `ORDERNUM` int(11) DEFAULT NULL,
-//  `ALTITUDE` float(18,2) DEFAULT NULL,
-    
-    
-    /**
-     * 主键ID
-     */
-    @Id
-    @Column(name = "ID")
-    private String id;
-
-    /**
-     * 场站编码
-     */
-    @Column(name = "CODE")
-    private String code;
-
-    /**
-     * 场站名称
-     */
-    @Column(name = "NAME")
-    private String stationName;
-
-    /**
-     * 场站地址
-     */
-    @Column(name = "ADDRESS")
-    private String adress;
-
-    /**
-     * 电话
-     */
-    @Column(name = "TELEPHONE")
-    private String telephone;
-
-    /**
-     * 装机容量
-     */
-    @Column(name = "CAPACITY")
-    private double capacity;
-
-    /**
-     * 容量单位
-     */
-    @Column(name = "CAPACITYUNIT")
-    private String capacityUnit;
-
-    /**
-     * 装机数量
-     */
-    @Column(name = "QUANTITY")
-    private int quantity;
-
-    /**
-     * 简称
-     */
-    @Column(name = "ANAME")
-    private String shortName;
-
-    /**
-     * 经度
-     */
-    @Column(name = "LONGITUDE")
-    private double longitude;
-
-    /**
-     * 纬度
-     */
-    @Column(name = "LATITUDE")
-    private double latitude;
-
-    /**
-     * 公司编码
-     */
-    @Column(name = "COMPANYID")
-    private String companyId;
-
-    /**
-     * 系统厂家
-     */
-    @Column(name = "SYSTEMMANUFACT")
-    private String systemManuFact;
-
-    /**
-     * 场长
-     */
-    @Column(name = "HEADFARM")
-    private String headFarm;
-
-    /**
-     * 场长电话
-     */
-    @Column(name = "HEADFARMPHONE")
-    private String headFarmPhone;
-
-    /**
-     * 机型
-     */
-    @Column(name = "MODEL")
-    private String model;
-
-    /**
-     * 编号
-     */
-    @Column(name = "ORDERNUM")
-    private int orderNum;
-
-    /**
-     * 海拔高度
-     */
-    @Column(name = "ALTITUDE")
-    private double height;
-
-
-/*    @OneToMany(mappedBy="ID_,cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
-     private List<ProjectEntity> listprojetentity;*/
-
-    public PowerStationEntity(PowerStation station) {
-        this.id=station.getId();
-        this.code = station.getCode();
-        this.stationName = station.getStationName();
-        this.adress = station.getAddress();
-        this.telephone = station.getTelephone();
-        this.capacity = station.getCapacity();
-        this.capacityUnit = station.getCapacityUnit();
-        this.quantity = station.getQuantity();
-        this.shortName = station.getShortName();
-        this.longitude = station.getLongitude();
-        this.latitude = station.getLatitude();
-        this.companyId = station.getCompanyId();
-        this.systemManuFact = station.getSystemManuFact();
-        this.headFarm = station.getHeadFarm();
-        this.headFarmPhone = station.getHeadFarmPhone();
-        this.model = station.getModel();
-        this.orderNum = station.getOrderNum();
-        this.height = station.getHeight();
-
-    }
-
-    @Override
-    public PowerStation toData() {
-        if(this!=null) {
-            PowerStation station = new PowerStation();
-            station.setId(this.id);
-            station.setCode(this.code);
-            station.setStationName(this.stationName);
-            station.setAddress(this.adress);
-            station.setTelephone(this.telephone);
-            station.setCapacity(this.capacity);
-            station.setCapacityUnit(this.capacityUnit);
-            station.setQuantity(this.quantity);
-            station.setShortName(this.shortName);
-            station.setStationName(this.stationName);
-            station.setLongitude(this.longitude);
-            station.setLatitude(this.latitude);
-            station.setCompanyId(this.companyId);
-            station.setSystemManuFact(this.systemManuFact);
-            station.setHeadFarm(this.headFarm);
-            station.setHeadFarmPhone(this.headFarmPhone);
-            station.setModel(this.model);
-            station.setOrderNum(this.orderNum);
-            station.setHeight(this.height);
-            /*station.setListproject(DataUtil.convertDataList(this.listprojetentity));*/
-            return station;
-        }else{
-            return null;
-        }
-    }
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/entity/ProjectEntity.java

@@ -1,122 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine.entity;
-
-import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.windturbine.Project;
-import com.gyee.wisdom.dao.sql.ModelConstants;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.*;
-import java.util.Date;
-
-
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = ModelConstants.PROJECT_)
-public class ProjectEntity implements ToData<Project> {
-    /** 主键ID */
-    @Id
-    @Column(name = ModelConstants.ID_)
-    private String id;
-    /** 编码 */
-    @Column(name = ModelConstants.CODE_)
-    private String code;
-    /** 名称 */
-    @Column(name = ModelConstants.NAME_)
-    private String name;
-    /** 地址*/
-    @Column(name = ModelConstants.ANAME_)
-    private String aname;
-    /** 风机id */
-    @Column(name = ModelConstants.STATION_ID)
-    private String stationId;
-    /** 装机容量*/
-    @Column(name = ModelConstants.CAPACITY_)
-    private Double capacity;
-    /*装机单位*/
-    @Column(name = ModelConstants.CAPACITY_UNIT)
-    private String capacityUnit;
-    /*装机数量*/
-    @Column(name = ModelConstants.QUANTITY)
-    private Integer quantity;
-    /*模型*/
-    @Column(name = ModelConstants.MODEL_)
-    private String model;
-    /*投产日期*/
-    @Column(name = ModelConstants.COMMISSION_DATE)
-    private Date commissionDate;
-    /*主控电话*/
-    @Column(name = ModelConstants.MASTER_PHONE)
-    private String masterPhone;
-    /*执长*/
-    @Column(name = ModelConstants.SHIFT_FOREMAN)
-    private String shiftForman;
-    /*执长电话*/
-    @Column(name = ModelConstants.SHIFT_FOREMAN_PHONE)
-    private String shiftFormanPhone;
-    /*顺序*/
-    @Column(name = ModelConstants.ORDER_NUM)
-    private Integer orderNum;
-
-/*    @OneToMany(mappedBy=ModelConstants.ID_,cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
-    private List<LineEntity> listlines;
-
-    @ManyToOne(cascade = {CascadeType.MERGE,CascadeType.REFRESH},fetch=FetchType.EAGER)
-    @JoinColumn(name=ModelConstants.STATION_ID, referencedColumnName=ModelConstants.ID_,insertable=false, updatable=false)
-    private PowerStationEntity powerStationEntity;*/
-
-    public ProjectEntity(Project project) {
-        this.id = project.getId();
-        this.code = project.getCode();
-        this.name = project.getName();
-        this.aname = project.getAname();
-        this.stationId = project.getStationId();
-        this.capacity = project.getCapacity();
-        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();
-/*        List<LineEntity> lline=new ArrayList<>();
-        for(Line line:project.getListline()) {
-             LineEntity lineEntity=new LineEntity(line);
-             lline.add(lineEntity);
-        }
-        this.listlines=lline;
-        this.powerStationEntity=new PowerStationEntity(project.getPowerStation());*/
-    }
-
-    @Override
-    public Project toData() {
-        if(this!=null) {
-            Project project = new Project();
-            project.setId(this.id);
-            project.setCode(this.code);
-            project.setName(this.name);
-            project.setAname(this.aname);
-            project.setStationId(this.stationId);
-            project.setCapacity(this.capacity);
-            project.setCapacityUnit(this.getCapacityUnit());
-            project.setQuantity(this.getQuantity());
-            project.setModel(this.getModel());
-            project.setCommissionDate(this.commissionDate);
-            project.setMasterPhone(this.masterPhone);
-            project.setShiftForeman(this.shiftFormanPhone);
-            project.setShiftForemanPhone(this.shiftFormanPhone);
-            project.setOrderNum(this.orderNum);
-/*        project.setListline(DataUtil.convertDataList(this.getListlines()));
-        project.setPowerStation(this.powerStationEntity.toData());*/
-            return project;
-        }else{
-            return null;
-        }
-    }
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/entity/WindturbineEntity.java

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

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/repsoitory/LineRepository.java

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

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/repsoitory/ModelRepository.java

@@ -1,15 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine.repsoitory;
-
-import com.gyee.wisdom.dao.sql.Windturbine.entity.ModelEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface ModelRepository extends JpaRepository<ModelEntity, String>, JpaSpecificationExecutor {
-
-  /*  ModelEntity findFirstByUserName(String userName);*/
-
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/repsoitory/ProjectRepository.java

@@ -1,17 +0,0 @@
-package com.gyee.wisdom.dao.sql.Windturbine.repsoitory;
-
-import com.gyee.wisdom.dao.sql.Windturbine.entity.ProjectEntity;
-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 ProjectRepository extends JpaRepository<ProjectEntity, String>, JpaSpecificationExecutor {
-
-  /*  ModelEntity findFirstByUserName(String userName);*/
-    List<ProjectEntity> findByStationIdEquals(String stationId);
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/Windturbine/repsoitory/WindturbineRepository.java

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

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

@@ -1,68 +0,0 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
-import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.Warningrecords;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name="warningrecords")
-public class WarningrecordsEntity implements ToData<Warningrecords>, Serializable {
-  private static final long serialVersionUID = 7086505699466420713L;
-  @Id
-  @Column(name = "id")
-//  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "NXFD_WARNINGRECORDS")
-//  @SequenceGenerator(name = "NXFD_WARNINGRECORDS", sequenceName = "NXFD_WARNINGRECORDS")
-  private Long id;
-  @Column(name = "windpowerstationid")
-  private String windpowerstationid;
-  @Column(name = "windturbineid")
-  private String windturbineid;
-  @Column(name = "warningid")
-  private String warningid;
-  @Column(name = "warningtime")
-  private Date warningtime;
-  @Column(name = "isconfirm")
-  private String isconfirm;
-  @Column(name = "ishandle")
-  private String ishandle;
-  @Column(name = "handle")
-  private String handle;
-  @Column(name = "shutdowneventid")
-  private String shutdowneventid;
-  @Column(name = "levelid")
-  private String levelid;
-  @Column(name = "wtaiid")
-  private String wtaiid;
-  @Column(name = "durationhour")
-  private String durationhour;
-  @Column(name = "isfilter")
-  private String isfilter;
-
-  @Override
-  public Warningrecords toData() {
-    Warningrecords warningrecords = new Warningrecords();
-    BeanUtils.copyProperties(this,warningrecords);
-    return warningrecords;
-  }
-  public WarningrecordsEntity(Warningrecords warningrecords) {
-    //this.id=warningrecords.getId();
-    this.windpowerstationid = warningrecords.getWindpowerstationid();
-    this.windturbineid = warningrecords.getWindturbineid();
-    this.warningid = warningrecords.getWarningid();
-    this.warningtime = warningrecords.getWarningtime();
-    this.isconfirm = warningrecords.getIsconfirm();
-    this.ishandle = warningrecords.getIshandle();
-    this.handle = warningrecords.getHandle();
-    this.shutdowneventid = warningrecords.getShutdowneventid();
-    this.levelid = warningrecords.getLevelid();
-    this.wtaiid = warningrecords.getWtaiid();
-    this.durationhour = warningrecords.getDurationhour();
-    this.isfilter = warningrecords.getIsfilter();
-  }
-}

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

@@ -1,67 +0,0 @@
-package com.gyee.wisdom.dao.sql.alarm.Entity;
-
-import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointAi;
-import com.gyee.wisdom.common.data.alarm.WindturbineTestingpointDi;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.beans.BeanUtils;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-
-@Data
-@Entity
-@NoArgsConstructor
-@Table(name="windturbinetestingpointai")
-public class WindturbineTestingpointAiEntity implements ToData<WindturbineTestingpointAi>, Serializable {
-  @Id
-  @Column(name = "id")
-  private String id;
-  @Column(name = "code")
-  private String code;
-  @Column(name = "name")
-  private String name;
-  @Column(name = "model")
-  private String model;
-  @Column(name = "valueunit")
-  private String valueunit;
-  @Column(name = "englishname")
-  private String englishname;
-  @Column(name = "typeid")
-  private String typeid;
-  @Column(name = "modelid")
-  private String modelid;
-  @Column(name = "maxval")
-  private String maxval;
-  @Column(name = "minval")
-  private String minval;
-  @Column(name = "reasonablemaxval")
-  private String reasonablemaxval;
-  @Column(name = "reasonableminval")
-  private String reasonableminval;
-  @Column(name = "windturbineid")
-  private String windturbineid;
-  @Column(name = "uniformcode")
-  private String uniformcode;
-  @Column(name = "shortid")
-  private String shortid;
-  @Column(name = "longid")
-  private String longid;
-  @Column(name = "windpowerstationid")
-  private String windpowerstationid;
-  @Column(name = "realtimeid")
-  private String realtimeid;
-
-  @Override
-  public WindturbineTestingpointAi toData() {
-    WindturbineTestingpointAi windturbineTestingpointAi = new WindturbineTestingpointAi();
-    BeanUtils.copyProperties(this,windturbineTestingpointAi);
-    return windturbineTestingpointAi;
-  }
-
-}

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

@@ -1,15 +0,0 @@
-package com.gyee.wisdom.dao.sql.alarm.repository;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningEntity;
-import com.gyee.wisdom.dao.sql.alarm.Entity.WarningsyzEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-
-    @Repository
-    public interface WarningsyzRepository extends JpaRepository<WarningsyzEntity, String>, JpaSpecificationExecutor {
-        WarningsyzEntity findAllById(String id);
-        WarningsyzEntity findByDescription(String description);
-        WarningsyzEntity findByPointkey(String pointkey);
-    }
-

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

@@ -1,32 +0,0 @@
-package com.gyee.wisdom.dao.sql.control.repository;
-
-import com.gyee.wisdom.dao.sql.control.entity.ControlLogEntity;
-import com.gyee.wisdom.dao.sql.control.entity.GycpCmdInfoEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author:Wanghs
- * @date:2019-09-10
- */
-@Repository
-public interface ControlLogRepository extends JpaRepository<ControlLogEntity, String>, JpaSpecificationExecutor {
-
-    List<ControlLogEntity>  getByStationId(String stationId);
-
-    List<ControlLogEntity>  getByWindturbineId(String windturbineId);
-
-    List<ControlLogEntity>  getByType(int controlType);
-
-    List<ControlLogEntity>  getByTimeBetween(Date startTime,Date endTime);
-
-    List<ControlLogEntity>  getByStationIdAndWindturbineId(String stationId,String windturbineId);
-
-    List<ControlLogEntity>  getByStationIdAndWindturbineIdAndTimeBetween(String stationId,String windturbineId,Date startTime,Date time);
-
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/control/repository/InputOrOutputSpeedTotalRepository.java

@@ -1,25 +0,0 @@
-package com.gyee.wisdom.dao.sql.control.repository;
-
-import com.gyee.wisdom.dao.sql.control.entity.GycpCmdInfoEntity;
-import com.gyee.wisdom.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;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author:Wanghs
- * @date:2019-09-10
- */
-@Repository
-public interface InputOrOutputSpeedTotalRepository  extends JpaRepository<InputOrOutputSpeedTotalEntity, String>, JpaSpecificationExecutor {
-  @Query(value ="select t1 from InputOrOutputSpeedTotalEntity t1 where t1.recordDate =  (select max(t2.recordDate) from InputOrOutputSpeedTotalEntity t2)")
-    List<InputOrOutputSpeedTotalEntity> latest();
-
-  @Query(value ="select max (t1.recordDate) from InputOrOutputSpeedTotalEntity t1 ")
-  Date getMaxDate ();
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/point/JpaTestingPointDao.java

@@ -1,63 +0,0 @@
-package com.gyee.wisdom.dao.sql.point;
-
-import com.gyee.wisdom.common.data.DataUtil;
-import com.gyee.wisdom.common.data.point.TestingPoint;
-import com.gyee.wisdom.dao.point.ITestingPointDao;
-import com.gyee.wisdom.dao.sql.point.entity.PowerStationTestingPointEntity;
-import com.gyee.wisdom.dao.sql.point.entity.TestingPointEntity;
-import com.gyee.wisdom.dao.sql.point.repository.TestingPointRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class JpaTestingPointDao implements ITestingPointDao {
- @Autowired
- private TestingPointRepository testingPointRepository;
-
-    @Override
-    public List<TestingPoint> getAll() {
-        List<TestingPoint> pointList = DataUtil.convertDataList(testingPointRepository.findAll());
-
-        return pointList;
-    }
-
-    @Override
-    public List<TestingPoint> getListByPage(int pageIndex, int pageSize) {
-        Pageable pageable =  PageRequest.of(pageIndex, pageSize);
-        Page<TestingPointEntity> entityPage = testingPointRepository.findAll(pageable);
-        List<TestingPoint> pointList = DataUtil.convertDataList(entityPage.getContent());
-        return pointList;
-    }
-
-    @Override
-    public TestingPoint getPointById(String id) {
-
-        TestingPointEntity entity = testingPointRepository.findById(id).get();
-        if (entity != null)
-            return entity.toData();
-        else
-            return null;
-    }
-
-    @Override
-    public void save(TestingPoint newPoint) {
-        TestingPointEntity pointEntity = new TestingPointEntity(newPoint);
-        testingPointRepository.save(pointEntity);
-    }
-
-    @Override
-    public void delete(String id) {
-        testingPointRepository.deleteById(id);
-    }
-
-    @Override
-    public void update(TestingPoint point) {
-        testingPointRepository.save(new TestingPointEntity(point));
-    }
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/point/entity/TestingPointEntity.java

@@ -1,132 +0,0 @@
-package com.gyee.wisdom.dao.sql.point.entity;
-
-import com.gyee.wisdom.common.data.ToData;
-import com.gyee.wisdom.common.data.point.LevelTypeTestingPoint;
-import com.gyee.wisdom.common.data.point.PowerStationTestingPoint;
-import com.gyee.wisdom.common.data.point.TestingPoint;
-import com.gyee.wisdom.dao.sql.ModelConstants;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.math.BigDecimal;
-
-/**
- *Author:Wanghs
- */
-
-@Data
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode()
-@Entity
-@Table(name = ModelConstants.TESTING_POINT)
-public class TestingPointEntity implements ToData<TestingPoint> {
-
-
-    //编号（主键）
-    @Id
-    @Column(name = ModelConstants.ID_)
-    private String id;
-
-    //编码
-    @Column(name = ModelConstants.CODE_)
-    private String code;
-
-    //名称
-    @Column(name = ModelConstants.NAME_)
-    private String name;
-
-    //型号
-    @Column(name = ModelConstants.MODEL_)
-    private String model;
-
-    //单位
-    @Column(name = ModelConstants.VALUE_UNIT)
-    private String valueUnit;
-
-    //英文名称
-    @Column(name = ModelConstants.ENGLISH_NAME)
-    private String englishName;
-
-    //类型编号
-    @Column(name = ModelConstants.TYPE_ID)
-    private String typeId;
-
-    //最大值
-    @Column(name = ModelConstants.MAX_VAL)
-    private double maxVal;
-
-    //最小值
-    @Column(name = ModelConstants.MIN_VAL)
-    private double minVal;
-
-    //合理最大值
-    @Column(name = ModelConstants.REASONABLE_MAX_VAL)
-    private double reasonableMaxVal;
-
-    //合理最小值
-    @Column(name = ModelConstants.REASONABLE_MIN_VAL)
-    private double reasonableMinVal;
-
-    //风机型号编号
-    @Column(name = ModelConstants.MODEL_ID)
-    private String modelId;
-
-    //统一编码
-    @Column(name = ModelConstants.UNIFORM_CODE)
-    private String uniformCode;
-
-    //数据类型
-    @Column(name = ModelConstants.DATA_TYPE)
-    private String dataType;
-
-    //分类（1遥测、2遥信、3遥调、4遥控、5计算）
-    @Column(name = ModelConstants.CATEGORY_)
-    private int category;
-
-    public TestingPointEntity(TestingPoint point){
-        this.id = point.getId();
-        this.code = point.getCode();
-        this.name = point.getName();
-        this.valueUnit = point.getValueUnit();
-        this.englishName = point.getEnglishName();
-        this.typeId = point.getTypeId();
-        this.maxVal = point.getMaxVal();
-        this.minVal = point.getMinVal();
-        this.reasonableMaxVal = point.getReasonableMaxVal();
-        this.reasonableMinVal = point.getReasonableMinVal();
-        this.modelId = point.getModelId();
-        this.uniformCode = point.getUniformCode();
-        this.dataType = point.getDataType();
-        this.category = point.getCategory();
-
-    }
-    @Override
-    public TestingPoint toData() {
-        TestingPoint data = new TestingPoint();
-        data.setId(this.id);
-        data.setCode(this.code);
-        data.setName(this.name);
-        data.setModel(this.model);
-        data.setValueUnit(this.valueUnit);
-        data.setEnglishName(this.englishName);
-        data.setTypeId(this.typeId);
-        data.setMinVal(this.maxVal);
-        data.setMinVal(this.minVal);
-        data.setReasonableMaxVal(this.reasonableMaxVal);
-        data.setReasonableMinVal(this.reasonableMinVal);
-        data.setModelId(this.modelId);
-        data.setUniformCode(this.uniformCode);
-        data.setDataType(this.dataType);
-        data.setCategory(this.category);
-
-        return data;
-
-    }
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/point/repository/TestingPointRepository.java

@@ -1,10 +0,0 @@
-package com.gyee.wisdom.dao.sql.point.repository;
-
-import com.gyee.wisdom.dao.sql.point.entity.LevelTypeTestingPointEntity;
-import com.gyee.wisdom.dao.sql.point.entity.TestingPointEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-public interface TestingPointRepository extends JpaRepository<TestingPointEntity, String>, JpaSpecificationExecutor {
-    TestingPointEntity findByUniformCodeAndModelId(String uniformCode, String model);
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/power/repository/Status8SnapRepository.java

@@ -1,17 +0,0 @@
-package com.gyee.wisdom.dao.sql.power.repository;
-
-import com.gyee.wisdom.dao.sql.power.entity.Status8SnapEntity;
-import com.gyee.wisdom.dao.sql.power.entity.WindturbinePowerCurvefittingEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Repository
-public interface Status8SnapRepository extends JpaRepository<Status8SnapEntity, String>, JpaSpecificationExecutor {
-
-}

timeseries/dao-sql/src/main/java/com/gyee/wisdom/dao/sql/system/repository/MenuRepository.java

@@ -1,16 +0,0 @@
-package com.gyee.wisdom.dao.sql.system.repository;
-
-import com.gyee.wisdom.common.data.system.model.Menu;
-import com.gyee.wisdom.dao.sql.system.entity.MenuEntity;
-import com.gyee.wisdom.dao.sql.system.entity.UserEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-public interface MenuRepository extends JpaRepository<MenuEntity, String>, JpaSpecificationExecutor {
-
-
-}

timeseries/dao-taos/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {
@@ -22,7 +23,7 @@ dependencies {
     implementation project(":timeseries:dao-interface")
 //    implementation fileTree(dir: 'src/main/lib', include: '*.jar')
 //    implementation("$bootGroup:spring-boot-starter-log4j2")
-    implementation ("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion2"){
+    implementation("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion2") {
         exclude group: 'com.alibaba', module: 'fastjson'
     }
     implementation("com.alibaba:druid-spring-boot-starter:$alibabaDruidVersion")

timeseries/dao-taoscz/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {
@@ -22,7 +23,7 @@ dependencies {
     implementation project(":timeseries:dao-interface")
     implementation fileTree(dir: 'src/main/lib', include: '*.jar')
 //    implementation("$bootGroup:spring-boot-starter-log4j2")
-    implementation ("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion3"){
+    implementation("com.taosdata.jdbc:taos-jdbcdriver:$taosVersion3") {
         exclude group: 'com.alibaba', module: 'fastjson'
     }
 }

timeseries/data-adapter/README.md

@@ -1,10 +1,13 @@
 # wisdom
-## data-adapter  数据适配器
+
+## data-adapter 数据适配器
 
 ### restful 接口
-* 
+
+*
 
 ### 数据订阅
+
 *
 
 

timeseries/data-adapter/build.gradle

@@ -3,7 +3,8 @@ buildscript {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url "http://maven.aliyun.com/nexus/content/groups/public" }
+            url "http://maven.aliyun.com/nexus/content/groups/public"
+        }
         mavenCentral()
     }
     dependencies {
@@ -20,7 +21,7 @@ dependencies {
     implementation project(":timeseries:dao-interface")
     implementation project(":timeseries:dao-sql")
     //compile project(":timeseries:dao-redis")
-   // compile project(":timeseries:dao-simulator")
+    // compile project(":timeseries:dao-simulator")
     //implementation project(":timeseries:dao-golden")
     //compile project(":timeseries:dao-taos")
     //implementation project(":timeseries:dao-taoscz")
@@ -29,8 +30,8 @@ dependencies {
     //compile project(":timeseries:dao-hive")
     //compile project(":timeseries:dao-hadoop")
     implementation fileTree(dir: 'src/main/lib', include: '*.jar') //// oracle连接驱动       2区使用
-   // implementation ("mysql:mysql-connector-java:$mysqlConnectorVersion")
-    implementation ("com.alibaba:druid:$alibabaDruidVersion")
+    // implementation ("mysql:mysql-connector-java:$mysqlConnectorVersion")
+    implementation("com.alibaba:druid:$alibabaDruidVersion")
     testImplementation("$bootGroup:spring-boot-starter-test")
     implementation("$bootGroup:spring-boot-starter-web")
     //compile("$bootGroup:spring-boot-starter-session")

timeseries/data-adapter/src/main/resources/application-hf.yaml

@@ -17,22 +17,22 @@ spring:
     username: gdprod
     password: gd123
     # ----------------------------------------------------------------
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
-#    username: root
-#    password: gyeepd@123
+    #    driver-class-name: com.mysql.jdbc.Driver
+    #    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
+    #    username: root
+    #    password: gyeepd@123
     # ----------------------------------------------------------------
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
-          max-active: 20
-          initial-size: 1
-          min-idle: 3
-          max-wait: 60000
-          time-between-eviction-runs-millis: 60000
-          min-evictable-idle-time-millis: 300000
-          test-while-idle: true
-          test-on-borrow: false
-          test-on-return: false
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
 #  redis:
 #    database: 2
 #    host: 192.168.2.5
@@ -53,7 +53,7 @@ knife4j:
     host: 10.0.118.76
     password:
     port: 6379
-    databases: [0] # 要使用的库，会根据此处填写的库生成redisTemplate
+    databases: [ 0 ] # 要使用的库，会根据此处填写的库生成redisTemplate
     timeout: 60s
     lettuce: # lettuce基于netty，线程安全，支持并发
       pool:
@@ -81,18 +81,18 @@ golden:
 
 #hadoop数据库信息
 hadoop:
-#查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
- lastValueSearch: 8
- urlMap:
-   DJL: http://192.168.1.61:4242/api/
-   DQ: http://192.168.1.62:4242/api/
-   GF: http://192.168.1.63:4242/api/
-   GGL: http://192.168.1.64:4242/api/
-   FGL: http://192.168.1.66:4242/api/
-   FJ: http://192.168.1.69:4243/api/
-   JSFW: http://192.168.1.67:4242/api/
-   #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
-   DQ2: http://192.168.1.62:10001/api/
+  #查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
+  lastValueSearch: 8
+  urlMap:
+    DJL: http://192.168.1.61:4242/api/
+    DQ: http://192.168.1.62:4242/api/
+    GF: http://192.168.1.63:4242/api/
+    GGL: http://192.168.1.64:4242/api/
+    FGL: http://192.168.1.66:4242/api/
+    FJ: http://192.168.1.69:4243/api/
+    JSFW: http://192.168.1.67:4242/api/
+    #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
+    DQ2: http://192.168.1.62:10001/api/
 
 #taos数据库
 taos:
@@ -137,12 +137,12 @@ isLoadAllTag: true
 websocket_start: false
 #websocket推送风机基本信息统一编码
 uniformcode:
- wind_speed_code: AI022
- roll_speed_code: AI128
- power_code: AI130
- status_code: FJZT8
- lock_code: XDSL
- pv_I: AIG060     #电流-A相
- pv_U: AIG061     #电压-A相
- pv_P: AI130      #功率-有功功率
- pv_statue: FJZT  #状态
+  wind_speed_code: AI022
+  roll_speed_code: AI128
+  power_code: AI130
+  status_code: FJZT8
+  lock_code: XDSL
+  pv_I: AIG060     #电流-A相
+  pv_U: AIG061     #电压-A相
+  pv_P: AI130      #功率-有功功率
+  pv_statue: FJZT  #状态

timeseries/data-adapter/src/main/resources/application-nx.yaml

@@ -17,27 +17,27 @@ spring:
     username: nxfdprod
     password: gdnxfd123
     # -------------------------1区mysql/2区oracle---------------------------------------
-#    driver-class-name: oracle.jdbc.OracleDriver
-#    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-#    username: nxfdprod
-#    password: gdnxfd123
+    #    driver-class-name: oracle.jdbc.OracleDriver
+    #    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    #    username: nxfdprod
+    #    password: gdnxfd123
     # ----------------------------------------------------------------
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
-#    username: root
-#    password: gyeepd@123
+    #    driver-class-name: com.mysql.jdbc.Driver
+    #    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
+    #    username: root
+    #    password: gyeepd@123
     # ----------------------------------------------------------------
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
-          max-active: 20
-          initial-size: 1
-          min-idle: 3
-          max-wait: 60000
-          time-between-eviction-runs-millis: 60000
-          min-evictable-idle-time-millis: 300000
-          test-while-idle: true
-          test-on-borrow: false
-          test-on-return: false
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
   config:
     activate:
       on-profile: nx
@@ -61,7 +61,7 @@ knife4j:
     host: 114.55.105.194
     password: wanghs123
     port: 6379
-    databases: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] # 要使用的库，会根据此处填写的库生成redisTemplate
+    databases: [ 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ] # 要使用的库，会根据此处填写的库生成redisTemplate
     timeout: 60s
     lettuce: # lettuce基于netty，线程安全，支持并发
       pool:
@@ -89,18 +89,18 @@ golden:
 
 #hadoop数据库信息
 hadoop:
-#查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
- lastValueSearch: 8
- urlMap:
-   DJL: http://192.168.1.61:4242/api/
-   DQ: http://192.168.1.62:4242/api/
-   GF: http://192.168.1.63:4242/api/
-   GGL: http://192.168.1.64:4242/api/
-   FGL: http://192.168.1.66:4242/api/
-   FJ: http://192.168.1.69:4243/api/
-   JSFW: http://192.168.1.67:4242/api/
-   #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
-   DQ2: http://192.168.1.62:10001/api/
+  #查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
+  lastValueSearch: 8
+  urlMap:
+    DJL: http://192.168.1.61:4242/api/
+    DQ: http://192.168.1.62:4242/api/
+    GF: http://192.168.1.63:4242/api/
+    GGL: http://192.168.1.64:4242/api/
+    FGL: http://192.168.1.66:4242/api/
+    FJ: http://192.168.1.69:4243/api/
+    JSFW: http://192.168.1.67:4242/api/
+    #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
+    DQ2: http://192.168.1.62:10001/api/
 
 #taos数据库
 taos:
@@ -149,15 +149,15 @@ isLoadAllTag: true
 websocket_start: false
 #websocket推送风机基本信息统一编码
 uniformcode:
- wind_speed_code: AI022
- roll_speed_code: AI128
- power_code: AI130
- status_code: FJZT8
- lock_code: XDSL
- pv_I: AIG060     #电流-A相
- pv_U: AIG061     #电压-A相
- pv_P: AI130      #功率-有功功率
- pv_statue: FJZT  #状态
+  wind_speed_code: AI022
+  roll_speed_code: AI128
+  power_code: AI130
+  status_code: FJZT8
+  lock_code: XDSL
+  pv_I: AIG060     #电流-A相
+  pv_U: AIG061     #电压-A相
+  pv_P: AI130      #功率-有功功率
+  pv_statue: FJZT  #状态
 
 redis:
   host: 10.155.32.4

timeseries/data-adapter/src/main/resources/application.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8012
+  port: 8011
   max-http-header-size: 128KB
   tomcat:
     connection-timeout: 3000
@@ -19,22 +19,22 @@ spring:
     username: nxfdprod
     password: gdnxfd123
     # ----------------------------------------------------------------
-#    driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
-#    username: root
-#    password: gyeepd@123
+    #    driver-class-name: com.mysql.jdbc.Driver
+    #    url: jdbc:mysql://123.60.219.66/wisdom_cs_hnj?useUnicode=true&characterEncoding=UTF-8
+    #    username: root
+    #    password: gyeepd@123
     # ----------------------------------------------------------------
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
-          max-active: 20
-          initial-size: 1
-          min-idle: 3
-          max-wait: 60000
-          time-between-eviction-runs-millis: 60000
-          min-evictable-idle-time-millis: 300000
-          test-while-idle: true
-          test-on-borrow: false
-          test-on-return: false
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
   profiles:
     active: nx
 #  redis:
@@ -57,7 +57,7 @@ knife4j:
     host: 114.55.105.194
     password: wanghs123
     port: 6379
-    databases: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] # 要使用的库，会根据此处填写的库生成redisTemplate
+    databases: [ 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ] # 要使用的库，会根据此处填写的库生成redisTemplate
     timeout: 60s
     lettuce: # lettuce基于netty，线程安全，支持并发
       pool:
@@ -85,18 +85,18 @@ golden:
 
 #hadoop数据库信息
 hadoop:
-#查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
- lastValueSearch: 8
- urlMap:
-   DJL: http://192.168.1.61:4242/api/
-   DQ: http://192.168.1.62:4242/api/
-   GF: http://192.168.1.63:4242/api/
-   GGL: http://192.168.1.64:4242/api/
-   FGL: http://192.168.1.66:4242/api/
-   FJ: http://192.168.1.69:4243/api/
-   JSFW: http://192.168.1.67:4242/api/
-   #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
-   DQ2: http://192.168.1.62:10001/api/
+  #查询上一个值的最多访问次数  2的8次方,增加步长为60分钟,如:t0-60,t0-120,t0-240....
+  lastValueSearch: 8
+  urlMap:
+    DJL: http://192.168.1.61:4242/api/
+    DQ: http://192.168.1.62:4242/api/
+    GF: http://192.168.1.63:4242/api/
+    GGL: http://192.168.1.64:4242/api/
+    FGL: http://192.168.1.66:4242/api/
+    FJ: http://192.168.1.69:4243/api/
+    JSFW: http://192.168.1.67:4242/api/
+    #仅限于查询NSSDQN,NXDQDI,SBQNWDQ,SBQXLDQ
+    DQ2: http://192.168.1.62:10001/api/
 
 #taos数据库
 taos:
@@ -141,15 +141,15 @@ isLoadAllTag: true
 websocket_start: false
 #websocket推送风机基本信息统一编码
 uniformcode:
- wind_speed_code: AI022
- roll_speed_code: AI128
- power_code: AI130
- status_code: FJZT8
- lock_code: XDSL
- pv_I: AIG060     #电流-A相
- pv_U: AIG061     #电压-A相
- pv_P: AI130      #功率-有功功率
- pv_statue: FJZT  #状态
+  wind_speed_code: AI022
+  roll_speed_code: AI128
+  power_code: AI130
+  status_code: FJZT8
+  lock_code: XDSL
+  pv_I: AIG060     #电流-A相
+  pv_U: AIG061     #电压-A相
+  pv_P: AI130      #功率-有功功率
+  pv_statue: FJZT  #状态
 
 
 

资源文件/Readme.md

@@ -1,10 +1,5 @@
-1、Nacos pgSQL版本
-1.1 默认三区数据库,需要修改在nacos2.2文件夹conf 下的application.properties文件最后,sql文件也在conf下
+1、Nacos pgSQL版本 1.1 默认三区数据库,需要修改在nacos2.2文件夹conf 下的application.properties文件最后,sql文件也在conf下
 
 1.2 window启:nacos2.2文件夹bin下双击startup.cmd
 
-
-
-2、xxl-job pgSQL版本
-admin程序jar包 直接启动默认三区pg库
-需要修改本地可以自己改代码重新打包
+2、xxl-job pgSQL版本 admin程序jar包 直接启动默认三区pg库 需要修改本地可以自己改代码重新打包

资源文件/sql/pro_econ_testing_point.sql

@@ -0,0 +1,47 @@
+create table pro_econ_testing_point
+(
+    id                       varchar(20)
+        constraint pro_econ_testing_point_pk
+            primary key,
+    code                     varchar(60),
+    name                     varchar(250),
+    model                    varchar(30),
+    type_id                  varchar(30),
+    "original_uniform_code " varchar(30),
+    uniform_code             varchar(30),
+    ucv1                     varchar(30),
+    ucv2                     varchar(30),
+    ucv3                     varchar(30),
+    thing_id                 varchar(30),
+    thing_type               varchar(30),
+    data_type                varchar(30),
+    station_id               varchar(30),
+    logical_unit_id          varchar(30),
+    is_display               boolean,
+    spare                    varchar(60)
+);
+
+comment on table pro_econ_testing_point is '逻辑测点';
+
+comment on column pro_econ_testing_point.code is '测点';
+
+comment on column pro_econ_testing_point.name is '描述';
+
+comment on column pro_econ_testing_point.model is '机型';
+
+comment on column pro_econ_testing_point."original_uniform_code " is '原始统一编码';
+
+comment on column pro_econ_testing_point.uniform_code is '统一编码';
+
+comment on column pro_econ_testing_point.ucv1 is '统一编码备用';
+
+comment on column pro_econ_testing_point.thing_id is '设备id';
+
+comment on column pro_econ_testing_point.thing_type is '场站，风机，部件';
+
+comment on column pro_econ_testing_point.data_type is '数据类型';
+
+comment on column pro_econ_testing_point.station_id is '场站';
+
+comment on column pro_econ_testing_point.logical_unit_id is '部件编号';
+