同步代码

2024-11-28 16:58:21 +08:00 · 2024-11-28 16:58:21 +08:00 · 01fd0b4ca5
commit 01fd0b4ca5
parent a6e7644afe
7 changed files with 43 additions and 17 deletions
--- 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)
--- 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)
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/historyData/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;
--- 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
@ -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));
+    }
+}
--- 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;
--- 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;
--- 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;