From 88d15bf7242b5cd9b2ccdefa2a0ae67248866ba0 Mon Sep 17 00:00:00 2001 From: zhumeixiao <3313492479@qq.com> Date: Thu, 7 Nov 2024 14:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BC=A0=E5=AE=B3=E8=AE=BE=E5=A4=87=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fastbee-deviceData-service/pom.xml | 17 +++ .../deviceData/domain/DeviceMiceRealtime.java | 86 ++++++++++++ .../mapper/DeviceMiceRealtimeMapper.java | 61 +++++++++ .../service/IDeviceMiceRealtimeService.java | 61 +++++++++ .../imp/DeviceMiceRealtimeServiceImpl.java | 93 +++++++++++++ .../DeviceMiceRealtimeMapper.xml | 111 ++++++++++++++++ .../ggroup/domain/GSiteSluiceInfo.java | 2 +- .../ggroup/domain/dto/GSiteDeviceDto.java | 125 ++++++++++++++++++ .../ggroup/service/IGSiteDeviceService.java | 3 +- .../service/impl/GSiteDeviceServiceImpl.java | 7 +- 10 files changed, 562 insertions(+), 4 deletions(-) create mode 100644 fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/domain/DeviceMiceRealtime.java create mode 100644 fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/mapper/DeviceMiceRealtimeMapper.java create mode 100644 fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/IDeviceMiceRealtimeService.java create mode 100644 fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/imp/DeviceMiceRealtimeServiceImpl.java create mode 100644 fastbee-service/fastbee-deviceData-service/src/main/resources/mapper.deviceData/DeviceMiceRealtimeMapper.xml create mode 100644 fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSiteDeviceDto.java diff --git a/fastbee-service/fastbee-deviceData-service/pom.xml b/fastbee-service/fastbee-deviceData-service/pom.xml index c2aeed7..74a313e 100644 --- a/fastbee-service/fastbee-deviceData-service/pom.xml +++ b/fastbee-service/fastbee-deviceData-service/pom.xml @@ -16,5 +16,22 @@ 8 UTF-8 + + + io.swagger + swagger-annotations + 1.6.2 + compile + + + org.projectlombok + lombok + provided + + + com.fastbee + fastbee-common + + \ No newline at end of file diff --git a/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/domain/DeviceMiceRealtime.java b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/domain/DeviceMiceRealtime.java new file mode 100644 index 0000000..32d51c3 --- /dev/null +++ b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/domain/DeviceMiceRealtime.java @@ -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; + +} diff --git a/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/mapper/DeviceMiceRealtimeMapper.java b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/mapper/DeviceMiceRealtimeMapper.java new file mode 100644 index 0000000..7673ba5 --- /dev/null +++ b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/mapper/DeviceMiceRealtimeMapper.java @@ -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 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); +} diff --git a/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/IDeviceMiceRealtimeService.java b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/IDeviceMiceRealtimeService.java new file mode 100644 index 0000000..54849cf --- /dev/null +++ b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/IDeviceMiceRealtimeService.java @@ -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 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); +} diff --git a/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/imp/DeviceMiceRealtimeServiceImpl.java b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/imp/DeviceMiceRealtimeServiceImpl.java new file mode 100644 index 0000000..8147944 --- /dev/null +++ b/fastbee-service/fastbee-deviceData-service/src/main/java/com/fastbee/deviceData/service/imp/DeviceMiceRealtimeServiceImpl.java @@ -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 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); + } +} diff --git a/fastbee-service/fastbee-deviceData-service/src/main/resources/mapper.deviceData/DeviceMiceRealtimeMapper.xml b/fastbee-service/fastbee-deviceData-service/src/main/resources/mapper.deviceData/DeviceMiceRealtimeMapper.xml new file mode 100644 index 0000000..6aa6726 --- /dev/null +++ b/fastbee-service/fastbee-deviceData-service/src/main/resources/mapper.deviceData/DeviceMiceRealtimeMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into iot_device_mice_realtime + + feed_delivery, + infrared_detection, + export, + fill_light, + weight, + lng, + lat, + working_mode, + net_weight, + take_picture, + device_addr, + truth_status, + + + #{feedDelivery}, + #{infraredDetection}, + #{export}, + #{fillLight}, + #{weight}, + #{lng}, + #{lat}, + #{workingMode}, + #{netWeight}, + #{takePicture}, + #{deviceAddr}, + #{truthStatus}, + + + + + update iot_device_mice_realtime + + feed_delivery = #{feedDelivery}, + infrared_detection = #{infraredDetection}, + export = #{export}, + fill_light = #{fillLight}, + weight = #{weight}, + lng = #{lng}, + lat = #{lat}, + working_mode = #{workingMode}, + net_weight = #{netWeight}, + take_picture = #{takePicture}, + device_addr = #{deviceAddr}, + truth_status = #{truthStatus}, + + where id = #{id} + + + + delete from iot_device_mice_realtime where id = #{id} + + + + delete from iot_device_mice_realtime where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteSluiceInfo.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteSluiceInfo.java index a7ec0f5..4f01bf0 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteSluiceInfo.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/GSiteSluiceInfo.java @@ -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 = "是否为枢纽工程") diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSiteDeviceDto.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSiteDeviceDto.java new file mode 100644 index 0000000..c0a43f9 --- /dev/null +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/domain/dto/GSiteDeviceDto.java @@ -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 subDeviceList; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + private String devParams; + private String caretaker; + private String managementUnit; + private String tel; + +} diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteDeviceService.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteDeviceService.java index b85da87..117b7e1 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteDeviceService.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/IGSiteDeviceService.java @@ -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 getGSiteDeviceByDevice(Long id); } diff --git a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteDeviceServiceImpl.java b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteDeviceServiceImpl.java index ca7e84e..704e43d 100644 --- a/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteDeviceServiceImpl.java +++ b/fastbee-service/fastbee-ggroup-service/src/main/java/com/fastbee/ggroup/service/impl/GSiteDeviceServiceImpl.java @@ -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 getGSiteDeviceByDevice(Long id){ - return null; } }