From 01fd0b4ca5a71eed5cd91893486685b88d11b413 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Thu, 28 Nov 2024 16:58:21 +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 --- .../AgricultureCropInfoController.java | 12 +++++------ .../AgricultureCropYieldController.java | 14 ++++++------- .../DeviceHistoryDataController.java | 2 +- .../realTimeData/DeviceMonitorController.java | 21 +++++++++++++++++++ .../domain/DeviceRealtimedataMeteorology.java | 4 +++- .../domain/DeviceRealtimedataMoisture.java | 3 +++ .../domain/DeviceRealtimedataWorms.java | 4 ++-- 7 files changed, 43 insertions(+), 17 deletions(-) rename fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/{ => historyData}/DeviceHistoryDataController.java (97%) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/realTimeData/DeviceMonitorController.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropInfoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropInfoController.java index 796ce3e..29b4873 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropInfoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropInfoController.java @@ -41,7 +41,7 @@ public class AgricultureCropInfoController extends BaseController /** * 查询农作物信息管理列表 */ -@PreAuthorize("@ss.hasPermi('crop:crop:list')") +//@PreAuthorize("@ss.hasPermi('crop:crop:list')") @GetMapping("/list") @ApiOperation("查询农作物信息管理列表") public TableDataInfo list(AgricultureCropInfo agricultureCropInfo) @@ -55,7 +55,7 @@ public class AgricultureCropInfoController extends BaseController * 导出农作物信息管理列表 */ @ApiOperation("导出农作物信息管理列表") - @PreAuthorize("@ss.hasPermi('crop:crop:export')") +// @PreAuthorize("@ss.hasPermi('crop:crop:export')") @PostMapping("/export") public void export(HttpServletResponse response, AgricultureCropInfo agricultureCropInfo) { @@ -67,7 +67,7 @@ public class AgricultureCropInfoController extends BaseController /** * 获取农作物信息管理详细信息 */ - @PreAuthorize("@ss.hasPermi('crop:crop:query')") +// @PreAuthorize("@ss.hasPermi('crop:crop:query')") @GetMapping(value = "/{id}") @ApiOperation("获取农作物信息管理详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -78,7 +78,7 @@ public class AgricultureCropInfoController extends BaseController /** * 新增农作物信息管理 */ - @PreAuthorize("@ss.hasPermi('crop:crop:add')") +// @PreAuthorize("@ss.hasPermi('crop:crop:add')") @PostMapping @ApiOperation("新增农作物信息管理") public AjaxResult add(@RequestBody AgricultureCropInfo agricultureCropInfo) @@ -89,7 +89,7 @@ public class AgricultureCropInfoController extends BaseController /** * 修改农作物信息管理 */ - @PreAuthorize("@ss.hasPermi('crop:crop:edit')") +// @PreAuthorize("@ss.hasPermi('crop:crop:edit')") @PutMapping @ApiOperation("修改农作物信息管理") public AjaxResult edit(@RequestBody AgricultureCropInfo agricultureCropInfo) @@ -100,7 +100,7 @@ public class AgricultureCropInfoController extends BaseController /** * 删除农作物信息管理 */ - @PreAuthorize("@ss.hasPermi('crop:crop:remove')") +// @PreAuthorize("@ss.hasPermi('crop:crop:remove')") @DeleteMapping("/{ids}") @ApiOperation("删除农作物信息管理") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropYieldController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropYieldController.java index 6b5fbcc..d73c2a9 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropYieldController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/AgricultureCropYieldController.java @@ -41,7 +41,7 @@ public class AgricultureCropYieldController extends BaseController /** * 查询作物产量记录列表 */ -@PreAuthorize("@ss.hasPermi('crop:yield:list')") +//@PreAuthorize("@ss.hasPermi('crop:yield:list')") @GetMapping("/list") @ApiOperation("查询作物产量记录列表") public TableDataInfo list(AgricultureCropYield agricultureCropYield) @@ -55,7 +55,7 @@ public class AgricultureCropYieldController extends BaseController * 导出作物产量记录列表 */ @ApiOperation("导出作物产量记录列表") - @PreAuthorize("@ss.hasPermi('crop:yield:export')") +// @PreAuthorize("@ss.hasPermi('crop:yield:export')") @PostMapping("/export") public void export(HttpServletResponse response, AgricultureCropYield agricultureCropYield) { @@ -67,7 +67,7 @@ public class AgricultureCropYieldController extends BaseController /** * 获取作物产量记录详细信息 */ - @PreAuthorize("@ss.hasPermi('crop:yield:query')") +// @PreAuthorize("@ss.hasPermi('crop:yield:query')") @GetMapping(value = "/{id}") @ApiOperation("获取作物产量记录详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -78,7 +78,7 @@ public class AgricultureCropYieldController extends BaseController /** * 新增作物产量记录 */ - @PreAuthorize("@ss.hasPermi('crop:yield:add')") +// @PreAuthorize("@ss.hasPermi('crop:yield:add')") @PostMapping @ApiOperation("新增作物产量记录") public AjaxResult add(@RequestBody AgricultureCropYield agricultureCropYield) @@ -89,7 +89,7 @@ public class AgricultureCropYieldController extends BaseController /** * 修改作物产量记录 */ - @PreAuthorize("@ss.hasPermi('crop:yield:edit')") +// @PreAuthorize("@ss.hasPermi('crop:yield:edit')") @PutMapping @ApiOperation("修改作物产量记录") public AjaxResult edit(@RequestBody AgricultureCropYield agricultureCropYield) @@ -100,7 +100,7 @@ public class AgricultureCropYieldController extends BaseController /** * 删除作物产量记录 */ - @PreAuthorize("@ss.hasPermi('crop:yield:remove')") +// @PreAuthorize("@ss.hasPermi('crop:yield:remove')") @DeleteMapping("/{ids}") @ApiOperation("删除作物产量记录") public AjaxResult remove(@PathVariable Long[] ids) @@ -112,7 +112,7 @@ public class AgricultureCropYieldController extends BaseController /** * 查询作物产量统计信息 */ - @PreAuthorize("@ss.hasPermi('crop:yield:statistics')") +// @PreAuthorize("@ss.hasPermi('crop:yield:statistics')") @GetMapping("/statistics") @ApiOperation("查询作物产量统计信息") public AjaxResult statistics(AgricultureCropYield agricultureCropYield) 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/historyData/DeviceHistoryDataController.java similarity index 97% rename from fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceHistoryDataController.java rename to fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/historyData/DeviceHistoryDataController.java index a2c6e0a..e91aa22 100644 --- 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/historyData/DeviceHistoryDataController.java @@ -1,4 +1,4 @@ -package com.fastbee.data.controller.aaScreenAgricultural; +package com.fastbee.data.controller.aaScreenAgricultural.historyData; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.fastbee.common.core.controller.BaseController; diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/realTimeData/DeviceMonitorController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/realTimeData/DeviceMonitorController.java new file mode 100644 index 0000000..e07759c --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/realTimeData/DeviceMonitorController.java @@ -0,0 +1,21 @@ +package com.fastbee.data.controller.aaScreenAgricultural.realTimeData; + +import com.fastbee.common.core.controller.BaseController; +import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.deviceData.api.yingshiyun.service.YingshiyunService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.repository.query.Param; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/device/real/data") +public class DeviceMonitorController extends BaseController { + @Autowired + private YingshiyunService yingshiyunService; + @GetMapping("/monitor") + public AjaxResult getVideoUrl(@Param("deviceId") String deviceId){ + return success(yingshiyunService.getVideoPlayUrl(deviceId)); + } +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java index 1239d1b..8bb3a90 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -106,12 +107,13 @@ private static final long serialVersionUID = 1L; private Integer delFlag; /** 保存时间 */ - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("保存时间") private Date saveTime; /** 数据实时时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "数据实时时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("数据实时时间") private Date realTime; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java index 54fe165..75c0a1c 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java @@ -3,6 +3,7 @@ package com.fastbee.deviceData.domain; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -207,11 +208,13 @@ private static final long serialVersionUID = 1L; private Long control; /** 保存时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("保存时间") private Date saveTime; /** 实时时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("实时时间") private Date realTime; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java index 154d517..fc21a12 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java @@ -123,13 +123,13 @@ private static final long serialVersionUID = 1L; private String status; /** 保存时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("保存时间") private Date saveTime; /** 实时时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("实时时间") private Date realTime;