Commit 969920ec authored by zhangzc's avatar zhangzc

123

parent 6befafc9
Pipeline #558 failed with stages
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.1.RELEASE</version> <version>2.1.1.RELEASE</version>
</parent> </parent>
<groupId>com.esv.datacenter</groupId> <groupId>com.esv.superhive</groupId>
<artifactId>datacenter-iot-service</artifactId> <artifactId>superhive-iot-service</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>datacenter-iot-service</name> <name>superhive-iot-service</name>
<description>datacenter-iot-service</description> <description>superhive-iot-service</description>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</profiles> </profiles>
<build> <build>
<finalName>datacenter-iot-service</finalName> <finalName>superhive-iot-service</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
package com.esv.datacenter.iot; package com.esv.superhive.iot;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.common.util.LogUtils; import com.esv.superhive.iot.common.util.LogUtils;
import org.slf4j.MDC; import org.slf4j.MDC;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
......
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
......
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.context.config.annotation.RefreshScope;
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import lombok.Data; import lombok.Data;
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -143,7 +143,7 @@ public class MqttClientAuthComponent { ...@@ -143,7 +143,7 @@ public class MqttClientAuthComponent {
/** /**
* @description 获取客户端的Topic信息 * @description 获取客户端的Topic信息
* @param clientId: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/14 10:47 * @createTime 2020/08/14 10:47
**/ **/
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.CacheManager;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
......
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.superhive.iot.common.util.DateUtils;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
......
package com.esv.datacenter.iot.common.constants; package com.esv.superhive.iot.common.constants;
/** /**
* @description: * @description:
......
package com.esv.datacenter.iot.common.em; package com.esv.superhive.iot.common.em;
/** /**
* @description: DB记录是否删除标识 * @description: DB记录是否删除标识
......
package com.esv.datacenter.iot.common.exception; package com.esv.superhive.iot.common.exception;
/** /**
* @description: 自定义业务异常 * @description: 自定义业务异常
......
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 lombok.extern.slf4j.Slf4j;
import javax.servlet.*; import javax.servlet.*;
......
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC; import org.slf4j.MDC;
......
package com.esv.datacenter.iot.common.filter; package com.esv.superhive.iot.common.filter;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.common.util.ReqUtils; import com.esv.superhive.iot.common.util.ReqUtils;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.common.wrapper.RestRequestWrapper; import com.esv.superhive.iot.common.wrapper.RestRequestWrapper;
import com.esv.datacenter.iot.common.wrapper.RestResponseWrapper; import com.esv.superhive.iot.common.wrapper.RestResponseWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import javax.servlet.*; import javax.servlet.*;
......
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.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotReadableException;
......
package com.esv.datacenter.iot.common.response; package com.esv.superhive.iot.common.response;
/** /**
* @description: 系统响应码 * @description: 系统响应码
......
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.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
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.apache.commons.lang3.StringUtils;
import org.slf4j.MDC; import org.slf4j.MDC;
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.gateway.common.GatewayHeaders; import com.esv.gateway.common.GatewayHeaders;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import java.util.List; import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.common.util.SqlUtils * @name: com.esv.superhive.iot.common.util.SqlUtils
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 17:26 * @createTime: 2020/8/13 17:26
......
package com.esv.datacenter.iot.common.util; package com.esv.superhive.iot.common.util;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.validator.groups; package com.esv.superhive.iot.common.validator.groups;
import javax.validation.groups.Default; import javax.validation.groups.Default;
......
package com.esv.datacenter.iot.common.vo; package com.esv.superhive.iot.common.vo;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.Data; import lombok.Data;
......
package com.esv.datacenter.iot.common.wrapper; package com.esv.superhive.iot.common.wrapper;
import javax.servlet.ReadListener; import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream; import javax.servlet.ServletInputStream;
......
package com.esv.datacenter.iot.common.wrapper; package com.esv.superhive.iot.common.wrapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
package com.esv.datacenter.iot.config; package com.esv.superhive.iot.config;
import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.annotation.PropertyAccessor;
......
package com.esv.datacenter.iot.config; package com.esv.superhive.iot.config;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
...@@ -13,7 +13,7 @@ import org.springframework.web.client.RestTemplate; ...@@ -13,7 +13,7 @@ import org.springframework.web.client.RestTemplate;
* @createTime: 2020/04/17 18:00 * @createTime: 2020/04/17 18:00
* @version:1.0 * @version:1.0
*/ */
@EnableFeignClients(basePackages = "com.esv.datacenter.iot.feign") @EnableFeignClients(basePackages = "com.esv.superhive.iot.feign")
@Configuration @Configuration
@Slf4j @Slf4j
public class FeignConfigure { public class FeignConfigure {
......
package com.esv.datacenter.iot.config; package com.esv.superhive.iot.config;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
......
package com.esv.datacenter.iot.config; package com.esv.superhive.iot.config;
import com.esv.datacenter.iot.common.filter.AuthFilter; import com.esv.superhive.iot.common.filter.AuthFilter;
import com.esv.datacenter.iot.common.filter.LogbackFilter; import com.esv.superhive.iot.common.filter.LogbackFilter;
import com.esv.datacenter.iot.common.filter.RestLogFilter; import com.esv.superhive.iot.common.filter.RestLogFilter;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
......
package com.esv.datacenter.iot.config.mybatis; package com.esv.superhive.iot.config.mybatis;
import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; 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.DataPermsType;
import com.esv.gateway.common.GatewayHeaders; import com.esv.gateway.common.GatewayHeaders;
import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.Expression;
......
package com.esv.datacenter.iot.config.mybatis; package com.esv.superhive.iot.config.mybatis;
import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
package com.esv.datacenter.iot.config.mybatis; package com.esv.superhive.iot.config.mybatis;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; 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 com.esv.gateway.common.GatewayHeaders;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
......
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.core.parser.ISqlParser;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
...@@ -18,7 +18,7 @@ import java.util.List; ...@@ -18,7 +18,7 @@ import java.util.List;
* @version:1.0 * @version:1.0
*/ */
@Configuration @Configuration
@MapperScan({"com.esv.datacenter.iot.*.*.dao"}) @MapperScan({"com.esv.superhive.iot.*.*.dao"})
public class MybatisPlusConfig { public class MybatisPlusConfig {
/** /**
......
package com.esv.datacenter.iot.feign; package com.esv.superhive.iot.feign;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
...@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.GetMapping;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.feign.EMQFeignService * @name: com.esv.superhive.iot.feign.EMQFeignService
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/12 15:25 * @createTime: 2020/8/12 15:25
......
package com.esv.datacenter.iot.feign; package com.esv.superhive.iot.feign;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
......
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.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.common.validator.groups.ValidatorList; import com.esv.superhive.iot.common.validator.groups.ValidatorList;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO; import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
import com.esv.datacenter.iot.module.alarm.form.AlarmListForm; import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
import com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService; import com.esv.superhive.iot.module.alarm.service.DeviceDataAlarmService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.alarm.controller.DeviceDataAlarmController * @name: com.esv.superhive.iot.module.alarm.controller.DeviceDataAlarmController
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/7 14:21 * @createTime: 2020/8/7 14:21
...@@ -34,7 +34,7 @@ public class DeviceDataAlarmController { ...@@ -34,7 +34,7 @@ public class DeviceDataAlarmController {
/** /**
* description 告警查询 * description 告警查询
* param [alarmListForm] * 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 * author chenfm
* createTime 2020/8/7 16:59 * createTime 2020/8/7 16:59
**/ **/
...@@ -47,7 +47,7 @@ public class DeviceDataAlarmController { ...@@ -47,7 +47,7 @@ public class DeviceDataAlarmController {
/** /**
* description 告警详情 * description 告警详情
* param [id] * 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 * author chenfm
* createTime 2020/8/7 17:00 * createTime 2020/8/7 17:00
**/ **/
......
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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO; import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity; import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
import com.esv.datacenter.iot.module.alarm.form.AlarmListForm; import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO * @name: com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/7 14:19 * @createTime: 2020/8/7 14:19
......
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.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -8,8 +8,8 @@ import java.util.Date; ...@@ -8,8 +8,8 @@ import java.util.Date;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity * @name: com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/7 14:12 * @createTime: 2020/8/7 14:12
......
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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
...@@ -9,8 +9,8 @@ import javax.validation.constraints.NotNull; ...@@ -9,8 +9,8 @@ import javax.validation.constraints.NotNull;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.alarm.form.AlarmListForm * @name: com.esv.superhive.iot.module.alarm.form.AlarmListForm
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/7 14:25 * @createTime: 2020/8/7 14:25
......
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.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO; import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity; import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
import com.esv.datacenter.iot.module.alarm.form.AlarmListForm; import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService * @name: com.esv.superhive.iot.module.alarm.service.DeviceDataAlarmService
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/7 14:17 * @createTime: 2020/8/7 14:17
......
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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.alarm.dao.DeviceDataAlarmDao; import com.esv.superhive.iot.module.alarm.dao.DeviceDataAlarmDao;
import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO; import com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO;
import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity; import com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity;
import com.esv.datacenter.iot.module.alarm.form.AlarmListForm; import com.esv.superhive.iot.module.alarm.form.AlarmListForm;
import com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService; import com.esv.superhive.iot.module.alarm.service.DeviceDataAlarmService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.alarm.service.impl.DeviceDataAlarmServiceImpl * @name: com.esv.superhive.iot.module.alarm.service.impl.DeviceDataAlarmServiceImpl
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/7 14:17 * @createTime: 2020/8/7 14:17
......
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.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO; import com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO;
import com.esv.datacenter.iot.module.dashboard.req.DashboardReq; import com.esv.superhive.iot.module.dashboard.req.DashboardReq;
import com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq; import com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq;
import com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq; import com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq;
import com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq; import com.esv.superhive.iot.module.dashboard.req.TimeDomainReq;
import com.esv.datacenter.iot.module.dashboard.service.DashboardService; import com.esv.superhive.iot.module.dashboard.service.DashboardService;
import com.esv.datacenter.iot.module.dashboard.service.PythonService; import com.esv.superhive.iot.module.dashboard.service.PythonService;
import com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO; import com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO;
import com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO; import com.esv.superhive.iot.module.dashboard.vo.ModelDataVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.postgresql.jdbc.PgArray; import org.postgresql.jdbc.PgArray;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -25,8 +25,8 @@ import java.util.Map; ...@@ -25,8 +25,8 @@ import java.util.Map;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.controller.DashboardController * @name: com.esv.superhive.iot.module.dashboard.controller.DashboardController
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/7/31 17:53 * @createTime: 2020/7/31 17:53
...@@ -50,7 +50,7 @@ public class DashboardController { ...@@ -50,7 +50,7 @@ public class DashboardController {
/** /**
* description 查询模型数据 * description 查询模型数据
* param [dashboardReqList] * 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 * author chenfm
* createTime 2020/8/20 14:54 * createTime 2020/8/20 14:54
**/ **/
...@@ -63,7 +63,7 @@ public class DashboardController { ...@@ -63,7 +63,7 @@ public class DashboardController {
/** /**
* description 查询模型历史数据 * description 查询模型历史数据
* param [historyDashboardReq] * 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 * author chenfm
* createTime 2020/8/20 14:55 * createTime 2020/8/20 14:55
**/ **/
...@@ -85,7 +85,7 @@ public class DashboardController { ...@@ -85,7 +85,7 @@ public class DashboardController {
/** /**
* description 时域数据 * description 时域数据
* param [] * 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 * author chenfm
* createTime 2020/8/20 14:57 * createTime 2020/8/20 14:57
**/ **/
......
package com.esv.datacenter.iot.module.dashboard.dto; package com.esv.superhive.iot.module.dashboard.dto;
import lombok.Data; import lombok.Data;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO * @name: com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/21 16:25 * @createTime: 2020/8/21 16:25
......
package com.esv.datacenter.iot.module.dashboard.req; package com.esv.superhive.iot.module.dashboard.req;
import lombok.Data; import lombok.Data;
...@@ -6,8 +6,8 @@ import java.util.List; ...@@ -6,8 +6,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.req.DashboardReq * @name: com.esv.superhive.iot.module.dashboard.req.DashboardReq
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/3 20:16 * @createTime: 2020/8/3 20:16
......
package com.esv.datacenter.iot.module.dashboard.req; package com.esv.superhive.iot.module.dashboard.req;
import lombok.Data; import lombok.Data;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq * @name: com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/20 17:54 * @createTime: 2020/8/20 17:54
......
package com.esv.datacenter.iot.module.dashboard.req; package com.esv.superhive.iot.module.dashboard.req;
import lombok.Data; import lombok.Data;
...@@ -7,8 +7,8 @@ import java.util.List; ...@@ -7,8 +7,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq * @name: com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/11 10:08 * @createTime: 2020/8/11 10:08
......
package com.esv.datacenter.iot.module.dashboard.req; package com.esv.superhive.iot.module.dashboard.req;
import lombok.Data; import lombok.Data;
...@@ -6,8 +6,8 @@ import java.util.List; ...@@ -6,8 +6,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq * @name: com.esv.superhive.iot.module.dashboard.req.TimeDomainReq
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/20 15:10 * @createTime: 2020/8/20 15:10
......
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.superhive.iot.module.dashboard.dto.DataPreviewDTO;
import com.esv.datacenter.iot.module.dashboard.req.DashboardReq; import com.esv.superhive.iot.module.dashboard.req.DashboardReq;
import com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq; import com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq;
import com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq; import com.esv.superhive.iot.module.dashboard.req.TimeDomainReq;
import com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO; import com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO;
import com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO; import com.esv.superhive.iot.module.dashboard.vo.ModelDataVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.service.DashboardService * @name: com.esv.superhive.iot.module.dashboard.service.DashboardService
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/3 20:23 * @createTime: 2020/8/3 20:23
...@@ -24,7 +24,7 @@ public interface DashboardService { ...@@ -24,7 +24,7 @@ public interface DashboardService {
/** /**
* description 查询模型数据 * description 查询模型数据
* param [dashboardReqList] * 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 * author chenfm
* createTime 2020/8/20 15:13 * createTime 2020/8/20 15:13
**/ **/
...@@ -33,7 +33,7 @@ public interface DashboardService { ...@@ -33,7 +33,7 @@ public interface DashboardService {
/** /**
* description 查询模型历史数据 * description 查询模型历史数据
* param [historyDashboardReq] * 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 * author chenfm
* createTime 2020/8/20 15:13 * createTime 2020/8/20 15:13
**/ **/
...@@ -42,7 +42,7 @@ public interface DashboardService { ...@@ -42,7 +42,7 @@ public interface DashboardService {
/** /**
* description 时域数据 * description 时域数据
* param [timeDomainReq] * param [timeDomainReq]
* return com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO * return com.esv.superhive.iot.module.dashboard.vo.ModelDataVO
* author chenfm * author chenfm
* createTime 2020/8/20 15:13 * createTime 2020/8/20 15:13
**/ **/
......
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; import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.service.PythonService * @name: com.esv.superhive.iot.module.dashboard.service.PythonService
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/21 11:40 * @createTime: 2020/8/21 11:40
......
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.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.esv.datacenter.iot.common.component.TimescaleComponent; import com.esv.superhive.iot.common.component.TimescaleComponent;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.common.util.SqlUtils; import com.esv.superhive.iot.common.util.SqlUtils;
import com.esv.datacenter.iot.module.dashboard.dto.DataPreviewDTO; import com.esv.superhive.iot.module.dashboard.dto.DataPreviewDTO;
import com.esv.datacenter.iot.module.dashboard.req.DashboardReq; import com.esv.superhive.iot.module.dashboard.req.DashboardReq;
import com.esv.datacenter.iot.module.dashboard.req.HistoryDashboardReq; import com.esv.superhive.iot.module.dashboard.req.HistoryDashboardReq;
import com.esv.datacenter.iot.module.dashboard.req.TimeDomainReq; import com.esv.superhive.iot.module.dashboard.req.TimeDomainReq;
import com.esv.datacenter.iot.module.dashboard.service.DashboardService; import com.esv.superhive.iot.module.dashboard.service.DashboardService;
import com.esv.datacenter.iot.module.dashboard.vo.ChartVO; import com.esv.superhive.iot.module.dashboard.vo.ChartVO;
import com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO; import com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO;
import com.esv.datacenter.iot.module.dashboard.vo.FunctionVO; import com.esv.superhive.iot.module.dashboard.vo.FunctionVO;
import com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO; import com.esv.superhive.iot.module.dashboard.vo.ModelDataVO;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -30,8 +30,8 @@ import java.util.Map; ...@@ -30,8 +30,8 @@ import java.util.Map;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.service.impl.DashboardServiceImpl * @name: com.esv.superhive.iot.module.dashboard.service.impl.DashboardServiceImpl
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/3 20:24 * @createTime: 2020/8/3 20:24
......
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.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.module.dashboard.req.FrequencyDomainReq; import com.esv.superhive.iot.module.dashboard.req.FrequencyDomainReq;
import com.esv.datacenter.iot.module.dashboard.service.PythonService; import com.esv.superhive.iot.module.dashboard.service.PythonService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -14,8 +14,8 @@ import java.util.List; ...@@ -14,8 +14,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.service.impl.PythonServiceImpl * @name: com.esv.superhive.iot.module.dashboard.service.impl.PythonServiceImpl
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/21 11:41 * @createTime: 2020/8/21 11:41
......
package com.esv.datacenter.iot.module.dashboard.vo; package com.esv.superhive.iot.module.dashboard.vo;
import lombok.Data; import lombok.Data;
...@@ -6,8 +6,8 @@ import java.util.List; ...@@ -6,8 +6,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.vo.ChartVO * @name: com.esv.superhive.iot.module.dashboard.vo.ChartVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/21 13:45 * @createTime: 2020/8/21 13:45
......
package com.esv.datacenter.iot.module.dashboard.vo; package com.esv.superhive.iot.module.dashboard.vo;
import lombok.Data; import lombok.Data;
...@@ -6,8 +6,8 @@ import java.util.List; ...@@ -6,8 +6,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.vo.FrequencyDomainVO * @name: com.esv.superhive.iot.module.dashboard.vo.FrequencyDomainVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/21 13:44 * @createTime: 2020/8/21 13:44
......
package com.esv.datacenter.iot.module.dashboard.vo; package com.esv.superhive.iot.module.dashboard.vo;
import lombok.Data; import lombok.Data;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.vo.FunctionVO * @name: com.esv.superhive.iot.module.dashboard.vo.FunctionVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/21 13:45 * @createTime: 2020/8/21 13:45
......
package com.esv.datacenter.iot.module.dashboard.vo; package com.esv.superhive.iot.module.dashboard.vo;
import lombok.Data; import lombok.Data;
...@@ -7,8 +7,8 @@ import java.util.Map; ...@@ -7,8 +7,8 @@ import java.util.Map;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.dashboard.vo.ModelDataVO * @name: com.esv.superhive.iot.module.dashboard.vo.ModelDataVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/10 15:29 * @createTime: 2020/8/10 15:29
......
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.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.common.validator.groups.ValidatorInsert; import com.esv.superhive.iot.common.validator.groups.ValidatorInsert;
import com.esv.datacenter.iot.common.validator.groups.ValidatorList; import com.esv.superhive.iot.common.validator.groups.ValidatorList;
import com.esv.datacenter.iot.module.datamodel.form.DataModelAlarmRuleForm; import com.esv.superhive.iot.module.datamodel.form.DataModelAlarmRuleForm;
import com.esv.datacenter.iot.module.datamodel.service.DataModelAlarmRuleService; import com.esv.superhive.iot.module.datamodel.service.DataModelAlarmRuleService;
import com.esv.datacenter.iot.module.datamodel.service.DataModelService; import com.esv.superhive.iot.module.datamodel.service.DataModelService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -35,7 +35,7 @@ public class DataModelAlarmRuleController { ...@@ -35,7 +35,7 @@ public class DataModelAlarmRuleController {
/** /**
* @description 保存数据模型告警规则 * @description 保存数据模型告警规则
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/05 17:08 * @createTime 2020/08/05 17:08
**/ **/
...@@ -58,7 +58,7 @@ public class DataModelAlarmRuleController { ...@@ -58,7 +58,7 @@ public class DataModelAlarmRuleController {
/** /**
* @description 获取指定数据模型的告警规则列表 * @description 获取指定数据模型的告警规则列表
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 9:16 * @createTime 2020/08/06 9:16
**/ **/
...@@ -74,7 +74,7 @@ public class DataModelAlarmRuleController { ...@@ -74,7 +74,7 @@ public class DataModelAlarmRuleController {
/** /**
* @description 缓存数据模型告警规则 * @description 缓存数据模型告警规则
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 15:58 * @createTime 2020/08/06 15:58
**/ **/
......
package com.esv.datacenter.iot.module.datamodel.controller; package com.esv.superhive.iot.module.datamodel.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.common.validator.groups.*; import com.esv.superhive.iot.common.validator.groups.*;
import com.esv.datacenter.iot.module.datamodel.form.DataModelForm; import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm; import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService; import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
import com.esv.datacenter.iot.module.datamodel.service.DataModelService; import com.esv.superhive.iot.module.datamodel.service.DataModelService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -43,7 +43,7 @@ public class DataModelController { ...@@ -43,7 +43,7 @@ public class DataModelController {
/** /**
* @description 创建模型 * @description 创建模型
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/07/31 14:53 * @createTime 2020/07/31 14:53
**/ **/
...@@ -65,7 +65,7 @@ public class DataModelController { ...@@ -65,7 +65,7 @@ public class DataModelController {
/** /**
* @description 分页查询模型列表 * @description 分页查询模型列表
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/07/31 16:31 * @createTime 2020/07/31 16:31
**/ **/
...@@ -83,7 +83,7 @@ public class DataModelController { ...@@ -83,7 +83,7 @@ public class DataModelController {
/** /**
* @description 获取模型详情 * @description 获取模型详情
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 10:40 * @createTime 2020/08/01 10:40
**/ **/
...@@ -98,7 +98,7 @@ public class DataModelController { ...@@ -98,7 +98,7 @@ public class DataModelController {
/** /**
* @description 编辑模型 * @description 编辑模型
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 10:40 * @createTime 2020/08/01 10:40
**/ **/
...@@ -122,7 +122,7 @@ public class DataModelController { ...@@ -122,7 +122,7 @@ public class DataModelController {
/** /**
* @description 删除模型 * @description 删除模型
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 11:35 * @createTime 2020/08/01 11:35
**/ **/
...@@ -137,7 +137,7 @@ public class DataModelController { ...@@ -137,7 +137,7 @@ public class DataModelController {
/** /**
* @description 获取所有模型列表 * @description 获取所有模型列表
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 13:10 * @createTime 2020/08/01 13:10
**/ **/
......
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.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto; import com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
...@@ -19,7 +19,7 @@ public interface DataModelAlarmRuleDao extends BaseMapper<DataModelAlarmRuleEnti ...@@ -19,7 +19,7 @@ public interface DataModelAlarmRuleDao extends BaseMapper<DataModelAlarmRuleEnti
/** /**
* @description 查询所有数据模型告警规则 * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 15:48 * @createTime 2020/08/06 15:48
**/ **/
......
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.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.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; import org.apache.ibatis.annotations.Mapper;
/** /**
......
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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
......
package com.esv.datacenter.iot.module.datamodel.dto; package com.esv.superhive.iot.module.datamodel.dto;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
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.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
package com.esv.datacenter.iot.module.datamodel.entity; package com.esv.superhive.iot.module.datamodel.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
......
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.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
package com.esv.datacenter.iot.module.datamodel.form; package com.esv.superhive.iot.module.datamodel.form;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
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.superhive.iot.common.validator.groups.ValidatorInsert;
import com.esv.datacenter.iot.common.validator.groups.ValidatorList; import com.esv.superhive.iot.common.validator.groups.ValidatorList;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
......
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 lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
......
package com.esv.datacenter.iot.module.datamodel.form; package com.esv.superhive.iot.module.datamodel.form;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
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.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto; import com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
import com.esv.datacenter.iot.module.datamodel.form.AlarmRuleItemForm; import com.esv.superhive.iot.module.datamodel.form.DataModelAlarmRuleForm;
import com.esv.datacenter.iot.module.datamodel.form.DataModelAlarmRuleForm; import com.esv.superhive.iot.module.datamodel.vo.AlarmRuleItemVO;
import com.esv.datacenter.iot.module.datamodel.vo.AlarmRuleItemVO;
import java.util.List; import java.util.List;
...@@ -30,7 +29,7 @@ public interface DataModelAlarmRuleService extends IService<DataModelAlarmRuleEn ...@@ -30,7 +29,7 @@ public interface DataModelAlarmRuleService extends IService<DataModelAlarmRuleEn
/** /**
* @description 获取指定数据模型的告警规则列表 * @description 获取指定数据模型的告警规则列表
* @param modelId: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 9:11 * @createTime 2020/08/06 9:11
**/ **/
......
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.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm; import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelPropertyVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelPropertyVO;
import java.util.List; import java.util.List;
...@@ -28,7 +28,7 @@ public interface DataModelPropertyService extends IService<DataModelPropertyEnti ...@@ -28,7 +28,7 @@ public interface DataModelPropertyService extends IService<DataModelPropertyEnti
/** /**
* @description 获取指定模型的属性列表 * @description 获取指定模型的属性列表
* @param modelId: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 14:32 * @createTime 2020/08/01 14:32
**/ **/
......
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.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.datamodel.form.DataModelForm; import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
import com.esv.datacenter.iot.module.datamodel.vo.DataDataModelDetailVO; import com.esv.superhive.iot.module.datamodel.vo.DataDataModelDetailVO;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelBriefVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelBriefVO;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelVO;
import java.util.List; import java.util.List;
...@@ -31,7 +30,7 @@ public interface DataModelService extends IService<DataModelEntity> { ...@@ -31,7 +30,7 @@ public interface DataModelService extends IService<DataModelEntity> {
/** /**
* @description 分页查询模型列表 * @description 分页查询模型列表
* @param queryObj: * @param queryObj:
* @return com.esv.datacenter.iot.common.vo.PageResultVO * @return com.esv.superhive.iot.common.vo.PageResultVO
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/07/31 16:26 * @createTime 2020/07/31 16:26
**/ **/
...@@ -40,7 +39,7 @@ public interface DataModelService extends IService<DataModelEntity> { ...@@ -40,7 +39,7 @@ public interface DataModelService extends IService<DataModelEntity> {
/** /**
* @description 获取模型详情 * @description 获取模型详情
* @param form: * @param form:
* @return com.esv.datacenter.iot.module.dmodel.vo.ModelDetailVO * @return com.esv.superhive.iot.module.dmodel.vo.ModelDetailVO
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 10:25 * @createTime 2020/08/01 10:25
**/ **/
...@@ -66,7 +65,7 @@ public interface DataModelService extends IService<DataModelEntity> { ...@@ -66,7 +65,7 @@ public interface DataModelService extends IService<DataModelEntity> {
/** /**
* @description 获取所有模型列表 * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/01 13:04 * @createTime 2020/08/01 13:04
**/ **/
...@@ -84,7 +83,7 @@ public interface DataModelService extends IService<DataModelEntity> { ...@@ -84,7 +83,7 @@ public interface DataModelService extends IService<DataModelEntity> {
/** /**
* @description 获取模型信息 * @description 获取模型信息
* @param id: * @param id:
* @return com.esv.datacenter.iot.module.dmodel.entity.ObjectModelEntity * @return com.esv.superhive.iot.module.dmodel.entity.ObjectModelEntity
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/03 13:39 * @createTime 2020/08/03 13:39
**/ **/
......
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.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.component.RedisComponent; import com.esv.superhive.iot.common.component.RedisComponent;
import com.esv.datacenter.iot.common.util.ReqUtils; import com.esv.superhive.iot.common.util.ReqUtils;
import com.esv.datacenter.iot.module.datamodel.dao.DataModelAlarmRuleDao; import com.esv.superhive.iot.module.datamodel.dao.DataModelAlarmRuleDao;
import com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto; import com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity;
import com.esv.datacenter.iot.module.datamodel.form.AlarmRuleItemForm; import com.esv.superhive.iot.module.datamodel.form.AlarmRuleItemForm;
import com.esv.datacenter.iot.module.datamodel.form.DataModelAlarmRuleForm; import com.esv.superhive.iot.module.datamodel.form.DataModelAlarmRuleForm;
import com.esv.datacenter.iot.module.datamodel.service.DataModelAlarmRuleService; import com.esv.superhive.iot.module.datamodel.service.DataModelAlarmRuleService;
import com.esv.datacenter.iot.module.datamodel.vo.AlarmRuleItemVO; import com.esv.superhive.iot.module.datamodel.vo.AlarmRuleItemVO;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
......
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.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.component.BaseDataComponent; import com.esv.superhive.iot.common.component.BaseDataComponent;
import com.esv.datacenter.iot.common.em.DbDeletedEnum; import com.esv.superhive.iot.common.em.DbDeletedEnum;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.util.DateUtils; import com.esv.superhive.iot.common.util.DateUtils;
import com.esv.datacenter.iot.common.util.ReqUtils; import com.esv.superhive.iot.common.util.ReqUtils;
import com.esv.datacenter.iot.module.datamodel.dao.DataModelPropertyDao; import com.esv.superhive.iot.module.datamodel.dao.DataModelPropertyDao;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm; import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService; import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelPropertyVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelPropertyVO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
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.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.component.TimescaleComponent; import com.esv.superhive.iot.common.component.TimescaleComponent;
import com.esv.datacenter.iot.common.em.DbDeletedEnum; import com.esv.superhive.iot.common.em.DbDeletedEnum;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.datamodel.dao.DataModelDao; import com.esv.superhive.iot.module.datamodel.dao.DataModelDao;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity;
import com.esv.datacenter.iot.module.datamodel.form.DataModelForm; import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm; import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService; import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
import com.esv.datacenter.iot.module.datamodel.service.DataModelService; import com.esv.superhive.iot.module.datamodel.service.DataModelService;
import com.esv.datacenter.iot.module.datamodel.vo.DataDataModelDetailVO; import com.esv.superhive.iot.module.datamodel.vo.DataDataModelDetailVO;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelBriefVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelBriefVO;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelVO;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.esv.datacenter.iot.module.datamodel.vo; package com.esv.superhive.iot.module.datamodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.datamodel.vo; package com.esv.superhive.iot.module.datamodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.datamodel.vo; package com.esv.superhive.iot.module.datamodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.datamodel.vo; package com.esv.superhive.iot.module.datamodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.datamodel.vo; package com.esv.superhive.iot.module.datamodel.vo;
import lombok.Data; import lombok.Data;
......
package com.esv.datacenter.iot.module.datamodel.vo; package com.esv.superhive.iot.module.datamodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
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.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceDataForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceDataForm;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataService;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceDataVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.controller.DeviceDataController * @name: com.esv.superhive.iot.module.devicemodel.controller.DeviceDataController
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 16:47 * @createTime: 2020/8/13 16:47
......
package com.esv.datacenter.iot.module.devicemodel.controller; package com.esv.superhive.iot.module.devicemodel.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.common.validator.groups.*; import com.esv.superhive.iot.common.validator.groups.*;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService; import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceTypeService; import com.esv.superhive.iot.module.devicemodel.service.DeviceTypeService;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDetailVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceDetailVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -42,7 +42,7 @@ public class DeviceInstanceController { ...@@ -42,7 +42,7 @@ public class DeviceInstanceController {
/** /**
* @description 新增设备实例 * @description 新增设备实例
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 10:36 * @createTime 2020/08/07 10:36
**/ **/
...@@ -62,7 +62,7 @@ public class DeviceInstanceController { ...@@ -62,7 +62,7 @@ public class DeviceInstanceController {
/** /**
* @description 删除设备实例 * @description 删除设备实例
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 10:51 * @createTime 2020/08/07 10:51
**/ **/
...@@ -80,7 +80,7 @@ public class DeviceInstanceController { ...@@ -80,7 +80,7 @@ public class DeviceInstanceController {
/** /**
* @description 编辑设备实例信息 * @description 编辑设备实例信息
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 11:03 * @createTime 2020/08/07 11:03
**/ **/
...@@ -126,7 +126,7 @@ public class DeviceInstanceController { ...@@ -126,7 +126,7 @@ public class DeviceInstanceController {
/** /**
* @description 通过设备类型ID获取设备列表 * @description 通过设备类型ID获取设备列表
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/10 10:24 * @createTime 2020/08/10 10:24
**/ **/
...@@ -142,7 +142,7 @@ public class DeviceInstanceController { ...@@ -142,7 +142,7 @@ public class DeviceInstanceController {
/** /**
* @description 获取设备接入信息 * @description 获取设备接入信息
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/14 9:43 * @createTime 2020/08/14 9:43
**/ **/
......
package com.esv.datacenter.iot.module.devicemodel.controller; package com.esv.superhive.iot.module.devicemodel.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import com.esv.datacenter.iot.common.validator.groups.*; import com.esv.superhive.iot.common.validator.groups.*;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceDataMapForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceDataMapForm;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService; import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceTypeService; import com.esv.superhive.iot.module.devicemodel.service.DeviceTypeService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -46,7 +46,7 @@ public class DeviceTypeController { ...@@ -46,7 +46,7 @@ public class DeviceTypeController {
/** /**
* @description 新增设备类型 * @description 新增设备类型
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 20:16 * @createTime 2020/08/06 20:16
**/ **/
...@@ -62,7 +62,7 @@ public class DeviceTypeController { ...@@ -62,7 +62,7 @@ public class DeviceTypeController {
/** /**
* @description 更新设备类型信息 * @description 更新设备类型信息
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 20:20 * @createTime 2020/08/06 20:20
**/ **/
...@@ -80,7 +80,7 @@ public class DeviceTypeController { ...@@ -80,7 +80,7 @@ public class DeviceTypeController {
/** /**
* @description 删除设备类型 * @description 删除设备类型
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 20:35 * @createTime 2020/08/06 20:35
**/ **/
...@@ -102,7 +102,7 @@ public class DeviceTypeController { ...@@ -102,7 +102,7 @@ public class DeviceTypeController {
/** /**
* @description 分页查询设备类型 * @description 分页查询设备类型
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 9:45 * @createTime 2020/08/07 9:45
**/ **/
...@@ -120,7 +120,7 @@ public class DeviceTypeController { ...@@ -120,7 +120,7 @@ public class DeviceTypeController {
/** /**
* @description 获取设备类型列表 * @description 获取设备类型列表
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 9:57 * @createTime 2020/08/07 9:57
**/ **/
...@@ -132,7 +132,7 @@ public class DeviceTypeController { ...@@ -132,7 +132,7 @@ public class DeviceTypeController {
/** /**
* @description 通过设备类型ID获取对应的数据模型列表 * @description 通过设备类型ID获取对应的数据模型列表
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 14:39 * @createTime 2020/08/07 14:39
**/ **/
...@@ -148,7 +148,7 @@ public class DeviceTypeController { ...@@ -148,7 +148,7 @@ public class DeviceTypeController {
/** /**
* @description 保存设备类型与数据模型的映射记录 * @description 保存设备类型与数据模型的映射记录
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 14:46 * @createTime 2020/08/07 14:46
**/ **/
...@@ -165,7 +165,7 @@ public class DeviceTypeController { ...@@ -165,7 +165,7 @@ public class DeviceTypeController {
/** /**
* @description 获取设备类型对应的实例数量统计 * @description 获取设备类型对应的实例数量统计
* @return com.esv.datacenter.iot.common.response.EResponse * @return com.esv.superhive.iot.common.response.EResponse
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/12 16:11 * @createTime 2020/08/12 16:11
**/ **/
......
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.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceDataMapEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -20,7 +20,7 @@ public interface DeviceDataMapDao extends BaseMapper<DeviceDataMapEntity> { ...@@ -20,7 +20,7 @@ public interface DeviceDataMapDao extends BaseMapper<DeviceDataMapEntity> {
/** /**
* @description 通过设备类型ID获取对应的数据模型列表 * @description 通过设备类型ID获取对应的数据模型列表
* @param entity: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 14:31 * @createTime 2020/08/07 14:31
**/ **/
......
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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceFullMapDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceFullMapDto;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
...@@ -43,7 +43,7 @@ public interface DeviceInstanceDao extends BaseMapper<DeviceInstanceEntity> { ...@@ -43,7 +43,7 @@ public interface DeviceInstanceDao extends BaseMapper<DeviceInstanceEntity> {
/** /**
* @description 查询设备列表 * @description 查询设备列表
* @param dto: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/13 16:58 * @createTime 2020/08/13 16:58
**/ **/
...@@ -52,7 +52,7 @@ public interface DeviceInstanceDao extends BaseMapper<DeviceInstanceEntity> { ...@@ -52,7 +52,7 @@ public interface DeviceInstanceDao extends BaseMapper<DeviceInstanceEntity> {
/** /**
* @description 查询设备实例的设备类型、数据模型映射 * @description 查询设备实例的设备类型、数据模型映射
* @param instanceId: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/14 11:14 * @createTime 2020/08/14 11:14
**/ **/
......
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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDto;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
...@@ -30,7 +30,7 @@ public interface DeviceTypeDao extends BaseMapper<DeviceTypeEntity> { ...@@ -30,7 +30,7 @@ public interface DeviceTypeDao extends BaseMapper<DeviceTypeEntity> {
/** /**
* description 查询设备类型详情 * description 查询设备类型详情
* param [id] * param [id]
* return com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDto * return com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDto
* author chenfm * author chenfm
* createTime 2020/8/13 16:16 * createTime 2020/8/13 16:16
**/ **/
......
package com.esv.datacenter.iot.module.devicemodel.dto; package com.esv.superhive.iot.module.devicemodel.dto;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.devicemodel.dto; package com.esv.superhive.iot.module.devicemodel.dto;
import lombok.Data; import lombok.Data;
......
package com.esv.datacenter.iot.module.devicemodel.dto; package com.esv.superhive.iot.module.devicemodel.dto;
import lombok.Data; import lombok.Data;
...@@ -6,8 +6,8 @@ import java.util.Date; ...@@ -6,8 +6,8 @@ import java.util.Date;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDTO * @name: com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDTO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 16:13 * @createTime: 2020/8/13 16:13
......
package com.esv.datacenter.iot.module.devicemodel.entity; package com.esv.superhive.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
package com.esv.datacenter.iot.module.devicemodel.entity; package com.esv.superhive.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
......
package com.esv.datacenter.iot.module.devicemodel.entity; package com.esv.superhive.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
......
package com.esv.datacenter.iot.module.devicemodel.form; package com.esv.superhive.iot.module.devicemodel.form;
import lombok.Data; import lombok.Data;
...@@ -6,8 +6,8 @@ import javax.validation.constraints.NotNull; ...@@ -6,8 +6,8 @@ import javax.validation.constraints.NotNull;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.form.DeviceDataForm * @name: com.esv.superhive.iot.module.devicemodel.form.DeviceDataForm
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 17:34 * @createTime: 2020/8/13 17:34
......
package com.esv.datacenter.iot.module.devicemodel.form; package com.esv.superhive.iot.module.devicemodel.form;
import com.esv.datacenter.iot.common.validator.groups.ValidatorInsert; import com.esv.superhive.iot.common.validator.groups.ValidatorInsert;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
......
package com.esv.datacenter.iot.module.devicemodel.form; package com.esv.superhive.iot.module.devicemodel.form;
import com.esv.datacenter.iot.common.validator.groups.*; import com.esv.superhive.iot.common.validator.groups.*;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
......
package com.esv.datacenter.iot.module.devicemodel.form; package com.esv.superhive.iot.module.devicemodel.form;
import com.esv.datacenter.iot.common.validator.groups.*; import com.esv.superhive.iot.common.validator.groups.*;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
......
package com.esv.datacenter.iot.module.devicemodel.service; package com.esv.superhive.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceDataMapEntity;
import java.util.List; import java.util.List;
...@@ -46,7 +46,7 @@ public interface DeviceDataMapService extends IService<DeviceDataMapEntity> { ...@@ -46,7 +46,7 @@ public interface DeviceDataMapService extends IService<DeviceDataMapEntity> {
/** /**
* @description 通过设备类型ID获取对应的数据模型列表 * @description 通过设备类型ID获取对应的数据模型列表
* @param deviceTypeId: * @param deviceTypeId:
* @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 14:26 * @createTime 2020/08/07 14:26
**/ **/
......
package com.esv.datacenter.iot.module.devicemodel.service; package com.esv.superhive.iot.module.devicemodel.service;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceDataVO;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.service.DeviceDataService * @name: com.esv.superhive.iot.module.devicemodel.service.DeviceDataService
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 16:49 * @createTime: 2020/8/13 16:49
......
package com.esv.datacenter.iot.module.devicemodel.service; package com.esv.superhive.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceFullMapDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceFullMapDto;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceAccessInfoVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceAccessInfoVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -69,7 +69,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -69,7 +69,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* @description 通过ID获取设备实例 * @description 通过ID获取设备实例
* @param id: * @param id:
* @return com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity * @return com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 10:47 * @createTime 2020/08/07 10:47
**/ **/
...@@ -78,7 +78,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -78,7 +78,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* @description 分页查询 * @description 分页查询
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.vo.PageResultVO * @return com.esv.superhive.iot.common.vo.PageResultVO
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 13:39 * @createTime 2020/08/07 13:39
**/ **/
...@@ -105,7 +105,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -105,7 +105,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* @description 通过通信ID获取设备实例 * @description 通过通信ID获取设备实例
* @param communicationId: * @param communicationId:
* @return com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity * @return com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/12 13:45 * @createTime 2020/08/12 13:45
**/ **/
...@@ -113,7 +113,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -113,7 +113,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* @description 查询设备列表 * @description 查询设备列表
* @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/12 15:34 * @createTime 2020/08/12 15:34
**/ **/
...@@ -131,7 +131,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -131,7 +131,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* description 设备实例详情 * description 设备实例详情
* param [deviceInstanceId] * param [deviceInstanceId]
* return com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceVO * return com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceVO
* author chenfm * author chenfm
* createTime 2020/8/13 16:24 * createTime 2020/8/13 16:24
**/ **/
...@@ -151,7 +151,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -151,7 +151,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* @description 获取设备实例的设备类型、数据模型映射 * @description 获取设备实例的设备类型、数据模型映射
* @param instanceId: * @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 * @author huangChaobin@esvtek.com
* @createTime 2020/08/14 11:15 * @createTime 2020/08/14 11:15
**/ **/
...@@ -160,7 +160,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> { ...@@ -160,7 +160,7 @@ public interface DeviceInstanceService extends IService<DeviceInstanceEntity> {
/** /**
* @description 获取设备接入信息 * @description 获取设备接入信息
* @param id: * @param id:
* @return com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceAccessInfoVO * @return com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceAccessInfoVO
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/14 10:57 * @createTime 2020/08/14 10:57
**/ **/
......
package com.esv.datacenter.iot.module.devicemodel.service; package com.esv.superhive.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelDetailVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelDetailVO;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeBriefVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeBriefVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeStatisticsVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeStatisticsVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeVO;
import java.util.List; import java.util.List;
...@@ -41,7 +41,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> { ...@@ -41,7 +41,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> {
/** /**
* @description 通过设备类型ID查询记录 * @description 通过设备类型ID查询记录
* @param id: * @param id:
* @return com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity * @return com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/06 20:22 * @createTime 2020/08/06 20:22
**/ **/
...@@ -59,7 +59,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> { ...@@ -59,7 +59,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> {
/** /**
* @description 分页查询 * @description 分页查询
* @param form: * @param form:
* @return com.esv.datacenter.iot.common.vo.PageResultVO * @return com.esv.superhive.iot.common.vo.PageResultVO
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 9:35 * @createTime 2020/08/07 9:35
**/ **/
...@@ -76,7 +76,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> { ...@@ -76,7 +76,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> {
/** /**
* @description 获取设备类型列表 * @description 获取设备类型列表
* @return java.util.List<com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeBriefVO> * @return java.util.List<com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeBriefVO>
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 9:54 * @createTime 2020/08/07 9:54
**/ **/
...@@ -85,7 +85,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> { ...@@ -85,7 +85,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> {
/** /**
* @description 通过设备类型ID获取对应的数据模型列表 * @description 通过设备类型ID获取对应的数据模型列表
* @param deviceTypeId: * @param deviceTypeId:
* @return java.util.List<com.esv.datacenter.iot.module.datamodel.vo.DataModelDetailVO> * @return java.util.List<com.esv.superhive.iot.module.datamodel.vo.DataModelDetailVO>
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/07 14:34 * @createTime 2020/08/07 14:34
**/ **/
...@@ -93,7 +93,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> { ...@@ -93,7 +93,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> {
/** /**
* @description 获取设备类型对应的实例数量统计 * @description 获取设备类型对应的实例数量统计
* @return java.util.List<com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeStatisticsVO> * @return java.util.List<com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeStatisticsVO>
* @author huangChaobin@esvtek.com * @author huangChaobin@esvtek.com
* @createTime 2020/08/12 15:06 * @createTime 2020/08/12 15:06
**/ **/
...@@ -102,7 +102,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> { ...@@ -102,7 +102,7 @@ public interface DeviceTypeService extends IService<DeviceTypeEntity> {
/** /**
* description 设备类型详细 * description 设备类型详细
* param [deviceTypeId] * param [deviceTypeId]
* return com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeVO * return com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeVO
* author chenfm * author chenfm
* createTime 2020/8/13 16:11 * createTime 2020/8/13 16:11
**/ **/
......
package com.esv.datacenter.iot.module.devicemodel.service.impl; package com.esv.superhive.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.component.MqttAcl; import com.esv.superhive.iot.common.component.MqttAcl;
import com.esv.datacenter.iot.common.component.MqttClientAuthComponent; import com.esv.superhive.iot.common.component.MqttClientAuthComponent;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceDataMapDao; import com.esv.superhive.iot.module.devicemodel.dao.DeviceDataMapDao;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceDataMapEntity;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService; import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.esv.datacenter.iot.module.devicemodel.service.impl; package com.esv.superhive.iot.module.devicemodel.service.impl;
import com.esv.datacenter.iot.common.component.TimescaleComponent; import com.esv.superhive.iot.common.component.TimescaleComponent;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService; import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
import com.esv.datacenter.iot.module.datamodel.service.DataModelService; import com.esv.superhive.iot.module.datamodel.service.DataModelService;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelPropertyVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelPropertyVO;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataService;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataPropertyVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceDataPropertyVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceDataVO;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
......
package com.esv.datacenter.iot.module.devicemodel.service.impl; package com.esv.superhive.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.component.MqttAcl; import com.esv.superhive.iot.common.component.MqttAcl;
import com.esv.datacenter.iot.common.component.MqttClientAuthComponent; import com.esv.superhive.iot.common.component.MqttClientAuthComponent;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceInstanceDao; import com.esv.superhive.iot.module.devicemodel.dao.DeviceInstanceDao;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceFullMapDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceFullMapDto;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService; import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceAccessInfoVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceAccessInfoVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceMqttTopicInfoVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceMqttTopicInfoVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceInstanceVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceInstanceVO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
package com.esv.datacenter.iot.module.devicemodel.service.impl; package com.esv.superhive.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.common.exception.EException; import com.esv.superhive.iot.common.exception.EException;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.common.vo.PageResultVO; import com.esv.superhive.iot.common.vo.PageResultVO;
import com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity; import com.esv.superhive.iot.module.datamodel.entity.DataModelEntity;
import com.esv.datacenter.iot.module.datamodel.service.DataModelPropertyService; import com.esv.superhive.iot.module.datamodel.service.DataModelPropertyService;
import com.esv.datacenter.iot.module.datamodel.vo.DataModelDetailVO; import com.esv.superhive.iot.module.datamodel.vo.DataModelDetailVO;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceTypeDao; import com.esv.superhive.iot.module.devicemodel.dao.DeviceTypeDao;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto;
import com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDto; import com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDto;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity; import com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity;
import com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm; import com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService; import com.esv.superhive.iot.module.devicemodel.service.DeviceDataMapService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService; import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceTypeService; import com.esv.superhive.iot.module.devicemodel.service.DeviceTypeService;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeBriefVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeBriefVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeStatisticsVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeStatisticsVO;
import com.esv.datacenter.iot.module.devicemodel.vo.DeviceTypeVO; import com.esv.superhive.iot.module.devicemodel.vo.DeviceTypeVO;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataPropertyVO * @name: com.esv.superhive.iot.module.devicemodel.vo.DeviceDataPropertyVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 17:07 * @createTime: 2020/8/13 17:07
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
...@@ -7,8 +7,8 @@ import java.util.List; ...@@ -7,8 +7,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.vo.DeviceDataVO * @name: com.esv.superhive.iot.module.devicemodel.vo.DeviceDataVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 17:09 * @createTime: 2020/8/13 17:09
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.module.devicemodel.vo.DeviceDetailVO * @name: com.esv.superhive.iot.module.devicemodel.vo.DeviceDetailVO
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/13 15:42 * @createTime: 2020/8/13 15:42
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.devicemodel.vo; package com.esv.superhive.iot.module.devicemodel.vo;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
......
package com.esv.datacenter.iot.module.test.controller; package com.esv.superhive.iot.module.test.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.esv.datacenter.iot.common.component.RedisComponent; import com.esv.superhive.iot.common.component.RedisComponent;
import com.esv.datacenter.iot.common.response.EResponse; import com.esv.superhive.iot.common.response.EResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringEscapeUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
package com.esv.datacenter.iot.task; package com.esv.superhive.iot.task;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.feign.EMQFeignService; import com.esv.superhive.iot.feign.EMQFeignService;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceInstanceService; import com.esv.superhive.iot.module.devicemodel.service.DeviceInstanceService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
...@@ -16,8 +16,8 @@ import java.util.List; ...@@ -16,8 +16,8 @@ import java.util.List;
/** /**
* @description: * @description:
* @project: datacenter-iot-service * @project: superhive-iot-service
* @name: com.esv.datacenter.iot.task.DeviceStateScheduleTask * @name: com.esv.superhive.iot.task.DeviceStateScheduleTask
* @author: chenfm * @author: chenfm
* @email: chenfengman@esvtek.com * @email: chenfengman@esvtek.com
* @createTime: 2020/8/12 15:08 * @createTime: 2020/8/12 15:08
......
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.17:3306/iot?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false url: jdbc:mysql://192.168.0.17:3306/super_hive?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: iot username: root
password: 123456 password: root
initial-size: 5 initial-size: 5
min-idle: 5 min-idle: 5
max-active: 20 max-active: 20
...@@ -37,7 +37,7 @@ spring: ...@@ -37,7 +37,7 @@ spring:
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**/*Dao.xml mapper-locations: classpath*:/mapper/**/*Dao.xml
#实体扫描,多个package用逗号或者分号分隔 #实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.esv.datacenter.iot.*.*.entity,com.esv.datacenter.iot.*.*.dto typeAliasesPackage: com.esv.superhive.iot.*.*.entity,com.esv.superhive.iot.*.*.dto
check-config-location: true check-config-location: true
#原生配置 #原生配置
configuration: configuration:
...@@ -66,8 +66,8 @@ management: ...@@ -66,8 +66,8 @@ management:
ribbon: ribbon:
eager-load: eager-load:
enabled: true enabled: true
clients: datacenter-base-service clients: superhive-base-service
feign-base-service-name: datacenter-base-service feign-base-service-name: superhive-base-service
db: db:
dict: dict:
table-field: table-field:
......
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.31.248:3306/data_center?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false url: jdbc:mysql://192.168.31.248:3306/super_hive?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: data_center username: root
password: 123456 password: root
initial-size: 5 initial-size: 5
min-idle: 5 min-idle: 5
max-active: 20 max-active: 20
...@@ -37,7 +37,7 @@ spring: ...@@ -37,7 +37,7 @@ spring:
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**/*Dao.xml mapper-locations: classpath*:/mapper/**/*Dao.xml
#实体扫描,多个package用逗号或者分号分隔 #实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.esv.datacenter.iot.*.*.entity,com.esv.datacenter.iot.*.*.dto typeAliasesPackage: com.esv.superhive.iot.*.*.entity,com.esv.superhive.iot.*.*.dto
check-config-location: true check-config-location: true
#原生配置 #原生配置
configuration: configuration:
...@@ -66,8 +66,8 @@ management: ...@@ -66,8 +66,8 @@ management:
ribbon: ribbon:
eager-load: eager-load:
enabled: true enabled: true
clients: datacenter-base-service clients: superhive-base-service
feign-base-service-name: datacenter-base-service feign-base-service-name: superhive-base-service
db: db:
dict: dict:
table-field: table-field:
......
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.31.248:3306/data_center?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false url: jdbc:mysql://192.168.31.248:3306/super_hive?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: data_center username: root
password: 123456 password: root
initial-size: 5 initial-size: 5
min-idle: 5 min-idle: 5
max-active: 20 max-active: 20
...@@ -37,7 +37,7 @@ spring: ...@@ -37,7 +37,7 @@ spring:
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**/*Dao.xml mapper-locations: classpath*:/mapper/**/*Dao.xml
#实体扫描,多个package用逗号或者分号分隔 #实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.esv.datacenter.iot.*.*.entity,com.esv.datacenter.iot.*.*.dto typeAliasesPackage: com.esv.superhive.iot.*.*.entity,com.esv.superhive.iot.*.*.dto
check-config-location: true check-config-location: true
#原生配置 #原生配置
configuration: configuration:
...@@ -66,8 +66,8 @@ management: ...@@ -66,8 +66,8 @@ management:
ribbon: ribbon:
eager-load: eager-load:
enabled: true enabled: true
clients: datacenter-base-service clients: superhive-base-service
feign-base-service-name: datacenter-base-service feign-base-service-name: superhive-base-service
db: db:
dict: dict:
table-field: table-field:
......
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.31.248:3306/data_center?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false url: jdbc:mysql://192.168.31.248:3306/super_hive?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: data_center username: root
password: 123456 password: root
initial-size: 5 initial-size: 5
min-idle: 5 min-idle: 5
max-active: 20 max-active: 20
...@@ -37,7 +37,7 @@ spring: ...@@ -37,7 +37,7 @@ spring:
mybatis-plus: mybatis-plus:
mapper-locations: classpath*:/mapper/**/*Dao.xml mapper-locations: classpath*:/mapper/**/*Dao.xml
#实体扫描,多个package用逗号或者分号分隔 #实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.esv.datacenter.iot.*.*.entity,com.esv.datacenter.iot.*.*.dto typeAliasesPackage: com.esv.superhive.iot.*.*.entity,com.esv.superhive.iot.*.*.dto
check-config-location: true check-config-location: true
#原生配置 #原生配置
configuration: configuration:
...@@ -66,8 +66,8 @@ management: ...@@ -66,8 +66,8 @@ management:
ribbon: ribbon:
eager-load: eager-load:
enabled: true enabled: true
clients: datacenter-base-service clients: superhive-base-service
feign-base-service-name: datacenter-base-service feign-base-service-name: superhive-base-service
db: db:
dict: dict:
table-field: table-field:
......
...@@ -6,11 +6,11 @@ nacos: ...@@ -6,11 +6,11 @@ nacos:
# url: localhost:8848 # url: localhost:8848
url: 192.168.31.248:8848 url: 192.168.31.248:8848
# namespace: cdbdf903-f657-40bb-9b2b-f21f2a286ff3 # namespace: cdbdf903-f657-40bb-9b2b-f21f2a286ff3
namespace: 1697ea67-be4c-4d38-b00d-39392b9dee8f namespace: a068bd25-15f8-4752-8774-08017416270d
group: DEFAULT_GROUP group: DEFAULT_GROUP
spring: spring:
application: application:
name: datacenter-iot-service name: superhive-iot-service
profiles: profiles:
active: local active: local
main: main:
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<appender-ref ref="FILE_APPENDER" /> <appender-ref ref="FILE_APPENDER" />
</logger> </logger>
<logger name="com.esv.datacenter.iot.config.mybatis" level="INFO" additivity="false"> <logger name="com.esv.superhive.iot.config.mybatis" level="INFO" additivity="false">
<appender-ref ref="CONSOLE_APPENDER" /> <appender-ref ref="CONSOLE_APPENDER" />
<appender-ref ref="FILE_APPENDER" /> <appender-ref ref="FILE_APPENDER" />
</logger> </logger>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.alarm.dao.DeviceDataAlarmDao"> <mapper namespace="com.esv.superhive.iot.module.alarm.dao.DeviceDataAlarmDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap id="deviceDataAlarmMap" type="com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity"> <resultMap id="deviceDataAlarmMap" type="com.esv.superhive.iot.module.alarm.entity.DeviceDataAlarmEntity">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="deviceId" column="device_id" /> <result property="deviceId" column="device_id" />
<result property="alarmRuleId" column="alarm_rule_id" /> <result property="alarmRuleId" column="alarm_rule_id" />
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<result property="alarmTime" column="alarm_time" /> <result property="alarmTime" column="alarm_time" />
</resultMap> </resultMap>
<select id="alarmList" resultType="com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO" <select id="alarmList" resultType="com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO"
parameterType="com.esv.datacenter.iot.module.alarm.form.AlarmListForm"> parameterType="com.esv.superhive.iot.module.alarm.form.AlarmListForm">
select alarm.id, alarm.device_id, alarm.alarm_rule_id, alarm.report_value, alarm.report_time, alarm.alarm_time, select alarm.id, alarm.device_id, alarm.alarm_rule_id, alarm.report_value, alarm.report_time, alarm.alarm_time,
device.device_type_id, type.name device_type_name, device.name device_name, device.description device_description, device.device_type_id, type.name device_type_name, device.name device_name, device.description device_description,
model.name data_model_name, property.property_code, property.property_name, rule.rule_expression, rule.alarm_level, model.name data_model_name, property.property_code, property.property_name, rule.rule_expression, rule.alarm_level,
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
order by alarm.alarm_time desc order by alarm.alarm_time desc
</select> </select>
<select id="alarmDetail" resultType="com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO"> <select id="alarmDetail" resultType="com.esv.superhive.iot.module.alarm.dto.DeviceDataAlarmDTO">
select alarm.id, alarm.device_id, alarm.alarm_rule_id, alarm.report_value, alarm.report_time, alarm.alarm_time, select alarm.id, alarm.device_id, alarm.alarm_rule_id, alarm.report_value, alarm.report_time, alarm.alarm_time,
device.device_type_id, type.name device_type_name, device.name device_name, device.description device_description, device.device_type_id, type.name device_type_name, device.name device_name, device.description device_description,
model.name data_model_name, property.property_code, property.property_name, rule.rule_expression, rule.alarm_level, model.name data_model_name, property.property_code, property.property_name, rule.rule_expression, rule.alarm_level,
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.datamodel.dao.DataModelAlarmRuleDao"> <mapper namespace="com.esv.superhive.iot.module.datamodel.dao.DataModelAlarmRuleDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.datamodel.entity.DataModelAlarmRuleEntity" id="dataModelAlarmRuleMap"> <resultMap type="com.esv.superhive.iot.module.datamodel.entity.DataModelAlarmRuleEntity" id="dataModelAlarmRuleMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<select id="selectAll" resultType="com.esv.datacenter.iot.module.datamodel.dto.DataModelAlarmRuleDto"> <select id="selectAll" resultType="com.esv.superhive.iot.module.datamodel.dto.DataModelAlarmRuleDto">
select a.id, a.model_id, a.property_id, a.rule_expression, a.alarm_level, a.threshold, select a.id, a.model_id, a.property_id, a.rule_expression, a.alarm_level, a.threshold,
b.property_code, b.property_name, b.property_type, b.property_default_value, b.property_unit b.property_code, b.property_name, b.property_type, b.property_default_value, b.property_unit
from data_model_alarm_rule a, data_model_property b from data_model_alarm_rule a, data_model_property b
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.datamodel.dao.DataModelDao"> <mapper namespace="com.esv.superhive.iot.module.datamodel.dao.DataModelDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity" id="objectModelMap"> <resultMap type="com.esv.superhive.iot.module.datamodel.entity.DataModelEntity" id="objectModelMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
</resultMap> </resultMap>
<!-- 分页查询 --> <!-- 分页查询 -->
<select id="select4Page" parameterType="com.esv.datacenter.iot.module.datamodel.form.DataModelForm" <select id="select4Page" parameterType="com.esv.superhive.iot.module.datamodel.form.DataModelForm"
resultType="com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity"> resultType="com.esv.superhive.iot.module.datamodel.entity.DataModelEntity">
select * select *
from data_model from data_model
where deleted = false where deleted = false
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
ORDER BY name ASC ORDER BY name ASC
</select> </select>
<update id="logicDeleteModel" parameterType="com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity"> <update id="logicDeleteModel" parameterType="com.esv.superhive.iot.module.datamodel.entity.DataModelEntity">
update data_model update data_model
set deleted = #{deleted} set deleted = #{deleted}
where id = #{id} where id = #{id}
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.datamodel.dao.DataModelPropertyDao"> <mapper namespace="com.esv.superhive.iot.module.datamodel.dao.DataModelPropertyDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity" id="objectModelPropertyMap"> <resultMap type="com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity" id="objectModelPropertyMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<update id="logicDeleteModelProperty" parameterType="com.esv.datacenter.iot.module.datamodel.entity.DataModelPropertyEntity"> <update id="logicDeleteModelProperty" parameterType="com.esv.superhive.iot.module.datamodel.entity.DataModelPropertyEntity">
update data_model_property update data_model_property
set deleted = #{deleted} set deleted = #{deleted}
where model_id = #{modelId} where model_id = #{modelId}
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceDataMapDao"> <mapper namespace="com.esv.superhive.iot.module.devicemodel.dao.DeviceDataMapDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity" id="deviceDataMapMap"> <resultMap type="com.esv.superhive.iot.module.devicemodel.entity.DeviceDataMapEntity" id="deviceDataMapMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<select id="selectDataModelByDeviceTypeId" parameterType="com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity" <select id="selectDataModelByDeviceTypeId" parameterType="com.esv.superhive.iot.module.devicemodel.entity.DeviceDataMapEntity"
resultType="com.esv.datacenter.iot.module.datamodel.entity.DataModelEntity"> resultType="com.esv.superhive.iot.module.datamodel.entity.DataModelEntity">
select b.id, b.name, b.description select b.id, b.name, b.description
from device_data_map a, data_model b from device_data_map a, data_model b
where a.data_model_id = b.id and a.device_type_id = #{deviceTypeId} where a.data_model_id = b.id and a.device_type_id = #{deviceTypeId}
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceInstanceDao"> <mapper namespace="com.esv.superhive.iot.module.devicemodel.dao.DeviceInstanceDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceInstanceEntity" id="deviceInstanceMap"> <resultMap type="com.esv.superhive.iot.module.devicemodel.entity.DeviceInstanceEntity" id="deviceInstanceMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</resultMap> </resultMap>
<!-- 分页查询 --> <!-- 分页查询 -->
<select id="select4Page" parameterType="com.esv.datacenter.iot.module.devicemodel.form.DeviceInstanceForm" <select id="select4Page" parameterType="com.esv.superhive.iot.module.devicemodel.form.DeviceInstanceForm"
resultType="com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto"> resultType="com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto">
select a.*, b.name as deviceTypeName select a.*, b.name as deviceTypeName
from device_instance a, device_type b from device_instance a, device_type b
where a.device_type_id = b.id and a.deleted = false and b.deleted = false where a.device_type_id = b.id and a.deleted = false and b.deleted = false
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
group by device_type_id group by device_type_id
</select> </select>
<select id="select4List" parameterType="com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto" <select id="select4List" parameterType="com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto"
resultType="com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceDto"> resultType="com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceDto">
select a.id, a.device_type_id,a.communication_id, select a.id, a.device_type_id,a.communication_id,
b.name as deviceTypeName b.name as deviceTypeName
from device_instance a, device_type b from device_instance a, device_type b
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</select> </select>
<select id="selectDeviceInstanceFullMap" parameterType="java.lang.Long" <select id="selectDeviceInstanceFullMap" parameterType="java.lang.Long"
resultType="com.esv.datacenter.iot.module.devicemodel.dto.DeviceInstanceFullMapDto"> resultType="com.esv.superhive.iot.module.devicemodel.dto.DeviceInstanceFullMapDto">
select select
ab.*, ac.dataModelId, ac.dataModelName ab.*, ac.dataModelId, ac.dataModelName
from (select a.id as instanceId, a.name as instanceName, a.communication_id as communicationId, from (select a.id as instanceId, a.name as instanceName, a.communication_id as communicationId,
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceTypeDao"> <mapper namespace="com.esv.superhive.iot.module.devicemodel.dao.DeviceTypeDao">
<!-- 可根据自己的需求,是否要使用 --> <!-- 可根据自己的需求,是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity" id="deviceTypeMap"> <resultMap type="com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity" id="deviceTypeMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/> <result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/> <result property="departmentId" column="department_id"/>
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
</resultMap> </resultMap>
<!-- 分页查询 --> <!-- 分页查询 -->
<select id="select4Page" parameterType="com.esv.datacenter.iot.module.devicemodel.form.DeviceTypeForm" <select id="select4Page" parameterType="com.esv.superhive.iot.module.devicemodel.form.DeviceTypeForm"
resultType="com.esv.datacenter.iot.module.devicemodel.entity.DeviceTypeEntity"> resultType="com.esv.superhive.iot.module.devicemodel.entity.DeviceTypeEntity">
select * select *
from device_type from device_type
where deleted = false where deleted = false
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
ORDER BY name ASC ORDER BY name ASC
</select> </select>
<select id="deviceTypeDetail" resultType="com.esv.datacenter.iot.module.devicemodel.dto.DeviceTypeDto"> <select id="deviceTypeDetail" resultType="com.esv.superhive.iot.module.devicemodel.dto.DeviceTypeDto">
select type.*, count(instance.id) instance_count select type.*, count(instance.id) instance_count
from device_type type from device_type type
left join device_instance instance on instance.device_type_id = type.id and instance.deleted = 0 left join device_instance instance on instance.device_type_id = type.id and instance.deleted = 0
......
package com.esv.datacenter.iot; package com.esv.superhive.iot;
import com.esv.datacenter.iot.common.constants.CommonConstants; import com.esv.superhive.iot.common.constants.CommonConstants;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
......
package com.esv.datacenter.iot; package com.esv.superhive.iot;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
......
package com.esv.datacenter.iot.common.component; package com.esv.superhive.iot.common.component;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
......
package com.esv.datacenter.iot.module.datamodel.controller; package com.esv.superhive.iot.module.datamodel.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.esv.datacenter.iot.BaseTestController; import com.esv.superhive.iot.BaseTestController;
import com.esv.datacenter.iot.common.response.ECode; import com.esv.superhive.iot.common.response.ECode;
import com.esv.datacenter.iot.module.datamodel.form.DataModelForm; import com.esv.superhive.iot.module.datamodel.form.DataModelForm;
import com.esv.datacenter.iot.module.datamodel.form.DataModelPropertyForm; import com.esv.superhive.iot.module.datamodel.form.DataModelPropertyForm;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Assert; import org.junit.Assert;
import org.junit.FixMethodOrder; import org.junit.FixMethodOrder;
......
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