鼠害设备实时数据表
This commit is contained in:
zhumeixiao
parent
561b30e12c
commit
88d15bf724
@ -16,5 +16,22 @@
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.swagger</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
<version>1.6.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fastbee</groupId>
|
||||
<artifactId>fastbee-common</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,86 @@
|
||||
package com.fastbee.deviceData.domain;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import com.fastbee.common.annotation.Excel;
|
||||
import com.fastbee.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 鼠害设备实时数据对象 iot_device_mice_realtime
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-11-07
|
||||
*/
|
||||
@ApiModel(value = "DeviceMiceRealtime",description = "鼠害设备实时数据 iot_device_mice_realtime")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class DeviceMiceRealtime extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
private Long id;
|
||||
|
||||
/** 诱饵投放 0关 1开 */
|
||||
@Excel(name = "诱饵投放 0关 1开")
|
||||
@ApiModelProperty("诱饵投放 0关 1开")
|
||||
private String feedDelivery;
|
||||
|
||||
/** 红外探测 0无 1有 */
|
||||
@Excel(name = "红外探测 0无 1有")
|
||||
@ApiModelProperty("红外探测 0无 1有")
|
||||
private String infraredDetection;
|
||||
|
||||
/** 放生口 0关 1开 */
|
||||
@Excel(name = "放生口 0关 1开")
|
||||
@ApiModelProperty("放生口 0关 1开")
|
||||
private String export;
|
||||
|
||||
/** 补光灯 0关 1开 */
|
||||
@Excel(name = "补光灯 0关 1开")
|
||||
@ApiModelProperty("补光灯 0关 1开")
|
||||
private String fillLight;
|
||||
|
||||
/** 重量(g) */
|
||||
@Excel(name = "重量(g)")
|
||||
@ApiModelProperty("重量(g)")
|
||||
private String weight;
|
||||
|
||||
/** 经度 */
|
||||
@Excel(name = "经度")
|
||||
@ApiModelProperty("经度")
|
||||
private String lng;
|
||||
|
||||
/** 纬度 */
|
||||
@Excel(name = "纬度")
|
||||
@ApiModelProperty("纬度")
|
||||
private String lat;
|
||||
|
||||
/** 工作模式 0为手动模式 1为自动模式 */
|
||||
@Excel(name = "工作模式 0为手动模式 1为自动模式")
|
||||
@ApiModelProperty("工作模式 0为手动模式 1为自动模式")
|
||||
private String workingMode;
|
||||
|
||||
/** 净重 0关 1开 */
|
||||
@Excel(name = "净重 0关 1开")
|
||||
@ApiModelProperty("净重 0关 1开")
|
||||
private String netWeight;
|
||||
|
||||
/** 拍照 0关 1开 */
|
||||
@Excel(name = "拍照 0关 1开")
|
||||
@ApiModelProperty("拍照 0关 1开")
|
||||
private String takePicture;
|
||||
|
||||
/** 设备地址 */
|
||||
@Excel(name = "设备地址")
|
||||
@ApiModelProperty("设备地址")
|
||||
private String deviceAddr;
|
||||
|
||||
/** 设备状态 */
|
||||
@Excel(name = "设备状态")
|
||||
@ApiModelProperty("设备状态")
|
||||
private String truthStatus;
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.fastbee.deviceData.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.fastbee.deviceData.domain.DeviceMiceRealtime;
|
||||
|
||||
/**
|
||||
* 鼠害设备实时数据Mapper接口
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-11-07
|
||||
*/
|
||||
public interface DeviceMiceRealtimeMapper
|
||||
{
|
||||
/**
|
||||
* 查询鼠害设备实时数据
|
||||
*
|
||||
* @param id 鼠害设备实时数据主键
|
||||
* @return 鼠害设备实时数据
|
||||
*/
|
||||
public DeviceMiceRealtime selectDeviceMiceRealtimeById(Long id);
|
||||
|
||||
/**
|
||||
* 查询鼠害设备实时数据列表
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 鼠害设备实时数据集合
|
||||
*/
|
||||
public List<DeviceMiceRealtime> selectDeviceMiceRealtimeList(DeviceMiceRealtime deviceMiceRealtime);
|
||||
|
||||
/**
|
||||
* 新增鼠害设备实时数据
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDeviceMiceRealtime(DeviceMiceRealtime deviceMiceRealtime);
|
||||
|
||||
/**
|
||||
* 修改鼠害设备实时数据
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateDeviceMiceRealtime(DeviceMiceRealtime deviceMiceRealtime);
|
||||
|
||||
/**
|
||||
* 删除鼠害设备实时数据
|
||||
*
|
||||
* @param id 鼠害设备实时数据主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteDeviceMiceRealtimeById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除鼠害设备实时数据
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteDeviceMiceRealtimeByIds(Long[] ids);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.fastbee.deviceData.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.fastbee.deviceData.domain.DeviceMiceRealtime;
|
||||
|
||||
/**
|
||||
* 鼠害设备实时数据Service接口
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-11-07
|
||||
*/
|
||||
public interface IDeviceMiceRealtimeService
|
||||
{
|
||||
/**
|
||||
* 查询鼠害设备实时数据
|
||||
*
|
||||
* @param id 鼠害设备实时数据主键
|
||||
* @return 鼠害设备实时数据
|
||||
*/
|
||||
public DeviceMiceRealtime selectDeviceMiceRealtimeById(Long id);
|
||||
|
||||
/**
|
||||
* 查询鼠害设备实时数据列表
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 鼠害设备实时数据集合
|
||||
*/
|
||||
public List<DeviceMiceRealtime> selectDeviceMiceRealtimeList(DeviceMiceRealtime deviceMiceRealtime);
|
||||
|
||||
/**
|
||||
* 新增鼠害设备实时数据
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertDeviceMiceRealtime(DeviceMiceRealtime deviceMiceRealtime);
|
||||
|
||||
/**
|
||||
* 修改鼠害设备实时数据
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateDeviceMiceRealtime(DeviceMiceRealtime deviceMiceRealtime);
|
||||
|
||||
/**
|
||||
* 批量删除鼠害设备实时数据
|
||||
*
|
||||
* @param ids 需要删除的鼠害设备实时数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteDeviceMiceRealtimeByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除鼠害设备实时数据信息
|
||||
*
|
||||
* @param id 鼠害设备实时数据主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteDeviceMiceRealtimeById(Long id);
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
package com.fastbee.deviceData.service.imp;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.fastbee.deviceData.mapper.DeviceMiceRealtimeMapper;
|
||||
import com.fastbee.deviceData.domain.DeviceMiceRealtime;
|
||||
import com.fastbee.deviceData.service.IDeviceMiceRealtimeService;
|
||||
|
||||
/**
|
||||
* 鼠害设备实时数据Service业务层处理
|
||||
*
|
||||
* @author kerwincui
|
||||
* @date 2024-11-07
|
||||
*/
|
||||
@Service
|
||||
public class DeviceMiceRealtimeServiceImpl implements IDeviceMiceRealtimeService
|
||||
{
|
||||
@Autowired
|
||||
private DeviceMiceRealtimeMapper deviceMiceRealtimeMapper;
|
||||
|
||||
/**
|
||||
* 查询鼠害设备实时数据
|
||||
*
|
||||
* @param id 鼠害设备实时数据主键
|
||||
* @return 鼠害设备实时数据
|
||||
*/
|
||||
@Override
|
||||
public DeviceMiceRealtime selectDeviceMiceRealtimeById(Long id)
|
||||
{
|
||||
return deviceMiceRealtimeMapper.selectDeviceMiceRealtimeById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询鼠害设备实时数据列表
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 鼠害设备实时数据
|
||||
*/
|
||||
@Override
|
||||
public List<DeviceMiceRealtime> selectDeviceMiceRealtimeList(DeviceMiceRealtime deviceMiceRealtime)
|
||||
{
|
||||
return deviceMiceRealtimeMapper.selectDeviceMiceRealtimeList(deviceMiceRealtime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增鼠害设备实时数据
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertDeviceMiceRealtime(DeviceMiceRealtime deviceMiceRealtime)
|
||||
{
|
||||
return deviceMiceRealtimeMapper.insertDeviceMiceRealtime(deviceMiceRealtime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改鼠害设备实时数据
|
||||
*
|
||||
* @param deviceMiceRealtime 鼠害设备实时数据
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateDeviceMiceRealtime(DeviceMiceRealtime deviceMiceRealtime)
|
||||
{
|
||||
return deviceMiceRealtimeMapper.updateDeviceMiceRealtime(deviceMiceRealtime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除鼠害设备实时数据
|
||||
*
|
||||
* @param ids 需要删除的鼠害设备实时数据主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteDeviceMiceRealtimeByIds(Long[] ids)
|
||||
{
|
||||
return deviceMiceRealtimeMapper.deleteDeviceMiceRealtimeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除鼠害设备实时数据信息
|
||||
*
|
||||
* @param id 鼠害设备实时数据主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteDeviceMiceRealtimeById(Long id)
|
||||
{
|
||||
return deviceMiceRealtimeMapper.deleteDeviceMiceRealtimeById(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,111 @@
|
||||
<?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.fastbee.deviceData.mapper.DeviceMiceRealtimeMapper">
|
||||
|
||||
<resultMap type="DeviceMiceRealtime" id="DeviceMiceRealtimeResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="feedDelivery" column="feed_delivery" />
|
||||
<result property="infraredDetection" column="infrared_detection" />
|
||||
<result property="export" column="export" />
|
||||
<result property="fillLight" column="fill_light" />
|
||||
<result property="weight" column="weight" />
|
||||
<result property="lng" column="lng" />
|
||||
<result property="lat" column="lat" />
|
||||
<result property="workingMode" column="working_mode" />
|
||||
<result property="netWeight" column="net_weight" />
|
||||
<result property="takePicture" column="take_picture" />
|
||||
<result property="deviceAddr" column="device_addr" />
|
||||
<result property="truthStatus" column="truth_status" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectDeviceMiceRealtimeVo">
|
||||
select id, feed_delivery, infrared_detection, export, fill_light, weight, lng, lat, working_mode, net_weight, take_picture, device_addr, truth_status from iot_device_mice_realtime
|
||||
</sql>
|
||||
|
||||
<select id="selectDeviceMiceRealtimeList" parameterType="DeviceMiceRealtime" resultMap="DeviceMiceRealtimeResult">
|
||||
<include refid="selectDeviceMiceRealtimeVo"/>
|
||||
<where>
|
||||
<if test="feedDelivery != null and feedDelivery != ''"> and feed_delivery = #{feedDelivery}</if>
|
||||
<if test="infraredDetection != null and infraredDetection != ''"> and infrared_detection = #{infraredDetection}</if>
|
||||
<if test="export != null and export != ''"> and export = #{export}</if>
|
||||
<if test="fillLight != null and fillLight != ''"> and fill_light = #{fillLight}</if>
|
||||
<if test="weight != null and weight != ''"> and weight = #{weight}</if>
|
||||
<if test="lng != null and lng != ''"> and lng = #{lng}</if>
|
||||
<if test="lat != null and lat != ''"> and lat = #{lat}</if>
|
||||
<if test="workingMode != null and workingMode != ''"> and working_mode = #{workingMode}</if>
|
||||
<if test="netWeight != null and netWeight != ''"> and net_weight = #{netWeight}</if>
|
||||
<if test="takePicture != null and takePicture != ''"> and take_picture = #{takePicture}</if>
|
||||
<if test="deviceAddr != null and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
|
||||
<if test="truthStatus != null and truthStatus != ''"> and truth_status = #{truthStatus}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectDeviceMiceRealtimeById" parameterType="Long" resultMap="DeviceMiceRealtimeResult">
|
||||
<include refid="selectDeviceMiceRealtimeVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertDeviceMiceRealtime" parameterType="DeviceMiceRealtime" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into iot_device_mice_realtime
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="feedDelivery != null">feed_delivery,</if>
|
||||
<if test="infraredDetection != null">infrared_detection,</if>
|
||||
<if test="export != null">export,</if>
|
||||
<if test="fillLight != null">fill_light,</if>
|
||||
<if test="weight != null">weight,</if>
|
||||
<if test="lng != null">lng,</if>
|
||||
<if test="lat != null">lat,</if>
|
||||
<if test="workingMode != null">working_mode,</if>
|
||||
<if test="netWeight != null">net_weight,</if>
|
||||
<if test="takePicture != null">take_picture,</if>
|
||||
<if test="deviceAddr != null">device_addr,</if>
|
||||
<if test="truthStatus != null">truth_status,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="feedDelivery != null">#{feedDelivery},</if>
|
||||
<if test="infraredDetection != null">#{infraredDetection},</if>
|
||||
<if test="export != null">#{export},</if>
|
||||
<if test="fillLight != null">#{fillLight},</if>
|
||||
<if test="weight != null">#{weight},</if>
|
||||
<if test="lng != null">#{lng},</if>
|
||||
<if test="lat != null">#{lat},</if>
|
||||
<if test="workingMode != null">#{workingMode},</if>
|
||||
<if test="netWeight != null">#{netWeight},</if>
|
||||
<if test="takePicture != null">#{takePicture},</if>
|
||||
<if test="deviceAddr != null">#{deviceAddr},</if>
|
||||
<if test="truthStatus != null">#{truthStatus},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateDeviceMiceRealtime" parameterType="DeviceMiceRealtime">
|
||||
update iot_device_mice_realtime
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="feedDelivery != null">feed_delivery = #{feedDelivery},</if>
|
||||
<if test="infraredDetection != null">infrared_detection = #{infraredDetection},</if>
|
||||
<if test="export != null">export = #{export},</if>
|
||||
<if test="fillLight != null">fill_light = #{fillLight},</if>
|
||||
<if test="weight != null">weight = #{weight},</if>
|
||||
<if test="lng != null">lng = #{lng},</if>
|
||||
<if test="lat != null">lat = #{lat},</if>
|
||||
<if test="workingMode != null">working_mode = #{workingMode},</if>
|
||||
<if test="netWeight != null">net_weight = #{netWeight},</if>
|
||||
<if test="takePicture != null">take_picture = #{takePicture},</if>
|
||||
<if test="deviceAddr != null">device_addr = #{deviceAddr},</if>
|
||||
<if test="truthStatus != null">truth_status = #{truthStatus},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteDeviceMiceRealtimeById" parameterType="Long">
|
||||
delete from iot_device_mice_realtime where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteDeviceMiceRealtimeByIds" parameterType="String">
|
||||
delete from iot_device_mice_realtime where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -62,7 +62,7 @@ public class GSiteSluiceInfo extends BaseEntity
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "工程建设情况", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
@ApiModelProperty("工程建设情况")
|
||||
private Date constructionDate;
|
||||
private String constructionDate;
|
||||
|
||||
/** 是否为枢纽工程 */
|
||||
@Excel(name = "是否为枢纽工程")
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
package com.fastbee.ggroup.domain.dto;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.fastbee.common.annotation.Excel;
|
||||
import com.fastbee.common.model.vo.iot.DeviceDetailVo;
|
||||
import com.fastbee.iot.domain.Device;
|
||||
import com.fastbee.iot.domain.SipRelation;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import org.springframework.data.annotation.Transient;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
public class GSiteDeviceDto extends Device {
|
||||
|
||||
/** 主键 */
|
||||
private Long id;
|
||||
|
||||
/** 站点id */
|
||||
private Long siteId;
|
||||
|
||||
/** 设备id */
|
||||
private Long deviceId;
|
||||
|
||||
/** 设备名称 */
|
||||
private String deviceName;
|
||||
|
||||
/** 产品ID */
|
||||
private Long productId;
|
||||
|
||||
/** 产品名称 */
|
||||
private String productName;
|
||||
|
||||
/** 租户ID */
|
||||
private Long tenantId;
|
||||
|
||||
/** 租户名称 */
|
||||
private String tenantName;
|
||||
|
||||
/** 设备编号 */
|
||||
private String serialNumber;
|
||||
|
||||
/** 固件版本 */
|
||||
private BigDecimal firmwareVersion;
|
||||
|
||||
/** 设备类型（1-直连设备、2-网关设备、3-监控设备） */
|
||||
private Integer deviceType;
|
||||
|
||||
/** 设备状态（1-未激活，2-禁用，3-在线，4-离线） */
|
||||
@Excel(name = "设备状态")
|
||||
private Integer status;
|
||||
|
||||
/** wifi信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]） */
|
||||
private Integer rssi;
|
||||
|
||||
/** 设备影子 */
|
||||
private Integer isShadow;
|
||||
|
||||
/** 设备所在地址 */
|
||||
private String networkAddress;
|
||||
|
||||
/** 设备入网IP */
|
||||
private String networkIp;
|
||||
|
||||
/** 设备经度 */
|
||||
private BigDecimal longitude;
|
||||
|
||||
/** 设备纬度 */
|
||||
private BigDecimal latitude;
|
||||
|
||||
/** 激活时间 */
|
||||
private Date activeTime;
|
||||
|
||||
/** 子设备网关编号 */
|
||||
private String gwDevCode;
|
||||
|
||||
/** 物模型值 */
|
||||
private String thingsModelValue;
|
||||
|
||||
/** 图片地址 */
|
||||
private String imgUrl;
|
||||
|
||||
/** 是否自定义位置 **/
|
||||
private Integer locationWay;
|
||||
|
||||
/** 设备摘要 **/
|
||||
private String summary;
|
||||
|
||||
/**
|
||||
* 设备名称编号搜索
|
||||
*/
|
||||
private String deviceNameOrSerialNumber;
|
||||
|
||||
/** 分组ID，用于分组查询 **/
|
||||
private Long groupId;
|
||||
|
||||
/** 是否设备所有者，用于查询 **/
|
||||
private Integer isOwner;
|
||||
/**子设备数量*/
|
||||
private Integer subDeviceCount;
|
||||
/**是否是模拟设备*/
|
||||
private Integer isSimulate;
|
||||
/**子设备地址*/
|
||||
private Integer slaveId;
|
||||
/**设备传输协议*/
|
||||
private String transport;
|
||||
|
||||
private Long deptId;
|
||||
//设备详情
|
||||
private Boolean showChild;
|
||||
|
||||
private List<Device> subDeviceList;
|
||||
|
||||
/** 删除标志（0代表存在 2代表删除） */
|
||||
private String delFlag;
|
||||
|
||||
private String devParams;
|
||||
private String caretaker;
|
||||
private String managementUnit;
|
||||
private String tel;
|
||||
|
||||
}
|
||||
@ -2,6 +2,7 @@ package com.fastbee.ggroup.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.fastbee.ggroup.domain.GSiteDevice;
|
||||
import com.fastbee.ggroup.domain.dto.GSiteDeviceDto;
|
||||
import com.fastbee.iot.domain.Device;
|
||||
|
||||
/**
|
||||
@ -67,6 +68,6 @@ public interface IGSiteDeviceService
|
||||
* @param id 站点设备关系主键
|
||||
* @return 结果
|
||||
*/
|
||||
public Device getGSiteDeviceByDevice(Long id);
|
||||
public List<GSiteDeviceDto> getGSiteDeviceByDevice(Long id);
|
||||
|
||||
}
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
package com.fastbee.ggroup.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.fastbee.ggroup.domain.dto.GSiteDeviceDto;
|
||||
import com.fastbee.ggroup.mapper.GSitesMapper;
|
||||
import com.fastbee.iot.domain.Device;
|
||||
import com.fastbee.iot.mapper.DeviceMapper;
|
||||
import com.github.yulichang.query.MPJLambdaQueryWrapper;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.fastbee.ggroup.mapper.GSiteDeviceMapper;
|
||||
@ -108,9 +112,8 @@ public class GSiteDeviceServiceImpl implements IGSiteDeviceService
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public Device getGSiteDeviceByDevice(Long id){
|
||||
public List<GSiteDeviceDto> getGSiteDeviceByDevice(Long id){
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user