五损状态计算

build.gradle

@@ -1,4 +1,3 @@
-
 plugins {
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }

common/data/src/main/java/com/gyee/wisdom/common/page/PageLink.java

@@ -1,4 +1,4 @@
-package com.gyee.wisdom.common.page;
+package com.gyee.gaia.common.page;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

electricity/meter/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     implementation("com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery")
     implementation("com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config")
 
-    implementation ("$cloudGroup:spring-cloud-starter-openfeign")
-    implementation ("cn.hutool:hutool-all:5.8.18")
+    implementation("$cloudGroup:spring-cloud-starter-openfeign")
+    implementation("cn.hutool:hutool-all:5.8.18")
 }
 

electricity/meter/src/main/java/com/gyee/gaia/meter/adapter/Adapter.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * Author: malijun
  * Data  : 2023: 04: 27
  **/
-@FeignClient(name="adapter",url = "192.168.10.18:8011/ts")
+@FeignClient(name = "adapter", url = "192.168.10.18:8011/ts")
 //@FeignClient(name="adapter",url = "192.168.1.82:8011/ts")
 public interface Adapter {
 

electricity/meter/src/main/java/com/gyee/gaia/meter/controller/BaseInfoController.java

@@ -75,7 +75,7 @@ public class BaseInfoController {
     @GetMapping("/testingpoint")
     public void getBaseInfotestingpoint() {
         QueryWrapper<TestingPoint> wrapper = new QueryWrapper<>();
-        wrapper.eq("uniform_code", "DI178").eq("thing_id","NX_GDDL_SBQ_F_WT_0010_EQ");
+        wrapper.eq("uniform_code", "DI178").eq("thing_id", "NX_GDDL_SBQ_F_WT_0010_EQ");
         List<TestingPoint> list = testingPointService.list(wrapper);
         System.out.println(list);
 

electricity/meter/src/main/java/com/gyee/gaia/meter/controller/ConfigController.java

@@ -6,8 +6,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/config")
 public class ConfigController {
@@ -27,7 +25,6 @@ public class ConfigController {
     }
 
 
-
 }
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/PointData.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 public class PointData implements Serializable {
 
     /**
-     *时间戳
+     * 时间戳
      */
     private long ts;
 

electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/MeterInfoCompanyMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.mapper;
 
-import com.gyee.gaia.meter.entity.MeterInfoCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.MeterInfoCompany;
 import org.apache.ibatis.annotations.Mapper;
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/MeterInfoEquipmentMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.mapper;
 
-import com.gyee.gaia.meter.entity.MeterInfoEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.MeterInfoEquipment;
 import org.apache.ibatis.annotations.Mapper;
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/MeterInfoLineMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.mapper;
 
-import com.gyee.gaia.meter.entity.MeterInfoLine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.MeterInfoLine;
 import org.apache.ibatis.annotations.Mapper;
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/MeterInfoPowerstationMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.mapper;
 
-import com.gyee.gaia.meter.entity.MeterInfoPowerstation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.MeterInfoPowerstation;
 import org.apache.ibatis.annotations.Mapper;
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/MeterInfoProjectMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.mapper;
 
-import com.gyee.gaia.meter.entity.MeterInfoProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.MeterInfoProject;
 import org.apache.ibatis.annotations.Mapper;
 
 

electricity/meter/src/main/java/com/gyee/gaia/meter/mapper/MeterPointMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.mapper;
 
-import com.gyee.gaia.meter.entity.MeterPoint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.meter.entity.MeterPoint;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

electricity/meter/src/main/java/com/gyee/gaia/meter/service/AdapterServiceTest.java

@@ -6,7 +6,10 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.gaia.meter.adapter.Adapter;
 import com.gyee.gaia.meter.entity.*;
-import com.gyee.gaia.meter.service.impl.*;
+import com.gyee.gaia.meter.service.impl.EquipmentServiceImpl;
+import com.gyee.gaia.meter.service.impl.MeterPointServiceImpl;
+import com.gyee.gaia.meter.service.impl.PowerStationServiceImpl;
+import com.gyee.gaia.meter.service.impl.TestingPointServiceImpl;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -134,8 +137,6 @@ class AdapterServiceTest {
     MeterPointServiceImpl meterPointService;
 
 
-
-
     //读取底码数据存入pg数据库
     @Test
     void saveBottomCode() {
@@ -193,13 +194,11 @@ class AdapterServiceTest {
                     System.out.println(rfdl + "Kwh");
 
 
-
-
                     MeterInfoBottomcode meterInfoBottomcode = new MeterInfoBottomcode();
                     meterInfoBottomcode.setNameCode("110SCDL");
                     meterInfoBottomcode.setName("110KV送出电量");
                     meterInfoBottomcode.setType(meterPoint.getProjectId());
-//                    meterInfoBottomcode.setSubStation("");
+                    //                    meterInfoBottomcode.setSubStation("");
                     meterInfoBottomcode.setStartTime(String.valueOf(dateTime1));
                     meterInfoBottomcode.setStartValue(BigDecimal.valueOf(value1));
                     meterInfoBottomcode.setEndTime(String.valueOf(dateTime2));

electricity/meter/src/main/java/com/gyee/gaia/meter/service/IMeterInfoCompanyService.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.service;
 
-import com.gyee.gaia.meter.entity.MeterInfoCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.MeterInfoCompany;
 
 /**
  * <p>

electricity/meter/src/main/java/com/gyee/gaia/meter/service/IMeterInfoEquipmentService.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.service;
 
-import com.gyee.gaia.meter.entity.MeterInfoEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.MeterInfoEquipment;
 
 /**
  * <p>

electricity/meter/src/main/java/com/gyee/gaia/meter/service/IMeterInfoLineService.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.service;
 
-import com.gyee.gaia.meter.entity.MeterInfoLine;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.MeterInfoLine;
 
 /**
  * <p>

electricity/meter/src/main/java/com/gyee/gaia/meter/service/IMeterInfoPowerstationService.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.service;
 
-import com.gyee.gaia.meter.entity.MeterInfoPowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.MeterInfoPowerstation;
 
 /**
  * <p>

electricity/meter/src/main/java/com/gyee/gaia/meter/service/IMeterInfoProjectService.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.service;
 
-import com.gyee.gaia.meter.entity.MeterInfoProject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.MeterInfoProject;
 
 /**
  * <p>

electricity/meter/src/main/java/com/gyee/gaia/meter/service/IMeterPointService.java

@@ -1,7 +1,7 @@
 package com.gyee.gaia.meter.service;
 
-import com.gyee.gaia.meter.entity.MeterPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.meter.entity.MeterPoint;
 
 /**
  * <p>

electricity/meter/src/main/resources/mappers-postgresql/EquipmentMapper.xml

@@ -3,5 +3,4 @@
 <mapper namespace="com.gyee.gaia.meter.mapper.EquipmentMapper">
 
 
-
 </mapper>

electricity/meter/src/main/resources/mappers-postgresql/LineMapper.xml

@@ -3,5 +3,4 @@
 <mapper namespace="com.gyee.gaia.meter.mapper.LineMapper">
 
 
-
 </mapper>

electricity/meter/src/main/resources/mappers-postgresql/PowerStationMapper.xml

@@ -3,5 +3,4 @@
 <mapper namespace="com.gyee.gaia.meter.mapper.PowerStationMapper">
 
 
-
 </mapper>

electricity/meter/src/main/resources/mappers-postgresql/ProjectMapper.xml

@@ -3,5 +3,4 @@
 <mapper namespace="com.gyee.gaia.meter.mapper.ProjectMapper">
 
 
-
 </mapper>

electricity/meter/src/main/resources/mappers-postgresql/TestingPointMapper.xml

@@ -3,5 +3,4 @@
 <mapper namespace="com.gyee.gaia.meter.mapper.TestingPointMapper">
 
 
-
 </mapper>

settings.gradle

@@ -14,5 +14,6 @@ include "timeseries:data-adapter"
 
 include "electricity:meter"
 include "state:wind"
+include "state:cause"
 
 

state/cause/src/main/java/com/gyee/gaia/cause/adapter/AdapterApi.java

@@ -0,0 +1,20 @@
+package com.gyee.gaia.cause.adapter;
+
+import com.gyee.gaia.cause.entity.PointData;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+@FeignClient(name = "adapter", url = "${meter.adapter-url}")
+public interface AdapterApi {
+
+    @GetMapping("/ts/history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+    List<PointData> getValuesByKey(@PathVariable(value = "tagName") String tagName, @PathVariable(value = "startTs") long startTs,
+                                   @PathVariable(value = "endTs") long endTs, @PathVariable(value = "interval") int interval);
+
+    @GetMapping("/ts/history/raw?tagName={tagName}&startTs={startTs}&endTs={endTs}")
+    List<PointData> getRawByKey(@PathVariable(value = "tagName") String tagName, @PathVariable(value = "startTs") long startTs,
+                                @PathVariable(value = "endTs") long endTs);
+}

state/cause/src/main/java/com/gyee/gaia/cause/config/ThreadPoolConfig.java

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

state/cause/src/main/java/com/gyee/gaia/cause/entity/EquipmentInfo.java

@@ -0,0 +1,9 @@
+package com.gyee.gaia.cause.entity;
+
+import lombok.Data;
+
+@Data
+public class EquipmentInfo {
+    private String id;
+    private PointData status;
+}

state/cause/src/main/java/com/gyee/gaia/cause/entity/LineInfo.java

@@ -0,0 +1,11 @@
+package com.gyee.gaia.cause.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LineInfo {
+    private String id;
+    private List<EquipmentInfo> equipmentInfos;
+}

state/cause/src/main/java/com/gyee/gaia/cause/entity/PointData.java

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

state/cause/src/main/java/com/gyee/gaia/cause/entity/PowerstationInfo.java

@@ -0,0 +1,25 @@
+package com.gyee.gaia.cause.entity;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class PowerstationInfo {
+    private String id;
+    private List<ProjectInfo> projectInfos;
+    private List<EquipmentInfo> equipmentInfos;
+
+    public List<EquipmentInfo> getEquipmentInfos() {
+        if (equipmentInfos == null) {
+            equipmentInfos = new ArrayList<>();
+            if (projectInfos != null) {
+                for (ProjectInfo projectInfo : projectInfos) {
+                    equipmentInfos.addAll(projectInfo.getEquipmentInfos());
+                }
+            }
+        }
+        return equipmentInfos;
+    }
+}

state/cause/src/main/java/com/gyee/gaia/cause/entity/ProjectInfo.java

@@ -0,0 +1,25 @@
+package com.gyee.gaia.cause.entity;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ProjectInfo {
+    private String id;
+    private List<LineInfo> lineInfos;
+    private List<EquipmentInfo> equipmentInfos;
+
+    public List<EquipmentInfo> getEquipmentInfos() {
+        if (equipmentInfos == null) {
+            equipmentInfos = new ArrayList<>();
+            if (lineInfos != null) {
+                for (LineInfo lineInfo : lineInfos) {
+                    equipmentInfos.addAll(lineInfo.getEquipmentInfos());
+                }
+            }
+        }
+        return equipmentInfos;
+    }
+}

state/cause/src/main/java/com/gyee/gaia/cause/entity/StateCause.java

@@ -0,0 +1,162 @@
+package com.gyee.gaia.cause.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author gfhd
+ * @since 2023-05-04
+ */
+@TableName("state_cause")
+public class StateCause implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场站
+     */
+    private String stationId;
+
+    /**
+     * 设备
+     */
+    private String equipmentId;
+
+    /**
+     * 事件-运行、限电、故障、受累、计划检修、待机
+     */
+    private String event;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 事前状态
+     */
+    private String advanceState;
+
+    /**
+     * 事后状态
+     */
+    private String afterState;
+
+    /**
+     * 用户标记
+     */
+    private String userFlag;
+
+    private Long time;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(String stationId) {
+        this.stationId = stationId;
+    }
+
+    public String getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(String equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getEvent() {
+        return event;
+    }
+
+    public void setEvent(String event) {
+        this.event = event;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getAdvanceState() {
+        return advanceState;
+    }
+
+    public void setAdvanceState(String advanceState) {
+        this.advanceState = advanceState;
+    }
+
+    public String getAfterState() {
+        return afterState;
+    }
+
+    public void setAfterState(String afterState) {
+        this.afterState = afterState;
+    }
+
+    public String getUserFlag() {
+        return userFlag;
+    }
+
+    public void setUserFlag(String userFlag) {
+        this.userFlag = userFlag;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    @Override
+    public String toString() {
+        return "StateCause{" +
+                "id = " + id +
+                ", stationId = " + stationId +
+                ", equipmentId = " + equipmentId +
+                ", event = " + event +
+                ", startTime = " + startTime +
+                ", endTime = " + endTime +
+                ", advanceState = " + advanceState +
+                ", afterState = " + afterState +
+                ", userFlag = " + userFlag +
+                "}";
+    }
+}

state/cause/src/main/java/com/gyee/gaia/cause/mapper/StateCauseMapper.java

@@ -0,0 +1,18 @@
+package com.gyee.gaia.cause.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.gaia.cause.entity.StateCause;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author gfhd
+ * @since 2023-05-04
+ */
+@Mapper
+public interface StateCauseMapper extends BaseMapper<StateCause> {
+
+}

state/cause/src/main/java/com/gyee/gaia/cause/service/CalculateService.java

@@ -0,0 +1,37 @@
+package com.gyee.gaia.cause.service;
+
+import com.gyee.gaia.cause.adapter.AdapterApi;
+import com.gyee.gaia.cause.entity.PointData;
+import com.gyee.gaia.common.data.point.TestingPoint;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CalculateService {
+
+    @Resource
+    private AdapterApi adapterApi;
+
+    public Map<TestingPoint, List<PointData>> getValue(List<TestingPoint> points, long starttime, long endtime) {
+        Map<TestingPoint, List<PointData>> keyDatas = new HashMap<>();
+        for (TestingPoint point : points) {
+            List<PointData> rawByKey = adapterApi.getRawByKey(point.getCode(), starttime, endtime);
+            keyDatas.put(point, rawByKey);
+        }
+        return keyDatas;
+    }
+
+    public void calculate(Map<TestingPoint, List<PointData>> value) {
+        for (Map.Entry<TestingPoint, List<PointData>> entry : value.entrySet()) {
+            //事前状态
+            double advanceState = -1;
+            for (PointData pointData : entry.getValue()) {
+
+            }
+        }
+    }
+}

state/cause/src/main/java/com/gyee/gaia/cause/service/IStateCauseService.java

@@ -0,0 +1,16 @@
+package com.gyee.gaia.cause.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.gaia.cause.entity.StateCause;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author gfhd
+ * @since 2023-05-04
+ */
+public interface IStateCauseService extends IService<StateCause> {
+
+}

state/cause/src/main/java/com/gyee/gaia/cause/service/impl/StateCauseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.gaia.cause.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.gaia.cause.entity.StateCause;
+import com.gyee.gaia.cause.mapper.StateCauseMapper;
+import com.gyee.gaia.cause.service.IStateCauseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author gfhd
+ * @since 2023-05-04
+ */
+@Service
+public class StateCauseServiceImpl extends ServiceImpl<StateCauseMapper, StateCause> implements IStateCauseService {
+
+}

state/cause/src/main/java/com/gyee/gaia/init/CacheContext.java

@@ -0,0 +1,58 @@
+package com.gyee.gaia.init;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.cause.config.AppConfig;
+import com.gyee.gaia.common.data.point.TestingPoint;
+import com.gyee.gaia.common.data.power.ModelPower;
+import com.gyee.gaia.dao.sql.point.ITestingPointService;
+import com.gyee.gaia.dao.sql.power.IModelPowerService;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Order(1)
+@Component
+public class CacheContext implements CommandLineRunner {
+
+    @Resource
+    private ITestingPointService testingPointService;
+    @Resource
+    private AppConfig appConfig;
+    @Resource
+    private IModelPowerService modelPowerService;
+
+    public static List<TestingPoint> state8Point;
+    public static Map<String, ModelPower> fullSpeeds;
+    public static Map<Double, String> stateMap;
+
+    @Override
+    public void run(String... args) throws Exception {
+        String state8 = appConfig.getUniformcode().get("state8");
+        QueryWrapper<TestingPoint> tpWrapper = new QueryWrapper<>();
+        tpWrapper.eq("uniformcode", state8);
+        state8Point = testingPointService.list(tpWrapper);
+
+        QueryWrapper<ModelPower> mpWrapper = new QueryWrapper<>();
+        mpWrapper.isNotNull("full_speed");
+        List<ModelPower> mpList = modelPowerService.list(mpWrapper);
+        fullSpeeds = mpList.stream().collect(Collectors.toMap(ModelPower::getModelId, Function.identity()));
+
+        stateMap = new HashMap<>();
+        stateMap.put(0.0, "停机");
+        stateMap.put(1.0, "上电");
+        stateMap.put(2.0, "待机");
+        stateMap.put(3.0, "启动");
+        stateMap.put(4.0, "并网");
+        stateMap.put(5.0, "故障");
+        stateMap.put(6.0, "维护");
+        stateMap.put(7.0, "离线");
+    }
+}

state/cause/src/main/resources/banner.txt

@@ -0,0 +1,6 @@
+ ####  #####   ##   ##### ######        ####    ##   #    #  ####  ###### 
+#        #    #  #    #   #            #    #  #  #  #    # #      #      
+ ####    #   #    #   #   #####  ##### #      #    # #    #  ####  #####  
+     #   #   ######   #   #            #      ###### #    #      # #      
+#    #   #   #    #   #   #            #    # #    # #    # #    # #      
+ ####    #   #    #   #   ######        ####  #    #  ####   ####  ###### 

state/cause/src/test/java/com/gyee/gaia/MyAppTests.java

@@ -0,0 +1,29 @@
+package com.gyee.gaia;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.cause.entity.StateCause;
+import com.gyee.gaia.cause.service.IStateCauseService;
+import com.gyee.gaia.dao.sql.point.ITestingPointService;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@SpringBootTest
+class MyAppTests {
+
+    @Resource
+    private ITestingPointService testingPointService;
+    @Resource
+    private IStateCauseService stateCauseService;
+
+    @Test
+    void postgrepsql() {
+
+        QueryWrapper<StateCause> scWrapper = new QueryWrapper<>();
+        scWrapper.select("max(end_time)");
+        Map<String, Object> map = stateCauseService.getMap(scWrapper);
+
+    }
+}

state/cause/src/test/resources/bootstrap.yaml

@@ -0,0 +1,82 @@
+server:
+  port: 8022
+
+spring:
+  application:
+    name: state-cause
+  profiles:
+    # 环境配置
+    active: nx
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.10.18:8848
+      config:
+        # 配置中心地址
+        server-addr: 192.168.10.18:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  jpa:
+    show-sql: false
+  cache:
+    type: SIMPLE
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://192.168.10.18:5432/nx_dev
+    username: gdprod
+    password: gyee123
+    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
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    default-property-inclusion: always
+
+meter:
+  stations: MHS_FDC,NSS_FDC
+
+mybatis-plus:
+  typeAliasesPackage: com.gyee.gaia.meter.entity
+  mapper-locations: classpath:mappers-postgresql/*.xml
+  global-config:
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+    id-type: 3
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+    field-strategy: 2
+    #驼峰下划线转换
+    db-column-underline: true
+    #mp2.3+ 全局表前缀 mp_
+    #table-prefix: mp_
+    #刷新mapper 调试神器
+    #refresh-mapper: true
+    #数据库大写下划线转换
+    #capital-mode: true
+    # Sequence序列接口实现类配置
+    key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
+    #逻辑删除配置（下面3个配置）
+    logic-delete-value: 1
+    logic-not-delete-value: 0
+    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+    #自定义填充策略接口实现
+    #meta-object-handler: com.baomidou.springboot.MyMetaObjectHandler
+  configuration:
+    #配置返回数据库(column下划线命名&&返回java实体是驼峰命名)，自动匹配无需as（没开启这个，SQL需要写as： select user_id as userId）
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    #配置JdbcTypeForNull, oracle数据库必须配置
+    jdbc-type-for-null: 'null'
+    callSettersOnNulls: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

state/wind/build.gradle

@@ -32,7 +32,7 @@ dependencies {
     implementation("com.alibaba:fastjson:$fastjsonVersion")
 
     implementation("$bootGroup:spring-boot-starter-test")
-    implementation("com.xuxueli:xxl-job-core:$xxlJobVersion")
+    //implementation("com.xuxueli:xxl-job-core:$xxlJobVersion")
     implementation("org.springframework.cloud:spring-cloud-starter-bootstrap")
     implementation("com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery")
     implementation("com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config")

state/wind/src/main/resources/mappers-postgresql/TestTb.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.gyee.gaia.state.wind.mapper.TestTbMapper">
 
 
-    <select id="getAll" parameterType="java.util.Map" resultType="com.gyee.gaia.state.wind.entity.TestTb">
+    <select id="getAll" parameterType="java.util.Map" resultType="com.gyee.gaia.wind.entity.TestTb">
         select *
         from testtb a
     </select>

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.golden;
 
-import com.gyee.wisdom.common.exception.WisdomException;
+import com.gyee.gaia.common.exception.WisdomException;
 import com.rtdb.service.impl.ServerImpl;
 import org.springframework.stereotype.Component;
 

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

@@ -1,9 +1,9 @@
 package com.gyee.gaia.dao.golden;
 
+import com.gyee.gaia.common.data.timeseries.*;
+import com.gyee.gaia.common.exception.WisdomException;
 import com.gyee.gaia.dao.timeseries.GoldenDao;
 import com.gyee.gaia.dao.timeseries.IDataChangeDao;
-import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.common.exception.WisdomException;
 import com.rtdb.model.DoubleData;
 import com.rtdb.model.Entity;
 import com.rtdb.model.IntData;

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

@@ -1,9 +1,9 @@
 package com.gyee.gaia.dao.golden;
 
+import com.gyee.gaia.common.data.timeseries.*;
+import com.gyee.gaia.common.exception.WisdomException;
 import com.gyee.gaia.dao.timeseries.GoldenDao;
 import com.gyee.gaia.dao.timeseries.IHistoryDao;
-import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.common.exception.WisdomException;
 import com.rtdb.api.model.RtdbData;
 import com.rtdb.enums.RtdbHisMode;
 import com.rtdb.enums.ValueType;

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

@@ -1,9 +1,9 @@
 package com.gyee.gaia.dao.golden;
 
+import com.gyee.gaia.common.data.timeseries.*;
+import com.gyee.gaia.common.exception.WisdomException;
 import com.gyee.gaia.dao.timeseries.GoldenDao;
 import com.gyee.gaia.dao.timeseries.ILatestDao;
-import com.gyee.wisdom.common.data.timeseries.*;
-import com.gyee.wisdom.common.exception.WisdomException;
 import com.rtdb.enums.Quality;
 import com.rtdb.model.*;
 import com.rtdb.service.impl.BaseImpl;

timeseries/dao-interface/build.gradle

@@ -19,7 +19,7 @@ bootJar.enabled = false
 jar.enabled = true
 
 dependencies {
-    implementation project(":common:data")
+    api project(":common:data")
     implementation project(":common:utils")
     api("$bootGroup:spring-boot-starter")
 }

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.Alerthistory;
+import com.gyee.gaia.common.data.alarm.Alerthistory;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.AlerthistoryNew;
+import com.gyee.gaia.common.data.alarm.AlerthistoryNew;
 
 import java.util.List;
 

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointAI;
+import com.gyee.gaia.common.data.alarm.ElectricalTestingPointAI;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.ElectricalTestingPointDI;
+import com.gyee.gaia.common.data.alarm.ElectricalTestingPointDI;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.FaultHistory;
+import com.gyee.gaia.common.data.alarm.FaultHistory;
 
 import java.util.List;
 

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.GyeeLine;
+import com.gyee.gaia.common.data.alarm.GyeeLine;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.GyeePowerStation;
+import com.gyee.gaia.common.data.alarm.GyeePowerStation;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.GyeeProject;
+import com.gyee.gaia.common.data.alarm.GyeeProject;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.GyeeWindturbine;
+import com.gyee.gaia.common.data.alarm.GyeeWindturbine;
 
 import java.util.List;
 

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

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

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

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

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

@@ -1,7 +1,7 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.Warning;
-import com.gyee.wisdom.common.data.alarm.WarningClassify;
+import com.gyee.gaia.common.data.alarm.Warning;
+import com.gyee.gaia.common.data.alarm.WarningClassify;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.Warningfj;
+import com.gyee.gaia.common.data.alarm.Warningfj;
 
 import java.util.List;
 

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.alarm;
 
-import com.gyee.wisdom.common.data.alarm.Warningsyz;
+import com.gyee.gaia.common.data.alarm.Warningsyz;
 
 import java.util.List;
 

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.control;
 
-import com.gyee.wisdom.common.data.control.ControlLog;
+import com.gyee.gaia.common.data.control.ControlLog;
 
 import java.util.Date;
 import java.util.List;

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.control;
 
-import com.gyee.wisdom.common.data.control.GycpCmdInfo;
+import com.gyee.gaia.common.data.control.GycpCmdInfo;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.control;
 
-import com.gyee.wisdom.common.data.control.InputOrOutputSpeedTotal;
+import com.gyee.gaia.common.data.control.InputOrOutputSpeedTotal;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.feature;
 
-import com.gyee.wisdom.common.data.feature.FeatureStat;
+import com.gyee.gaia.common.data.feature.FeatureStat;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.point;
 
-import com.gyee.wisdom.common.data.point.ElectricalTestingPoint;
+import com.gyee.gaia.common.data.point.ElectricalTestingPoint;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.point;
 
-import com.gyee.wisdom.common.data.point.LevelTypeTestingPoint;
+import com.gyee.gaia.common.data.point.LevelTypeTestingPoint;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.point;
 
-import com.gyee.wisdom.common.data.point.PowerStationTestingPoint;
+import com.gyee.gaia.common.data.point.PowerStationTestingPoint;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.point;
 
-import com.gyee.wisdom.common.data.point.WindturbineTestingPoint;
+import com.gyee.gaia.common.data.point.WindturbineTestingPoint;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 package com.gyee.gaia.dao.point;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.wisdom.common.data.point.TestingPoint;
+import com.gyee.gaia.common.data.point.TestingPoint;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.pv_inverter;
 
-import com.gyee.wisdom.common.data.photovoltaic.Inverter;
+import com.gyee.gaia.common.data.photovoltaic.Inverter;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.DataDictionary;
+import com.gyee.gaia.common.data.system.model.DataDictionary;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.Menu;
+import com.gyee.gaia.common.data.system.model.Menu;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.Resource;
+import com.gyee.gaia.common.data.system.model.Resource;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.Role;
+import com.gyee.gaia.common.data.system.model.Role;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.SysLog;
+import com.gyee.gaia.common.data.system.model.SysLog;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.User;
+import com.gyee.gaia.common.data.system.model.User;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.system;
 
-import com.gyee.wisdom.common.data.system.model.User;
+import com.gyee.gaia.common.data.system.model.User;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.things;
 
-import com.gyee.wisdom.common.data.timeseries.TsPoint;
+import com.gyee.gaia.common.data.timeseries.TsPoint;
 
 import java.util.List;
 

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.topic;
 
-import com.gyee.wisdom.common.data.topic.Topic;
+import com.gyee.gaia.common.data.topic.Topic;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package com.gyee.gaia.dao.topic;
 
-import com.gyee.wisdom.common.data.topic.TopicPoint;
+import com.gyee.gaia.common.data.topic.TopicPoint;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.wisdom.common.data.windturbine.Equipment;
+import com.gyee.gaia.common.data.windturbine.Equipment;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.wisdom.common.data.windturbine.Line;
+import com.gyee.gaia.common.data.windturbine.Line;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.gyee.gaia.dao.windturbine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.wisdom.common.data.windturbine.Powerstation;
+import com.gyee.gaia.common.data.windturbine.Powerstation;
 import org.apache.ibatis.annotations.Mapper;
 
 /**