Skip to content

I
iot-service
Commit 453a1f05 authored by huangcb's avatar huangcb
Browse files
Options

代码整理

parent 8913e735
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 576 deletions
src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceDataMapDao.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.dao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 设备数据模型映射表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Mapper
public interface DeviceDataMapDao extends BaseMapper<DeviceDataMapEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceModelDao.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.dao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 设备模型表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Mapper
public interface DeviceModelDao extends BaseMapper<DeviceModelEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceModelInstanceDao.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.dao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelInstanceEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 设备模型实例表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Mapper
public interface DeviceModelInstanceDao extends BaseMapper<DeviceModelInstanceEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/dao/DeviceModelPropertyDao.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.dao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelPropertyEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* 设备模型属性表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Mapper
public interface DeviceModelPropertyDao extends BaseMapper<DeviceModelPropertyEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/entity/DeviceDataMapEntity.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 设备数据模型映射表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Data
@TableName("device_data_map")
public class DeviceDataMapEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId
private Long id;
/**
* 租户ID
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 部门ID
*/
@TableField(fill = FieldFill.INSERT)
private Long departmentId;
/**
* 设备模型ID
*/
private Long deviceModelId;
/**
* 数据模型ID
*/
private Long dataModelId;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createUser;
/**
* 修改者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/entity/DeviceModelEntity.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 设备模型表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Data
@TableName("device_model")
public class DeviceModelEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId
private Long id;
/**
* 租户ID
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 部门ID
*/
@TableField(fill = FieldFill.INSERT)
private Long departmentId;
/**
* 模型名称
*/
private String name;
/**
* 模型描述
*/
private String description;
/**
* 是否删除：0-未删除、1-已删除
*/
@TableLogic
private Boolean deleted;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createUser;
/**
* 修改者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/entity/DeviceModelInstanceEntity.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 设备模型实例表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Data
@TableName("device_model_instance")
public class DeviceModelInstanceEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId
private Long id;
/**
* 租户ID
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 部门ID
*/
@TableField(fill = FieldFill.INSERT)
private Long departmentId;
/**
* 模型ID
*/
private Long modelId;
/**
* 实例名称
*/
private String name;
/**
* 实例描述
*/
private String description;
/**
* 是否删除：0-未删除、1-已删除
*/
@TableLogic
private Boolean deleted;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createUser;
/**
* 修改者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/entity/DeviceModelPropertyEntity.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.entity;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 设备模型属性表
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
@Data
@TableName("device_model_property")
public class DeviceModelPropertyEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId
private Long id;
/**
* 租户ID
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 部门ID
*/
@TableField(fill = FieldFill.INSERT)
private Long departmentId;
/**
* 模型ID
*/
private Long modelId;
/**
* 属性代码
*/
private String propertyCode;
/**
* 属性名称
*/
private String propertyName;
/**
* 属性类型（字典表）
*/
private Integer propertyType;
/**
* 属性默认值
*/
private String propertyDefaultValue;
/**
* 属性单位
*/
private String propertyUnit;
/**
* 排列序号
*/
private Long sortNum;
/**
* 是否删除：0-未删除、1-已删除
*/
@TableLogic
private Boolean deleted;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createUser;
/**
* 修改者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/DeviceDataMapService.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity;
/**
* 设备数据模型映射Service
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
public interface DeviceDataMapService extends IService<DeviceDataMapEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/DeviceModelInstanceService.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelInstanceEntity;
/**
* 设备模型实例Service
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
public interface DeviceModelInstanceService extends IService<DeviceModelInstanceEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/DeviceModelPropertyService.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelPropertyEntity;
/**
* 设备模型属性Service
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
public interface DeviceModelPropertyService extends IService<DeviceModelPropertyEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/DeviceModelService.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelEntity;
/**
* 设备模型Service
*
* @author 黄朝斌
* @email huangchaobin@esvtek.com
* @date 2020-08-06 10:23:24
*/
public interface DeviceModelService extends IService<DeviceModelEntity> {
}
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceDataMapServiceImpl.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceDataMapDao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceDataMapService;
import org.springframework.stereotype.Service;
@Service("deviceDataMapService")
public class DeviceDataMapServiceImpl extends ServiceImpl<DeviceDataMapDao, DeviceDataMapEntity> implements DeviceDataMapService {
}
\ No newline at end of file
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceModelInstanceServiceImpl.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceModelInstanceDao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelInstanceEntity;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceModelInstanceService;
import org.springframework.stereotype.Service;
@Service("deviceModelInstanceService")
public class DeviceModelInstanceServiceImpl extends ServiceImpl<DeviceModelInstanceDao, DeviceModelInstanceEntity> implements DeviceModelInstanceService {
}
\ No newline at end of file
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceModelPropertyServiceImpl.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceModelPropertyDao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelPropertyEntity;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceModelPropertyService;
import org.springframework.stereotype.Service;
@Service("deviceModelPropertyService")
public class DeviceModelPropertyServiceImpl extends ServiceImpl<DeviceModelPropertyDao, DeviceModelPropertyEntity> implements DeviceModelPropertyService {
}
\ No newline at end of file
src/main/java/com/esv/datacenter/iot/module/devicemodel/service/impl/DeviceModelServiceImpl.java deleted 100644 → 0
View file @ 8913e735
package com.esv.datacenter.iot.module.devicemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.esv.datacenter.iot.module.devicemodel.dao.DeviceModelDao;
import com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelEntity;
import com.esv.datacenter.iot.module.devicemodel.service.DeviceModelService;
import org.springframework.stereotype.Service;
@Service("deviceModelService")
public class DeviceModelServiceImpl extends ServiceImpl<DeviceModelDao, DeviceModelEntity> implements DeviceModelService {
}
\ No newline at end of file
src/main/resources/application-local.yml
View file @ 453a1f05
......@@ -71,7 +71,7 @@ feign-base-service-name: datacenter-base-service
db:
dict:
table-field:
map: 1-string,2-number,3-boolean
map: 1-string,2-number,3-integer,4-boolean,5-date,6-time,7-datetime
timescale:
data-source:
jdbc-url: jdbc:postgresql://192.168.31.248:5432/iot
......@@ -84,7 +84,5 @@ timescale:
maximum-pool-size: 1
max-lifetime: 0
table-field:
map: string-text,number-numeric,boolean-bit(1)
map: string-text,number-numeric,integer-int8,boolean-bit(1),date-date,time-timetz,datetime-timestamptz
table-prefix: iot_data_model_
\ No newline at end of file
rdbms:
table-prefix: iot_device_model_
\ No newline at end of file
src/main/resources/mapper/devicemodel/DeviceDataMapDao.xml deleted 100644 → 0
View file @ 8913e735
<?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">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceDataMapDao">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceDataMapEntity" id="deviceDataMapMap">
<result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/>
<result property="deviceModelId" column="device_model_id"/>
<result property="dataModelId" column="data_model_id"/>
<result property="createUser" column="create_user"/>
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>
\ No newline at end of file
src/main/resources/mapper/devicemodel/DeviceModelDao.xml deleted 100644 → 0
View file @ 8913e735
<?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">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceModelDao">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelEntity" id="deviceModelMap">
<result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/>
<result property="name" column="name"/>
<result property="description" column="description"/>
<result property="deleted" column="deleted"/>
<result property="createUser" column="create_user"/>
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>
\ No newline at end of file
src/main/resources/mapper/devicemodel/DeviceModelInstanceDao.xml deleted 100644 → 0
View file @ 8913e735
<?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">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceModelInstanceDao">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelInstanceEntity" id="deviceModelInstanceMap">
<result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/>
<result property="modelId" column="model_id"/>
<result property="name" column="name"/>
<result property="description" column="description"/>
<result property="deleted" column="deleted"/>
<result property="createUser" column="create_user"/>
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>
\ No newline at end of file
src/main/resources/mapper/devicemodel/DeviceModelPropertyDao.xml deleted 100644 → 0
View file @ 8913e735
<?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">
<mapper namespace="com.esv.datacenter.iot.module.devicemodel.dao.DeviceModelPropertyDao">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.esv.datacenter.iot.module.devicemodel.entity.DeviceModelPropertyEntity" id="deviceModelPropertyMap">
<result property="id" column="id"/>
<result property="tenantId" column="tenant_id"/>
<result property="departmentId" column="department_id"/>
<result property="modelId" column="model_id"/>
<result property="propertyCode" column="property_code"/>
<result property="propertyName" column="property_name"/>
<result property="propertyType" column="property_type"/>
<result property="propertyDefaultValue" column="property_default_value"/>
<result property="propertyUnit" column="property_unit"/>
<result property="sortNum" column="sort_num"/>
<result property="deleted" column="deleted"/>
<result property="createUser" column="create_user"/>
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>
\ No newline at end of file
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