Skip to content

I
iot-service
Commit 969920ec authored by zhangzc's avatar zhangzc
Browse files
Options

123

parent 6befafc9
Pipeline #558 failed with stages
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 612 additions and 574 deletions
      pom.xml
      View file @ 969920ec
      ......@@ -8,11 +8,11 @@
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>2.1.1.RELEASE</version>
      </parent>
      <groupId>com.esv.datacenter</groupId>
      <artifactId>datacenter-iot-service</artifactId>
      <groupId>com.esv.superhive</groupId>
      <artifactId>superhive-iot-service</artifactId>
      <version>1.0.0-SNAPSHOT</version>
      <name>datacenter-iot-service</name>
      <description>datacenter-iot-service</description>
      <name>superhive-iot-service</name>
      <description>superhive-iot-service</description>
      <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      ......@@ -181,7 +181,7 @@
      </profiles>
      <build>
      <finalName>datacenter-iot-service</finalName>
      <finalName>superhive-iot-service</finalName>
      <plugins>
      <plugin>
      <groupId>org.springframework.boot</groupId>
      ......
      src/main/java/com/esv/datacenter/iot/IoTApplication.java → src/main/java/com/esv/superhive/iot/IoTApplication.java
      View file @ 969920ec
      package com.esv.datacenter.iot;
      package com.esv.superhive.iot;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.datacenter.iot.common.util.LogUtils;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.util.LogUtils;
      import org.slf4j.MDC;
      import org.springframework.boot.SpringApplication;
      import org.springframework.boot.autoconfigure.SpringBootApplication;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/ApplicationLoadRunner.java → src/main/java/com/esv/superhive/iot/common/component/ApplicationLoadRunner.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelAlarmRuleService;
      import com.esv.superhive.iot.module.datamodel.service.DataModelAlarmRuleService;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.beans.factory.annotation.Value;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/BaseDataComponent.java → src/main/java/com/esv/superhive/iot/common/component/BaseDataComponent.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import com.esv.datacenter.iot.common.util.FileUtils;
      import com.esv.superhive.iot.common.util.FileUtils;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.beans.factory.annotation.Value;
      import org.springframework.cloud.context.config.annotation.RefreshScope;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/DataSourceConfig.java → src/main/java/com/esv/superhive/iot/common/component/DataSourceConfig.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import lombok.Data;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/DynamicDataSource.java → src/main/java/com/esv/superhive/iot/common/component/DynamicDataSource.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import com.zaxxer.hikari.HikariDataSource;
      import lombok.extern.slf4j.Slf4j;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/MqttAcl.java → src/main/java/com/esv/superhive/iot/common/component/MqttAcl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/MqttClientAuthComponent.java → src/main/java/com/esv/superhive/iot/common/component/MqttClientAuthComponent.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import com.alibaba.fastjson.JSON;
      import com.alibaba.fastjson.JSONObject;
      ......@@ -143,7 +143,7 @@ public class MqttClientAuthComponent {
      /**
      * @description 获取客户端的Topic信息
      * @param clientId:
      * @return java.util.List<com.esv.datacenter.iot.common.component.MqttAcl>
      * @return java.util.List<com.esv.superhive.iot.common.component.MqttAcl>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/14 10:47
      **/
      ......
      src/main/java/com/esv/datacenter/iot/common/component/RedisComponent.java → src/main/java/com/esv/superhive/iot/common/component/RedisComponent.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.cache.CacheManager;
      import org.springframework.data.redis.core.RedisTemplate;
      import org.springframework.stereotype.Component;
      import org.springframework.util.CollectionUtils;
      ......
      src/main/java/com/esv/datacenter/iot/common/component/TimescaleComponent.java → src/main/java/com/esv/superhive/iot/common/component/TimescaleComponent.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.component;
      package com.esv.superhive.iot.common.component;
      import com.esv.datacenter.iot.common.util.DateUtils;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.superhive.iot.common.util.DateUtils;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.zaxxer.hikari.HikariDataSource;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.StringUtils;
      ......
      src/main/java/com/esv/datacenter/iot/common/constants/CommonConstants.java → src/main/java/com/esv/superhive/iot/common/constants/CommonConstants.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.constants;
      package com.esv.superhive.iot.common.constants;
      /**
      * @description:
      ......
      src/main/java/com/esv/datacenter/iot/common/em/DbDeletedEnum.java → src/main/java/com/esv/superhive/iot/common/em/DbDeletedEnum.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.em;
      package com.esv.superhive.iot.common.em;
      /**
      * @description: DB记录是否删除标识
      ......
      src/main/java/com/esv/datacenter/iot/common/exception/EException.java → src/main/java/com/esv/superhive/iot/common/exception/EException.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.exception;
      package com.esv.superhive.iot.common.exception;
      /**
      * @description: 自定义业务异常
      ......
      src/main/java/com/esv/datacenter/iot/common/filter/AuthFilter.java → src/main/java/com/esv/superhive/iot/common/filter/AuthFilter.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.filter;
      package com.esv.superhive.iot.common.filter;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.response.EResponse;
      import lombok.extern.slf4j.Slf4j;
      import javax.servlet.*;
      ......
      src/main/java/com/esv/datacenter/iot/common/filter/LogbackFilter.java → src/main/java/com/esv/superhive/iot/common/filter/LogbackFilter.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.filter;
      package com.esv.superhive.iot.common.filter;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.StringUtils;
      import org.slf4j.MDC;
      ......
      src/main/java/com/esv/datacenter/iot/common/filter/RestLogFilter.java → src/main/java/com/esv/superhive/iot/common/filter/RestLogFilter.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.filter;
      package com.esv.superhive.iot.common.filter;
      import com.alibaba.fastjson.JSONObject;
      import com.esv.datacenter.iot.common.util.ReqUtils;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.datacenter.iot.common.wrapper.RestRequestWrapper;
      import com.esv.datacenter.iot.common.wrapper.RestResponseWrapper;
      import com.esv.superhive.iot.common.util.ReqUtils;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.wrapper.RestRequestWrapper;
      import com.esv.superhive.iot.common.wrapper.RestResponseWrapper;
      import lombok.extern.slf4j.Slf4j;
      import javax.servlet.*;
      ......
      src/main/java/com/esv/datacenter/iot/common/handler/RestExceptionHandler.java → src/main/java/com/esv/superhive/iot/common/handler/RestExceptionHandler.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.handler;
      package com.esv.superhive.iot.common.handler;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.context.support.DefaultMessageSourceResolvable;
      import org.springframework.http.converter.HttpMessageNotReadableException;
      ......
      src/main/java/com/esv/datacenter/iot/common/response/ECode.java → src/main/java/com/esv/superhive/iot/common/response/ECode.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.response;
      package com.esv.superhive.iot.common.response;
      /**
      * @description: 系统响应码
      ......
      src/main/java/com/esv/datacenter/iot/common/response/EResponse.java → src/main/java/com/esv/superhive/iot/common/response/EResponse.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.response;
      package com.esv.superhive.iot.common.response;
      import com.esv.datacenter.iot.common.util.LogUtils;
      import com.esv.superhive.iot.common.util.LogUtils;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      import org.apache.commons.lang3.builder.ToStringStyle;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/AESSecretUtils.java → src/main/java/com/esv/superhive/iot/common/util/AESSecretUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.ArrayUtils;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/CaptchaUtils.java → src/main/java/com/esv/superhive/iot/common/util/CaptchaUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import java.awt.*;
      import java.awt.image.BufferedImage;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/DateUtils.java → src/main/java/com/esv/superhive/iot/common/util/DateUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import org.apache.commons.lang3.StringUtils;
      import org.joda.time.DateTime;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/FeignUtils.java → src/main/java/com/esv/superhive/iot/common/util/FeignUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import com.alibaba.fastjson.JSONArray;
      import com.alibaba.fastjson.JSONObject;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.exception.EException;
      import lombok.extern.slf4j.Slf4j;
      /**
      ......
      src/main/java/com/esv/datacenter/iot/common/util/FileUtils.java → src/main/java/com/esv/superhive/iot/common/util/FileUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import lombok.extern.slf4j.Slf4j;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/LogUtils.java → src/main/java/com/esv/superhive/iot/common/util/LogUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import org.apache.commons.lang3.StringUtils;
      import org.slf4j.MDC;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/ReqUtils.java → src/main/java/com/esv/superhive/iot/common/util/ReqUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import com.alibaba.fastjson.JSONObject;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.gateway.common.GatewayHeaders;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.StringUtils;
      ......
      src/main/java/com/esv/datacenter/iot/common/util/SqlUtils.java → src/main/java/com/esv/superhive/iot/common/util/SqlUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.common.util.SqlUtils
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.common.util.SqlUtils
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/13 17:26
      ......
      src/main/java/com/esv/datacenter/iot/common/util/ThreadLocalCacheUtils.java → src/main/java/com/esv/superhive/iot/common/util/ThreadLocalCacheUtils.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.util;
      package com.esv.superhive.iot.common.util;
      import java.util.HashMap;
      import java.util.Map;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorDelete.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorDelete.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorDetail.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorDetail.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorInsert.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorInsert.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorList.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorList.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorListById.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorListById.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorPage.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorPage.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/validator/groups/ValidatorUpdate.java → src/main/java/com/esv/superhive/iot/common/validator/groups/ValidatorUpdate.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.validator.groups;
      package com.esv.superhive.iot.common.validator.groups;
      import javax.validation.groups.Default;
      ......
      src/main/java/com/esv/datacenter/iot/common/vo/PageResultVO.java → src/main/java/com/esv/superhive/iot/common/vo/PageResultVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.vo;
      package com.esv.superhive.iot.common.vo;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import lombok.Data;
      ......
      src/main/java/com/esv/datacenter/iot/common/wrapper/RestRequestWrapper.java → src/main/java/com/esv/superhive/iot/common/wrapper/RestRequestWrapper.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.wrapper;
      package com.esv.superhive.iot.common.wrapper;
      import javax.servlet.ReadListener;
      import javax.servlet.ServletInputStream;
      ......
      src/main/java/com/esv/datacenter/iot/common/wrapper/RestResponseWrapper.java → src/main/java/com/esv/superhive/iot/common/wrapper/RestResponseWrapper.java
      View file @ 969920ec
      package com.esv.datacenter.iot.common.wrapper;
      package com.esv.superhive.iot.common.wrapper;
      import lombok.AllArgsConstructor;
      import lombok.Data;
      ......
      src/main/java/com/esv/datacenter/iot/config/CacheConfig.java → src/main/java/com/esv/superhive/iot/config/CacheConfig.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config;
      package com.esv.superhive.iot.config;
      import com.fasterxml.jackson.annotation.JsonAutoDetect;
      import com.fasterxml.jackson.annotation.PropertyAccessor;
      ......
      src/main/java/com/esv/datacenter/iot/config/FeignConfigure.java → src/main/java/com/esv/superhive/iot/config/FeignConfigure.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config;
      package com.esv.superhive.iot.config;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.cloud.openfeign.EnableFeignClients;
      ......@@ -13,7 +13,7 @@ import org.springframework.web.client.RestTemplate;
      * @createTime: 2020/04/17 18:00
      * @version:1.0
      */
      @EnableFeignClients(basePackages = "com.esv.datacenter.iot.feign")
      @EnableFeignClients(basePackages = "com.esv.superhive.iot.feign")
      @Configuration
      @Slf4j
      public class FeignConfigure {
      ......
      src/main/java/com/esv/datacenter/iot/config/JacksonConfig.java → src/main/java/com/esv/superhive/iot/config/JacksonConfig.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config;
      package com.esv.superhive.iot.config;
      import com.fasterxml.jackson.databind.ObjectMapper;
      import com.fasterxml.jackson.databind.SerializationFeature;
      ......
      src/main/java/com/esv/datacenter/iot/config/LogFilterConfig.java → src/main/java/com/esv/superhive/iot/config/LogFilterConfig.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config;
      package com.esv.superhive.iot.config;
      import com.esv.datacenter.iot.common.filter.AuthFilter;
      import com.esv.datacenter.iot.common.filter.LogbackFilter;
      import com.esv.datacenter.iot.common.filter.RestLogFilter;
      import com.esv.superhive.iot.common.filter.AuthFilter;
      import com.esv.superhive.iot.common.filter.LogbackFilter;
      import com.esv.superhive.iot.common.filter.RestLogFilter;
      import org.springframework.boot.web.servlet.FilterRegistrationBean;
      import org.springframework.context.annotation.Bean;
      import org.springframework.context.annotation.Configuration;
      ......
      src/main/java/com/esv/datacenter/iot/config/mybatis/DataPermHandler.java → src/main/java/com/esv/superhive/iot/config/mybatis/DataPermHandler.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config.mybatis;
      package com.esv.superhive.iot.config.mybatis;
      import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
      import com.esv.datacenter.iot.common.util.ReqUtils;
      import com.esv.superhive.iot.common.util.ReqUtils;
      import com.esv.gateway.common.DataPermsType;
      import com.esv.gateway.common.GatewayHeaders;
      import net.sf.jsqlparser.expression.Expression;
      ......
      src/main/java/com/esv/datacenter/iot/config/mybatis/DataPermParser.java → src/main/java/com/esv/superhive/iot/config/mybatis/DataPermParser.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config.mybatis;
      package com.esv.superhive.iot.config.mybatis;
      import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
      import lombok.extern.slf4j.Slf4j;
      ......
      src/main/java/com/esv/datacenter/iot/config/mybatis/EsvMetaObjectHandler.java → src/main/java/com/esv/superhive/iot/config/mybatis/EsvMetaObjectHandler.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config.mybatis;
      package com.esv.superhive.iot.config.mybatis;
      import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
      import com.esv.datacenter.iot.common.util.ReqUtils;
      import com.esv.superhive.iot.common.util.ReqUtils;
      import com.esv.gateway.common.GatewayHeaders;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.StringUtils;
      ......
      src/main/java/com/esv/datacenter/iot/config/mybatis/MybatisPlusConfig.java → src/main/java/com/esv/superhive/iot/config/mybatis/MybatisPlusConfig.java
      View file @ 969920ec
      package com.esv.datacenter.iot.config.mybatis;
      package com.esv.superhive.iot.config.mybatis;
      import com.baomidou.mybatisplus.core.parser.ISqlParser;
      import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
      ......@@ -18,7 +18,7 @@ import java.util.List;
      * @version:1.0
      */
      @Configuration
      @MapperScan({"com.esv.datacenter.iot.*.*.dao"})
      @MapperScan({"com.esv.superhive.iot.*.*.dao"})
      public class MybatisPlusConfig {
      /**
      ......
      src/main/java/com/esv/datacenter/iot/feign/EMQFeignService.java → src/main/java/com/esv/superhive/iot/feign/EMQFeignService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.feign;
      package com.esv.superhive.iot.feign;
      import com.alibaba.fastjson.JSONObject;
      import org.springframework.cloud.openfeign.FeignClient;
      ......@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.GetMapping;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.feign.EMQFeignService
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.feign.EMQFeignService
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/12 15:25
      ......
      src/main/java/com/esv/datacenter/iot/feign/FeignBaseService.java → src/main/java/com/esv/superhive/iot/feign/FeignBaseService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.feign;
      package com.esv.superhive.iot.feign;
      import com.alibaba.fastjson.JSONObject;
      import org.springframework.cloud.openfeign.FeignClient;
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/controller/DeviceDataAlarmController.java → src/main/java/com/esv/superhive/iot/module/alarm/controller/DeviceDataAlarmController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.controller;
      package com.esv.superhive.iot.module.alarm.controller;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.common.validator.groups.ValidatorList;
      import com.esv.datacenter.iot.common.vo.PageResultVO;
      import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.datacenter.iot.module.alarm.form.AlarmListForm;
      import com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.validator.groups.ValidatorList;
      import com.esv.superhive.iot.common.vo.PageResultVO;
      import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
      import com.esv.superhive.iot.module.alarm.service.DeviceDataAlarmService;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.validation.annotation.Validated;
      import org.springframework.web.bind.annotation.*;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.alarm.controller.DeviceDataAlarmController
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.alarm.controller.DeviceDataAlarmController
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/7 14:21
      ......@@ -34,7 +34,7 @@ public class DeviceDataAlarmController {
      /**
      * description 告警查询
      * param [alarmListForm]
      * return com.esv.datacenter.iot.common.response.EResponse<java.util.List<com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO>>
      * return com.esv.superhive.iot.common.response.EResponse<java.util.List<com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO>>
      * author chenfm
      * createTime 2020/8/7 16:59
      **/
      ......@@ -47,7 +47,7 @@ public class DeviceDataAlarmController {
      /**
      * description 告警详情
      * param [id]
      * return com.esv.datacenter.iot.common.response.EResponse<com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO>
      * return com.esv.superhive.iot.common.response.EResponse<com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO>
      * author chenfm
      * createTime 2020/8/7 17:00
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/dao/DeviceDataAlarmDao.java → src/main/java/com/esv/superhive/iot/module/alarm/dao/DeviceDataAlarmDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.dao;
      package com.esv.superhive.iot.module.alarm.dao;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.datacenter.iot.module.alarm.form.AlarmListForm;
      import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
      import org.apache.ibatis.annotations.Mapper;
      import org.apache.ibatis.annotations.Param;
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/dto/DeviceDataAlarmDTO.java → src/main/java/com/esv/superhive/iot/module/alarm/dto/DeviceDataAlarmDTO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.dto;
      package com.esv.superhive.iot.module.alarm.dto;
      import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import lombok.Data;
      import lombok.EqualsAndHashCode;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/7 14:19
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/entity/DeviceDataAlarmEntity.java → src/main/java/com/esv/superhive/iot/module/alarm/entity/DeviceDataAlarmEntity.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.entity;
      package com.esv.superhive.iot.module.alarm.entity;
      import com.baomidou.mybatisplus.annotation.TableId;
      import com.baomidou.mybatisplus.annotation.TableName;
      ......@@ -8,8 +8,8 @@ import java.util.Date;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/7 14:12
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/form/AlarmListForm.java → src/main/java/com/esv/superhive/iot/module/alarm/form/AlarmListForm.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.form;
      package com.esv.superhive.iot.module.alarm.form;
      import com.esv.datacenter.iot.common.validator.groups.ValidatorList;
      import com.esv.superhive.iot.common.validator.groups.ValidatorList;
      import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
      import lombok.Data;
      import org.hibernate.validator.constraints.Range;
      ......@@ -9,8 +9,8 @@ import javax.validation.constraints.NotNull;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.alarm.form.AlarmListForm
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.alarm.form.AlarmListForm
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/7 14:25
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/service/DeviceDataAlarmService.java → src/main/java/com/esv/superhive/iot/module/alarm/service/DeviceDataAlarmService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.service;
      package com.esv.superhive.iot.module.alarm.service;
      import com.baomidou.mybatisplus.extension.service.IService;
      import com.esv.datacenter.iot.common.vo.PageResultVO;
      import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.datacenter.iot.module.alarm.form.AlarmListForm;
      import com.esv.superhive.iot.common.vo.PageResultVO;
      import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.alarm.service.DeviceDataAlarmService
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/7 14:17
      ......
      src/main/java/com/esv/datacenter/iot/module/alarm/service/impl/DeviceDataAlarmServiceImpl.java → src/main/java/com/esv/superhive/iot/module/alarm/service/impl/DeviceDataAlarmServiceImpl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.alarm.service.impl;
      package com.esv.superhive.iot.module.alarm.service.impl;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
      import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
      import com.esv.datacenter.iot.common.vo.PageResultVO;
      import com.esv.datacenter.iot.module.alarm.dao.DeviceDataAlarmDao;
      import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.datacenter.iot.module.alarm.form.AlarmListForm;
      import com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService;
      import com.esv.superhive.iot.common.vo.PageResultVO;
      import com.esv.superhive.iot.module.alarm.dao.DeviceDataAlarmDao;
      import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
      import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
      import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
      import com.esv.superhive.iot.module.alarm.service.DeviceDataAlarmService;
      import org.springframework.stereotype.Service;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.alarm.service.impl.DeviceDataAlarmServiceImpl
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.alarm.service.impl.DeviceDataAlarmServiceImpl
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/7 14:17
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/controller/DashboardController.java → src/main/java/com/esv/superhive/iot/module/dashboard/controller/DashboardController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.controller;
      package com.esv.superhive.iot.module.dashboard.controller;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO;
      import com.esv.datacenter.iot.module.dashboard.req.DashboardReq;
      import com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq;
      import com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq;
      import com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq;
      import com.esv.datacenter.iot.module.dashboard.service.DashboardService;
      import com.esv.datacenter.iot.module.dashboard.service.PythonService;
      import com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO;
      import com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO;
      import com.esv.superhive.iot.module.dashboard.req.DashboardReq;
      import com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq;
      import com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq;
      import com.esv.superhive.iot.module.dashboard.req.TimeDomainReq;
      import com.esv.superhive.iot.module.dashboard.service.DashboardService;
      import com.esv.superhive.iot.module.dashboard.service.PythonService;
      import com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO;
      import com.esv.superhive.iot.module.dashboard.vo.ModelDataVO;
      import lombok.extern.slf4j.Slf4j;
      import org.postgresql.jdbc.PgArray;
      import org.springframework.beans.factory.annotation.Autowired;
      ......@@ -25,8 +25,8 @@ import java.util.Map;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.controller.DashboardController
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.controller.DashboardController
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/7/31 17:53
      ......@@ -50,7 +50,7 @@ public class DashboardController {
      /**
      * description 查询模型数据
      * param [dashboardReqList]
      * return com.esv.datacenter.iot.common.response.EResponse<java.util.List<com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO>>
      * return com.esv.superhive.iot.common.response.EResponse<java.util.List<com.esv.superhive.iot.module.dashboard.vo.ModelDataVO>>
      * author chenfm
      * createTime 2020/8/20 14:54
      **/
      ......@@ -63,7 +63,7 @@ public class DashboardController {
      /**
      * description 查询模型历史数据
      * param [historyDashboardReq]
      * return com.esv.datacenter.iot.common.response.EResponse<java.util.List<com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO>>
      * return com.esv.superhive.iot.common.response.EResponse<java.util.List<com.esv.superhive.iot.module.dashboard.vo.ModelDataVO>>
      * author chenfm
      * createTime 2020/8/20 14:55
      **/
      ......@@ -85,7 +85,7 @@ public class DashboardController {
      /**
      * description 时域数据
      * param []
      * return com.esv.datacenter.iot.common.response.EResponse<com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO>
      * return com.esv.superhive.iot.common.response.EResponse<com.esv.superhive.iot.module.dashboard.vo.ModelDataVO>
      * author chenfm
      * createTime 2020/8/20 14:57
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/dto/DataPreviewDTO.java → src/main/java/com/esv/superhive/iot/module/dashboard/dto/DataPreviewDTO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.dto;
      package com.esv.superhive.iot.module.dashboard.dto;
      import lombok.Data;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/21 16:25
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/req/DashboardReq.java → src/main/java/com/esv/superhive/iot/module/dashboard/req/DashboardReq.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.req;
      package com.esv.superhive.iot.module.dashboard.req;
      import lombok.Data;
      ......@@ -6,8 +6,8 @@ import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.req.DashboardReq
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.req.DashboardReq
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/3 20:16
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/req/FrequencyDomainReq.java → src/main/java/com/esv/superhive/iot/module/dashboard/req/FrequencyDomainReq.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.req;
      package com.esv.superhive.iot.module.dashboard.req;
      import lombok.Data;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/20 17:54
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/req/HistoryDashboardReq.java → src/main/java/com/esv/superhive/iot/module/dashboard/req/HistoryDashboardReq.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.req;
      package com.esv.superhive.iot.module.dashboard.req;
      import lombok.Data;
      ......@@ -7,8 +7,8 @@ import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/11 10:08
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/req/TimeDomainReq.java → src/main/java/com/esv/superhive/iot/module/dashboard/req/TimeDomainReq.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.req;
      package com.esv.superhive.iot.module.dashboard.req;
      import lombok.Data;
      ......@@ -6,8 +6,8 @@ import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.req.TimeDomainReq
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/20 15:10
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/service/DashboardService.java → src/main/java/com/esv/superhive/iot/module/dashboard/service/DashboardService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.service;
      package com.esv.superhive.iot.module.dashboard.service;
      import com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO;
      import com.esv.datacenter.iot.module.dashboard.req.DashboardReq;
      import com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq;
      import com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq;
      import com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO;
      import com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO;
      import com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO;
      import com.esv.superhive.iot.module.dashboard.req.DashboardReq;
      import com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq;
      import com.esv.superhive.iot.module.dashboard.req.TimeDomainReq;
      import com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO;
      import com.esv.superhive.iot.module.dashboard.vo.ModelDataVO;
      import java.util.List;
      import java.util.Map;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.service.DashboardService
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.service.DashboardService
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/3 20:23
      ......@@ -24,7 +24,7 @@ public interface DashboardService {
      /**
      * description 查询模型数据
      * param [dashboardReqList]
      * return java.util.List<com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO>
      * return java.util.List<com.esv.superhive.iot.module.dashboard.vo.ModelDataVO>
      * author chenfm
      * createTime 2020/8/20 15:13
      **/
      ......@@ -33,7 +33,7 @@ public interface DashboardService {
      /**
      * description 查询模型历史数据
      * param [historyDashboardReq]
      * return java.util.List<com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO>
      * return java.util.List<com.esv.superhive.iot.module.dashboard.vo.ModelDataVO>
      * author chenfm
      * createTime 2020/8/20 15:13
      **/
      ......@@ -42,7 +42,7 @@ public interface DashboardService {
      /**
      * description 时域数据
      * param [timeDomainReq]
      * return com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO
      * return com.esv.superhive.iot.module.dashboard.vo.ModelDataVO
      * author chenfm
      * createTime 2020/8/20 15:13
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/service/PythonService.java → src/main/java/com/esv/superhive/iot/module/dashboard/service/PythonService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.service;
      package com.esv.superhive.iot.module.dashboard.service;
      import com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq;
      import com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq;
      import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.service.PythonService
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.service.PythonService
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/21 11:40
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/service/impl/DashboardServiceImpl.java → src/main/java/com/esv/superhive/iot/module/dashboard/service/impl/DashboardServiceImpl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.service.impl;
      package com.esv.superhive.iot.module.dashboard.service.impl;
      import com.alibaba.fastjson.JSON;
      import com.alibaba.fastjson.JSONArray;
      import com.esv.datacenter.iot.common.component.TimescaleComponent;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.datacenter.iot.common.util.SqlUtils;
      import com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO;
      import com.esv.datacenter.iot.module.dashboard.req.DashboardReq;
      import com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq;
      import com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq;
      import com.esv.datacenter.iot.module.dashboard.service.DashboardService;
      import com.esv.datacenter.iot.module.dashboard.vo.ChartVO;
      import com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO;
      import com.esv.datacenter.iot.module.dashboard.vo.FunctionVO;
      import com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO;
      import com.esv.superhive.iot.common.component.TimescaleComponent;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.common.util.SqlUtils;
      import com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO;
      import com.esv.superhive.iot.module.dashboard.req.DashboardReq;
      import com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq;
      import com.esv.superhive.iot.module.dashboard.req.TimeDomainReq;
      import com.esv.superhive.iot.module.dashboard.service.DashboardService;
      import com.esv.superhive.iot.module.dashboard.vo.ChartVO;
      import com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO;
      import com.esv.superhive.iot.module.dashboard.vo.FunctionVO;
      import com.esv.superhive.iot.module.dashboard.vo.ModelDataVO;
      import com.zaxxer.hikari.HikariDataSource;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.beans.factory.annotation.Autowired;
      ......@@ -30,8 +30,8 @@ import java.util.Map;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.service.impl.DashboardServiceImpl
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.service.impl.DashboardServiceImpl
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/3 20:24
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/service/impl/PythonServiceImpl.java → src/main/java/com/esv/superhive/iot/module/dashboard/service/impl/PythonServiceImpl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.service.impl;
      package com.esv.superhive.iot.module.dashboard.service.impl;
      import com.esv.datacenter.iot.common.constants.CommonConstants;
      import com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq;
      import com.esv.datacenter.iot.module.dashboard.service.PythonService;
      import com.esv.superhive.iot.common.constants.CommonConstants;
      import com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq;
      import com.esv.superhive.iot.module.dashboard.service.PythonService;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.beans.factory.annotation.Value;
      import org.springframework.stereotype.Service;
      ......@@ -14,8 +14,8 @@ import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.service.impl.PythonServiceImpl
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.service.impl.PythonServiceImpl
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/21 11:41
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/vo/ChartVO.java → src/main/java/com/esv/superhive/iot/module/dashboard/vo/ChartVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.vo;
      package com.esv.superhive.iot.module.dashboard.vo;
      import lombok.Data;
      ......@@ -6,8 +6,8 @@ import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.vo.ChartVO
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.vo.ChartVO
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/21 13:45
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/vo/FrequencyDomainVO.java → src/main/java/com/esv/superhive/iot/module/dashboard/vo/FrequencyDomainVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.vo;
      package com.esv.superhive.iot.module.dashboard.vo;
      import lombok.Data;
      ......@@ -6,8 +6,8 @@ import java.util.List;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/21 13:44
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/vo/FunctionVO.java → src/main/java/com/esv/superhive/iot/module/dashboard/vo/FunctionVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.vo;
      package com.esv.superhive.iot.module.dashboard.vo;
      import lombok.Data;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.vo.FunctionVO
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.vo.FunctionVO
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/21 13:45
      ......
      src/main/java/com/esv/datacenter/iot/module/dashboard/vo/ModelDataVO.java → src/main/java/com/esv/superhive/iot/module/dashboard/vo/ModelDataVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.dashboard.vo;
      package com.esv.superhive.iot.module.dashboard.vo;
      import lombok.Data;
      ......@@ -7,8 +7,8 @@ import java.util.Map;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.dashboard.vo.ModelDataVO
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/10 15:29
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/controller/DataModelAlarmRuleController.java → src/main/java/com/esv/superhive/iot/module/datamodel/controller/DataModelAlarmRuleController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.controller;
      package com.esv.superhive.iot.module.datamodel.controller;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.common.validator.groups.ValidatorInsert;
      import com.esv.datacenter.iot.common.validator.groups.ValidatorList;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelAlarmRuleForm;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelAlarmRuleService;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelService;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.validator.groups.ValidatorInsert;
      import com.esv.superhive.iot.common.validator.groups.ValidatorList;
      import com.esv.superhive.iot.module.datamodel.form.DataModelAlarmRuleForm;
      import com.esv.superhive.iot.module.datamodel.service.DataModelAlarmRuleService;
      import com.esv.superhive.iot.module.datamodel.service.DataModelService;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.validation.annotation.Validated;
      import org.springframework.web.bind.annotation.*;
      ......@@ -35,7 +35,7 @@ public class DataModelAlarmRuleController {
      /**
      * @description 保存数据模型告警规则
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/05 17:08
      **/
      ......@@ -58,7 +58,7 @@ public class DataModelAlarmRuleController {
      /**
      * @description 获取指定数据模型的告警规则列表
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 9:16
      **/
      ......@@ -74,7 +74,7 @@ public class DataModelAlarmRuleController {
      /**
      * @description 缓存数据模型告警规则
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 15:58
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/controller/DataModelController.java → src/main/java/com/esv/superhive/iot/module/datamodel/controller/DataModelController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.controller;
      package com.esv.superhive.iot.module.datamodel.controller;
      import com.alibaba.fastjson.JSONObject;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.common.validator.groups.*;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelForm;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelService;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.validator.groups.*;
      import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
      import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
      import com.esv.superhive.iot.module.datamodel.service.DataModelService;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.StringUtils;
      import org.springframework.validation.annotation.Validated;
      ......@@ -43,7 +43,7 @@ public class DataModelController {
      /**
      * @description 创建模型
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/07/31 14:53
      **/
      ......@@ -65,7 +65,7 @@ public class DataModelController {
      /**
      * @description 分页查询模型列表
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/07/31 16:31
      **/
      ......@@ -83,7 +83,7 @@ public class DataModelController {
      /**
      * @description 获取模型详情
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 10:40
      **/
      ......@@ -98,7 +98,7 @@ public class DataModelController {
      /**
      * @description 编辑模型
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 10:40
      **/
      ......@@ -122,7 +122,7 @@ public class DataModelController {
      /**
      * @description 删除模型
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 11:35
      **/
      ......@@ -137,7 +137,7 @@ public class DataModelController {
      /**
      * @description 获取所有模型列表
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 13:10
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/dao/DataModelAlarmRuleDao.java → src/main/java/com/esv/superhive/iot/module/datamodel/dao/DataModelAlarmRuleDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.dao;
      package com.esv.superhive.iot.module.datamodel.dao;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
      import com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
      import org.apache.ibatis.annotations.Mapper;
      import java.util.List;
      ......@@ -19,7 +19,7 @@ public interface DataModelAlarmRuleDao extends BaseMapper<DataModelAlarmRuleEnti
      /**
      * @description 查询所有数据模型告警规则
      * @return java.util.List<com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto>
      * @return java.util.List<com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 15:48
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/dao/DataModelDao.java → src/main/java/com/esv/superhive/iot/module/datamodel/dao/DataModelDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.dao;
      package com.esv.superhive.iot.module.datamodel.dao;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelForm;
      import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
      import org.apache.ibatis.annotations.Mapper;
      /**
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/dao/DataModelPropertyDao.java → src/main/java/com/esv/superhive/iot/module/datamodel/dao/DataModelPropertyDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.dao;
      package com.esv.superhive.iot.module.datamodel.dao;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import org.apache.ibatis.annotations.Mapper;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/dto/DataModelAlarmRuleDto.java → src/main/java/com/esv/superhive/iot/module/datamodel/dto/DataModelAlarmRuleDto.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.dto;
      package com.esv.superhive.iot.module.datamodel.dto;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/entity/DataModelAlarmRuleEntity.java → src/main/java/com/esv/superhive/iot/module/datamodel/entity/DataModelAlarmRuleEntity.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.entity;
      package com.esv.superhive.iot.module.datamodel.entity;
      import com.baomidou.mybatisplus.annotation.FieldFill;
      import com.baomidou.mybatisplus.annotation.TableField;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/entity/DataModelEntity.java → src/main/java/com/esv/superhive/iot/module/datamodel/entity/DataModelEntity.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.entity;
      package com.esv.superhive.iot.module.datamodel.entity;
      import com.baomidou.mybatisplus.annotation.*;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/entity/DataModelPropertyEntity.java → src/main/java/com/esv/superhive/iot/module/datamodel/entity/DataModelPropertyEntity.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.entity;
      package com.esv.superhive.iot.module.datamodel.entity;
      import com.baomidou.mybatisplus.annotation.FieldFill;
      import com.baomidou.mybatisplus.annotation.TableField;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/form/AlarmRuleItemForm.java → src/main/java/com/esv/superhive/iot/module/datamodel/form/AlarmRuleItemForm.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.form;
      package com.esv.superhive.iot.module.datamodel.form;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/form/DataModelAlarmRuleForm.java → src/main/java/com/esv/superhive/iot/module/datamodel/form/DataModelAlarmRuleForm.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.form;
      package com.esv.superhive.iot.module.datamodel.form;
      import com.esv.datacenter.iot.common.validator.groups.ValidatorInsert;
      import com.esv.datacenter.iot.common.validator.groups.ValidatorList;
      import com.esv.superhive.iot.common.validator.groups.ValidatorInsert;
      import com.esv.superhive.iot.common.validator.groups.ValidatorList;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      import org.apache.commons.lang3.builder.ToStringStyle;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/form/DataModelForm.java → src/main/java/com/esv/superhive/iot/module/datamodel/form/DataModelForm.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.form;
      package com.esv.superhive.iot.module.datamodel.form;
      import com.esv.datacenter.iot.common.validator.groups.*;
      import com.esv.superhive.iot.common.validator.groups.*;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      import org.apache.commons.lang3.builder.ToStringStyle;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/form/DataModelPropertyForm.java → src/main/java/com/esv/superhive/iot/module/datamodel/form/DataModelPropertyForm.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.form;
      package com.esv.superhive.iot.module.datamodel.form;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/service/DataModelAlarmRuleService.java → src/main/java/com/esv/superhive/iot/module/datamodel/service/DataModelAlarmRuleService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.service;
      package com.esv.superhive.iot.module.datamodel.service;
      import com.baomidou.mybatisplus.extension.service.IService;
      import com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
      import com.esv.datacenter.iot.module.datamodel.form.AlarmRuleItemForm;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelAlarmRuleForm;
      import com.esv.datacenter.iot.module.datamodel.vo.AlarmRuleItemVO;
      import com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
      import com.esv.superhive.iot.module.datamodel.form.DataModelAlarmRuleForm;
      import com.esv.superhive.iot.module.datamodel.vo.AlarmRuleItemVO;
      import java.util.List;
      ......@@ -30,7 +29,7 @@ public interface DataModelAlarmRuleService extends IService<DataModelAlarmRuleEn
      /**
      * @description 获取指定数据模型的告警规则列表
      * @param modelId:
      * @return java.util.List<com.esv.datacenter.iot.module.datamodel.vo.AlarmRuleItemVO>
      * @return java.util.List<com.esv.superhive.iot.module.datamodel.vo.AlarmRuleItemVO>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 9:11
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/service/DataModelPropertyService.java → src/main/java/com/esv/superhive/iot/module/datamodel/service/DataModelPropertyService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.service;
      package com.esv.superhive.iot.module.datamodel.service;
      import com.baomidou.mybatisplus.extension.service.IService;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.datacenter.iot.module.datamodel.vo.DataModelPropertyVO;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.superhive.iot.module.datamodel.vo.DataModelPropertyVO;
      import java.util.List;
      ......@@ -28,7 +28,7 @@ public interface DataModelPropertyService extends IService<DataModelPropertyEnti
      /**
      * @description 获取指定模型的属性列表
      * @param modelId:
      * @return java.util.List<com.esv.datacenter.iot.module.dmodel.vo.ModelPropertyVO>
      * @return java.util.List<com.esv.superhive.iot.module.dmodel.vo.ModelPropertyVO>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 14:32
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/service/DataModelService.java → src/main/java/com/esv/superhive/iot/module/datamodel/service/DataModelService.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.service;
      package com.esv.superhive.iot.module.datamodel.service;
      import com.baomidou.mybatisplus.extension.service.IService;
      import com.esv.datacenter.iot.common.vo.PageResultVO;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelForm;
      import com.esv.datacenter.iot.module.datamodel.vo.DataDataModelDetailVO;
      import com.esv.datacenter.iot.module.datamodel.vo.DataModelBriefVO;
      import com.esv.datacenter.iot.module.datamodel.vo.DataModelVO;
      import com.esv.superhive.iot.common.vo.PageResultVO;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
      import com.esv.superhive.iot.module.datamodel.vo.DataDataModelDetailVO;
      import com.esv.superhive.iot.module.datamodel.vo.DataModelBriefVO;
      import java.util.List;
      ......@@ -31,7 +30,7 @@ public interface DataModelService extends IService<DataModelEntity> {
      /**
      * @description 分页查询模型列表
      * @param queryObj:
      * @return com.esv.datacenter.iot.common.vo.PageResultVO
      * @return com.esv.superhive.iot.common.vo.PageResultVO
      * @author huangChaobin@esvtek.com
      * @createTime 2020/07/31 16:26
      **/
      ......@@ -40,7 +39,7 @@ public interface DataModelService extends IService<DataModelEntity> {
      /**
      * @description 获取模型详情
      * @param form:
      * @return com.esv.datacenter.iot.module.dmodel.vo.ModelDetailVO
      * @return com.esv.superhive.iot.module.dmodel.vo.ModelDetailVO
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 10:25
      **/
      ......@@ -66,7 +65,7 @@ public interface DataModelService extends IService<DataModelEntity> {
      /**
      * @description 获取所有模型列表
      * @return java.util.List<com.esv.datacenter.iot.module.dmodel.vo.DataModelBriefVO>
      * @return java.util.List<com.esv.superhive.iot.module.dmodel.vo.DataModelBriefVO>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/01 13:04
      **/
      ......@@ -84,7 +83,7 @@ public interface DataModelService extends IService<DataModelEntity> {
      /**
      * @description 获取模型信息
      * @param id:
      * @return com.esv.datacenter.iot.module.dmodel.entity.ObjectModelEntity
      * @return com.esv.superhive.iot.module.dmodel.entity.ObjectModelEntity
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/03 13:39
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/service/impl/DataModelAlarmRuleServiceImpl.java → src/main/java/com/esv/superhive/iot/module/datamodel/service/impl/DataModelAlarmRuleServiceImpl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.service.impl;
      package com.esv.superhive.iot.module.datamodel.service.impl;
      import com.alibaba.fastjson.JSON;
      import com.alibaba.fastjson.JSONArray;
      import com.alibaba.fastjson.JSONObject;
      import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
      import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
      import com.esv.datacenter.iot.common.component.RedisComponent;
      import com.esv.datacenter.iot.common.util.ReqUtils;
      import com.esv.datacenter.iot.module.datamodel.dao.DataModelAlarmRuleDao;
      import com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
      import com.esv.datacenter.iot.module.datamodel.form.AlarmRuleItemForm;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelAlarmRuleForm;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelAlarmRuleService;
      import com.esv.datacenter.iot.module.datamodel.vo.AlarmRuleItemVO;
      import com.esv.superhive.iot.common.component.RedisComponent;
      import com.esv.superhive.iot.common.util.ReqUtils;
      import com.esv.superhive.iot.module.datamodel.dao.DataModelAlarmRuleDao;
      import com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
      import com.esv.superhive.iot.module.datamodel.form.AlarmRuleItemForm;
      import com.esv.superhive.iot.module.datamodel.form.DataModelAlarmRuleForm;
      import com.esv.superhive.iot.module.datamodel.service.DataModelAlarmRuleService;
      import com.esv.superhive.iot.module.datamodel.vo.AlarmRuleItemVO;
      import org.springframework.beans.BeanUtils;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.beans.factory.annotation.Value;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/service/impl/DataModelPropertyServiceImpl.java → src/main/java/com/esv/superhive/iot/module/datamodel/service/impl/DataModelPropertyServiceImpl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.service.impl;
      package com.esv.superhive.iot.module.datamodel.service.impl;
      import com.alibaba.fastjson.JSON;
      import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
      import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
      import com.esv.datacenter.iot.common.component.BaseDataComponent;
      import com.esv.datacenter.iot.common.em.DbDeletedEnum;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.util.DateUtils;
      import com.esv.datacenter.iot.common.util.ReqUtils;
      import com.esv.datacenter.iot.module.datamodel.dao.DataModelPropertyDao;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService;
      import com.esv.datacenter.iot.module.datamodel.vo.DataModelPropertyVO;
      import com.esv.superhive.iot.common.component.BaseDataComponent;
      import com.esv.superhive.iot.common.em.DbDeletedEnum;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.util.DateUtils;
      import com.esv.superhive.iot.common.util.ReqUtils;
      import com.esv.superhive.iot.module.datamodel.dao.DataModelPropertyDao;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
      import com.esv.superhive.iot.module.datamodel.vo.DataModelPropertyVO;
      import org.apache.commons.lang3.StringUtils;
      import org.springframework.beans.BeanUtils;
      import org.springframework.beans.factory.annotation.Autowired;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/service/impl/DataModelServiceImpl.java → src/main/java/com/esv/superhive/iot/module/datamodel/service/impl/DataModelServiceImpl.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.service.impl;
      package com.esv.superhive.iot.module.datamodel.service.impl;
      import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
      import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
      import com.esv.datacenter.iot.common.component.TimescaleComponent;
      import com.esv.datacenter.iot.common.em.DbDeletedEnum;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.vo.PageResultVO;
      import com.esv.datacenter.iot.module.datamodel.dao.DataModelDao;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelForm;
      import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService;
      import com.esv.datacenter.iot.module.datamodel.service.DataModelService;
      import com.esv.datacenter.iot.module.datamodel.vo.DataDataModelDetailVO;
      import com.esv.datacenter.iot.module.datamodel.vo.DataModelBriefVO;
      import com.esv.datacenter.iot.module.datamodel.vo.DataModelVO;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService;
      import com.esv.superhive.iot.common.component.TimescaleComponent;
      import com.esv.superhive.iot.common.em.DbDeletedEnum;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.vo.PageResultVO;
      import com.esv.superhive.iot.module.datamodel.dao.DataModelDao;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
      import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
      import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
      import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
      import com.esv.superhive.iot.module.datamodel.service.DataModelService;
      import com.esv.superhive.iot.module.datamodel.vo.DataDataModelDetailVO;
      import com.esv.superhive.iot.module.datamodel.vo.DataModelBriefVO;
      import com.esv.superhive.iot.module.datamodel.vo.DataModelVO;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
      import org.springframework.beans.BeanUtils;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.stereotype.Service;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/vo/AlarmRuleItemVO.java → src/main/java/com/esv/superhive/iot/module/datamodel/vo/AlarmRuleItemVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.vo;
      package com.esv.superhive.iot.module.datamodel.vo;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/vo/DataDataModelDetailVO.java → src/main/java/com/esv/superhive/iot/module/datamodel/vo/DataDataModelDetailVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.vo;
      package com.esv.superhive.iot.module.datamodel.vo;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/vo/DataModelBriefVO.java → src/main/java/com/esv/superhive/iot/module/datamodel/vo/DataModelBriefVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.vo;
      package com.esv.superhive.iot.module.datamodel.vo;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/vo/DataModelDetailVO.java → src/main/java/com/esv/superhive/iot/module/datamodel/vo/DataModelDetailVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.vo;
      package com.esv.superhive.iot.module.datamodel.vo;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/vo/DataModelPropertyVO.java → src/main/java/com/esv/superhive/iot/module/datamodel/vo/DataModelPropertyVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.vo;
      package com.esv.superhive.iot.module.datamodel.vo;
      import lombok.Data;
      ......
      src/main/java/com/esv/datacenter/iot/module/datamodel/vo/DataModelVO.java → src/main/java/com/esv/superhive/iot/module/datamodel/vo/DataModelVO.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.datamodel.vo;
      package com.esv.superhive.iot.module.datamodel.vo;
      import lombok.Data;
      import org.apache.commons.lang3.builder.ToStringBuilder;
      ......
      src/main/java/com/esv/datacenter/iot/module/devicemodel/controller/DeviceDataController.java → src/main/java/com/esv/superhive/iot/module/devicemodel/controller/DeviceDataController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.devicemodel.controller;
      package com.esv.superhive.iot.module.devicemodel.controller;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.module.devicemodel.form.DeviceDataForm;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataService;
      import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataVO;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.module.devicemodel.form.DeviceDataForm;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceDataService;
      import com.esv.superhive.iot.module.devicemodel.vo.DeviceDataVO;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.validation.annotation.Validated;
      ......@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
      /**
      * @description:
      * @project: datacenter-iot-service
      * @name: com.esv.datacenter.iot.module.devicemodel.controller.DeviceDataController
      * @project: superhive-iot-service
      * @name: com.esv.superhive.iot.module.devicemodel.controller.DeviceDataController
      * @author: chenfm
      * @email: chenfengman@esvtek.com
      * @createTime: 2020/8/13 16:47
      ......
      src/main/java/com/esv/datacenter/iot/module/devicemodel/controller/DeviceInstanceController.java → src/main/java/com/esv/superhive/iot/module/devicemodel/controller/DeviceInstanceController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.devicemodel.controller;
      package com.esv.superhive.iot.module.devicemodel.controller;
      import com.alibaba.fastjson.JSONObject;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.common.validator.groups.*;
      import com.esv.datacenter.iot.common.vo.PageResultVO;
      import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceTypeService;
      import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDetailVO;
      import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceVO;
      import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeVO;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.validator.groups.*;
      import com.esv.superhive.iot.common.vo.PageResultVO;
      import com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceTypeService;
      import com.esv.superhive.iot.module.devicemodel.vo.DeviceDetailVO;
      import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceVO;
      import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeVO;
      import lombok.extern.slf4j.Slf4j;
      import org.springframework.validation.annotation.Validated;
      import org.springframework.web.bind.annotation.PostMapping;
      ......@@ -42,7 +42,7 @@ public class DeviceInstanceController {
      /**
      * @description 新增设备实例
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 10:36
      **/
      ......@@ -62,7 +62,7 @@ public class DeviceInstanceController {
      /**
      * @description 删除设备实例
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 10:51
      **/
      ......@@ -80,7 +80,7 @@ public class DeviceInstanceController {
      /**
      * @description 编辑设备实例信息
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 11:03
      **/
      ......@@ -126,7 +126,7 @@ public class DeviceInstanceController {
      /**
      * @description 通过设备类型ID获取设备列表
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/10 10:24
      **/
      ......@@ -142,7 +142,7 @@ public class DeviceInstanceController {
      /**
      * @description 获取设备接入信息
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/14 9:43
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/devicemodel/controller/DeviceTypeController.java → src/main/java/com/esv/superhive/iot/module/devicemodel/controller/DeviceTypeController.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.devicemodel.controller;
      package com.esv.superhive.iot.module.devicemodel.controller;
      import com.alibaba.fastjson.JSONObject;
      import com.esv.datacenter.iot.common.exception.EException;
      import com.esv.datacenter.iot.common.response.ECode;
      import com.esv.datacenter.iot.common.response.EResponse;
      import com.esv.datacenter.iot.common.validator.groups.*;
      import com.esv.datacenter.iot.module.devicemodel.form.DeviceDataMapForm;
      import com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService;
      import com.esv.datacenter.iot.module.devicemodel.service.DeviceTypeService;
      import com.esv.superhive.iot.common.exception.EException;
      import com.esv.superhive.iot.common.response.ECode;
      import com.esv.superhive.iot.common.response.EResponse;
      import com.esv.superhive.iot.common.validator.groups.*;
      import com.esv.superhive.iot.module.devicemodel.form.DeviceDataMapForm;
      import com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
      import com.esv.superhive.iot.module.devicemodel.service.DeviceTypeService;
      import lombok.extern.slf4j.Slf4j;
      import org.apache.commons.lang3.StringUtils;
      import org.springframework.validation.annotation.Validated;
      ......@@ -46,7 +46,7 @@ public class DeviceTypeController {
      /**
      * @description 新增设备类型
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 20:16
      **/
      ......@@ -62,7 +62,7 @@ public class DeviceTypeController {
      /**
      * @description 更新设备类型信息
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 20:20
      **/
      ......@@ -80,7 +80,7 @@ public class DeviceTypeController {
      /**
      * @description 删除设备类型
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/06 20:35
      **/
      ......@@ -102,7 +102,7 @@ public class DeviceTypeController {
      /**
      * @description 分页查询设备类型
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 9:45
      **/
      ......@@ -120,7 +120,7 @@ public class DeviceTypeController {
      /**
      * @description 获取设备类型列表
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 9:57
      **/
      ......@@ -132,7 +132,7 @@ public class DeviceTypeController {
      /**
      * @description 通过设备类型ID获取对应的数据模型列表
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 14:39
      **/
      ......@@ -148,7 +148,7 @@ public class DeviceTypeController {
      /**
      * @description 保存设备类型与数据模型的映射记录
      * @param form:
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 14:46
      **/
      ......@@ -165,7 +165,7 @@ public class DeviceTypeController {
      /**
      * @description 获取设备类型对应的实例数量统计
      * @return com.esv.datacenter.iot.common.response.EResponse
      * @return com.esv.superhive.iot.common.response.EResponse
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/12 16:11
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceDataMapDao.java → src/main/java/com/esv/superhive/iot/module/devicemodel/dao/DeviceDataMapDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.devicemodel.dao;
      package com.esv.superhive.iot.module.devicemodel.dao;
      import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity;
      import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
      import com.esv.superhive.iot.module.devicemodel.entity.DeviceDataMapEntity;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import org.apache.ibatis.annotations.Mapper;
      ......@@ -20,7 +20,7 @@ public interface DeviceDataMapDao extends BaseMapper<DeviceDataMapEntity> {
      /**
      * @description 通过设备类型ID获取对应的数据模型列表
      * @param entity:
      * @return java.util.List<com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity>
      * @return java.util.List<com.esv.superhive.iot.module.datamodel.entity.DataModelEntity>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/07 14:31
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceInstanceDao.java → src/main/java/com/esv/superhive/iot/module/devicemodel/dao/DeviceInstanceDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.devicemodel.dao;
      package com.esv.superhive.iot.module.devicemodel.dao;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto;
      import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceFullMapDto;
      import com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity;
      import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm;
      import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto;
      import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceFullMapDto;
      import com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity;
      import com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm;
      import org.apache.ibatis.annotations.Mapper;
      import java.util.List;
      ......@@ -43,7 +43,7 @@ public interface DeviceInstanceDao extends BaseMapper<DeviceInstanceEntity> {
      /**
      * @description 查询设备列表
      * @param dto:
      * @return java.util.List<com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto>
      * @return java.util.List<com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/13 16:58
      **/
      ......@@ -52,7 +52,7 @@ public interface DeviceInstanceDao extends BaseMapper<DeviceInstanceEntity> {
      /**
      * @description 查询设备实例的设备类型、数据模型映射
      * @param instanceId:
      * @return java.util.List<com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceFullMapDto>
      * @return java.util.List<com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceFullMapDto>
      * @author huangChaobin@esvtek.com
      * @createTime 2020/08/14 11:14
      **/
      ......
      src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceTypeDao.java → src/main/java/com/esv/superhive/iot/module/devicemodel/dao/DeviceTypeDao.java
      View file @ 969920ec
      package com.esv.datacenter.iot.module.devicemodel.dao;
      package com.esv.superhive.iot.module.devicemodel.dao;
      import com.baomidou.mybatisplus.core.mapper.BaseMapper;
      import com.baomidou.mybatisplus.core.metadata.IPage;
      import com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDto;
      import com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity;
      import com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm;
      import com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDto;
      import com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity;
      import com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm;
      import org.apache.ibatis.annotations.Mapper;
      /**
      ......@@ -30,7 +30,7 @@ public interface DeviceTypeDao extends BaseMapper<DeviceTypeEntity> {
      /**
      * description 查询设备类型详情
      * param [id]
      * return com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDto
      * return com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDto
      * author chenfm
      * createTime 2020/8/13 16:16
      **/
      ......
      src/main/resources/application-demo.yml
      View file @ 969920ec
      This diff is collapsed.
      src/main/resources/application-dev.yml
      View file @ 969920ec
      This diff is collapsed.
      src/main/resources/application-local.yml
      View file @ 969920ec
      This diff is collapsed.
      src/main/resources/application-test.yml
      View file @ 969920ec
      This diff is collapsed.
      src/main/resources/bootstrap.yml
      View file @ 969920ec
      This diff is collapsed.
      src/main/resources/logback-spring.xml
      View file @ 969920ec
      This diff is collapsed.
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment