同步代码

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

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<DeviceInformationMiaoqing> deviceInformationMiaoqings = deviceInformationMiaoqingMapper.selectList(queryWrapper5);
         Map<String,Object> obj5=new HashMap<>();
-        obj4.put("type","苗情");
+        obj5.put("type","苗情");
-        obj4.put("data",deviceInformationMiaoqings);
+        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","监控");
+        obj6.put("type","监控");
-        obj5.put("data",deviceInformationMonitors);
+        obj6.put("data",deviceInformationMonitors);
         result.add(obj6);
         return success(result);
 

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,8 +21,8 @@ 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;