luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步代码

Browse Source
This commit is contained in:
mi9688
2024-11-28 08:43:40 +08:00
parent bf3c82f21b
commit f91997de6e
3 changed files with 99 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java Normal file
View File

@ -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<DeviceRealtimedataWorms> 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;
}
}

8
fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInfoController.java
View File

@ -96,8 +96,8 @@ public class DeviceInfoController extends BaseController {
DeviceInformationMiaoqing::getDeviceEncoding);
List<DeviceInformationMiaoqing> deviceInformationMiaoqings = deviceInformationMiaoqingMapper.selectList(queryWrapper5);
Map<String,Object> 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<DeviceInformationMonitor> deviceInformationMonitors = deviceInformationMonitorMapper.selectList(queryWrapper6);
Map<String,Object> obj6=new HashMap<>();
obj5.put("type","监控");
obj5.put("data",deviceInformationMonitors);
obj6.put("type","监控");
obj6.put("data",deviceInformationMonitors);
result.add(obj6);
return success(result);

50
fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/domain/DeviceInformationTargetpests.java
View File

@ -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;
}