From f91997de6e78f14f70bd490b92797ed6a05d52b4 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Thu, 28 Nov 2024 08:43:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceHistoryDataController.java | 69 +++++++++++++++++++ .../DeviceInfoController.java | 8 +-- .../domain/DeviceInformationTargetpests.java | 50 +++++++------- 3 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java new file mode 100644 index 0000000..fdc6c87 --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java @@ -0,0 +1,69 @@ +package com.fastbee.data.controller.aaScreenAgricultural; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.fastbee.common.core.controller.BaseController; +import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; +import com.fastbee.deviceData.mapper.*; +import org.redisson.config.BaseConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author mijiupro + */ +@RestController +@RequestMapping("/device/history/data") +public class DeviceHistoryDataController extends BaseController { + + @Autowired + private DeviceRealtimedataWormsMapper deviceRealtimedataWormsMapper; + + @Autowired + private DeviceRealtimedataPhotovoltaicMapper deviceRealtimedataPhotovoltaicMapper; + + @Autowired + private DeviceRealtimedataMoistureMapper deviceRealtimedataMoistureMapper; + + @Autowired + private DeviceRealtimedataMiaoqingMapper deviceRealtimedataMiaoqingMapper; + + @Autowired + private DeviceRealtimedataMeteorologyMapper deviceRealtimedataMeteorologyMapper; + + + /** + * 获取虫情设备历史数据 + */ + @GetMapping("/worms/{deviceId}") + public AjaxResult getWormsHistoryData(String deviceId){ + //虫害图片 + List list = new LambdaQueryChainWrapper<>(deviceRealtimedataWormsMapper) + .eq(DeviceRealtimedataWorms::getDeviceAddr,deviceId).list(); + //虫害列表 + return success(list); + } + /** + * 获取墒情设备历史数据 + */ + @GetMapping("/moisture/{deviceId}") + public AjaxResult getMoistureHistoryData(String deviceId){ + + return null; + } + /** + * 获取气象设备历史数据 + */ + @GetMapping("/meteorology/{deviceId}") + public AjaxResult getMeteorologyHistoryData(String deviceId){ + return null; + } + + + + +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java index c82fc7a..970a293 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java @@ -96,8 +96,8 @@ public class DeviceInfoController extends BaseController { DeviceInformationMiaoqing::getDeviceEncoding); List deviceInformationMiaoqings = deviceInformationMiaoqingMapper.selectList(queryWrapper5); Map obj5=new HashMap<>(); - obj4.put("type","苗情"); - obj4.put("data",deviceInformationMiaoqings); + obj5.put("type","苗情"); + obj5.put("data",deviceInformationMiaoqings); result.add(obj5); //监控 @@ -107,8 +107,8 @@ public class DeviceInfoController extends BaseController { DeviceInformationMonitor::getDeviceEncoding); List deviceInformationMonitors = deviceInformationMonitorMapper.selectList(queryWrapper6); Map obj6=new HashMap<>(); - obj5.put("type","监控"); - obj5.put("data",deviceInformationMonitors); + obj6.put("type","监控"); + obj6.put("data",deviceInformationMonitors); result.add(obj6); return success(result); diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java index 8cf8790..50bc63c 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.fastbee.common.annotation.Excel; import com.fastbee.common.core.domain.BaseEntity; @@ -19,68 +21,68 @@ import com.fastbee.common.core.domain.BaseEntity; @EqualsAndHashCode(callSuper = true) @TableName("iot_device_information_targetPests") public class DeviceInformationTargetpests extends BaseEntity -{ - private static final long serialVersionUID = 1L; + { +private static final long serialVersionUID = 1L; /** 主键 */ private Long id; /** 设备品牌 */ - @Excel(name = "设备品牌") - @ApiModelProperty("设备品牌") + @Excel(name = "设备品牌") + @ApiModelProperty("设备品牌") private String deviceBrand; /** 类型 */ - @Excel(name = "类型") - @ApiModelProperty("类型") + @Excel(name = "类型") + @ApiModelProperty("类型") private String type; /** 设备型号 */ - @Excel(name = "设备型号") - @ApiModelProperty("设备型号") + @Excel(name = "设备型号") + @ApiModelProperty("设备型号") private String deviceType; /** 供电 */ - @Excel(name = "供电") - @ApiModelProperty("供电") + @Excel(name = "供电") + @ApiModelProperty("供电") private String powerSupply; /** 设备编码 */ - @Excel(name = "设备编码") - @ApiModelProperty("设备编码") + @Excel(name = "设备编码") + @ApiModelProperty("设备编码") private String deviceEncoding; /** 地址码 */ - @Excel(name = "地址码") - @ApiModelProperty("地址码") + @Excel(name = "地址码") + @ApiModelProperty("地址码") private String addressCode; /** 安装位置 */ - @Excel(name = "安装位置") - @ApiModelProperty("安装位置") + @Excel(name = "安装位置") + @ApiModelProperty("安装位置") private String installationLocation; /** 经度 */ - @Excel(name = "经度") - @ApiModelProperty("经度") + @Excel(name = "经度") + @ApiModelProperty("经度") private String longitude; /** 纬度 */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") + @Excel(name = "纬度") + @ApiModelProperty("纬度") private String latitude; /** 对接方式 */ - @Excel(name = "对接方式") - @ApiModelProperty("对接方式") + @Excel(name = "对接方式") + @ApiModelProperty("对接方式") private String dockingMethod; /** 删除标志（0代表存在，2代表删除） */ private Integer delFlag; /** 名称 */ - @Excel(name = "名称") - @ApiModelProperty("名称") + @Excel(name = "名称") + @ApiModelProperty("名称") private String name; }