eolink文档同步，修改接口

iot-module/iot-module-data/iot-module-data-biz/src/main/java/com/middle/platform/data/biz/pojo/HistoryPara.java

@@ -1,6 +1,8 @@
 package com.middle.platform.data.biz.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,8 +15,14 @@ import java.util.Date;
 @Getter
 @Setter
 public class HistoryPara {
+    /**
+     * 1-图表（解析后数据） 2-表格（历史数据）
+     */
+    @NotNull(message = "类型不能为空")
     private Integer type;
+    @NotBlank(message = "设备guid不能为空")
     private String guid;
+    @NotBlank(message = "设备属性不能为空")
     private String line;
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/controller/IotDeviceController.java

@@ -27,6 +27,7 @@ import java.util.Objects;
 @RestController
 @RequestMapping("/device")
 @RequiredArgsConstructor
+@Validated
 public class IotDeviceController {
     private final IotDeviceService iotDeviceService;
 
@@ -38,7 +39,7 @@ public class IotDeviceController {
      */
     @PostMapping("/list")
     public Result<Object> list(@RequestBody @Validated DevicePage devicePage) {
-        return Result.ok(iotDeviceService.pageQuery(devicePage),"查询成功");
+        return Result.ok(iotDeviceService.pageQuery(devicePage), "查询成功");
     }
 
     /**
@@ -49,7 +50,7 @@ public class IotDeviceController {
      */
     @PostMapping("/save")
     public Result<Object> save(@RequestBody @Validated IotDevicePara iotDevicePara) {
-        return Result.ok(iotDeviceService.save(iotDevicePara),"保存成功");
+        return Result.ok(iotDeviceService.save(iotDevicePara), "保存成功");
     }
 
     /**
@@ -60,19 +61,19 @@ public class IotDeviceController {
      */
     @GetMapping("/detail")
     public Result<Object> detail(@NotNull(message = "id不能为空") @Validated Long id) {
-        return Result.ok(iotDeviceService.detail(id),"查询成功");
+        return Result.ok(iotDeviceService.detail(id), "查询成功");
     }
 
-    /**
-     * 设备物模型数据详情
-     *
-     * @param id 设备id
-     * @return
-     */
-    @GetMapping("/modDetail")
-    public Result<Object> modDetail(@NotNull(message = "id不能为空") @Validated Long id) {
-        return Result.ok(iotDeviceService.detail(id),"查询成功");
-    }
+//    /**
+//     * 设备物模型数据详情
+//     *
+//     * @param id 设备id
+//     * @return
+//     */
+//    @GetMapping("/modDetail")
+//    public Result<Object> modDetail(@NotNull(message = "id不能为空") @Validated Long id) {
+//        return Result.ok(iotDeviceService.detail(id), "查询成功");
+//    }
 
     /**
      * 导入设备
@@ -110,7 +111,7 @@ public class IotDeviceController {
      * @return
      */
     @PostMapping("/enable")
-    public Result<Object> enable(@RequestBody IotDeviceFlag iotDeviceFlag) {
+    public Result<Object> enable(@RequestBody @Validated IotDeviceFlag iotDeviceFlag) {
         return Result.ok(iotDeviceService.enable(iotDeviceFlag), "操作成功");
     }
 
@@ -121,7 +122,7 @@ public class IotDeviceController {
      * @return 设备总数、当前在线
      */
     @GetMapping("/count")
-    public Result<Object> count(Long productId) {
+    public Result<Object> count(@NotNull(message = "产品id不能为空") Long productId) {
         return Result.ok(iotDeviceService.count(productId), "查询成功");
     }
 }

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/domain/req/IotDevicePara.java

@@ -1,5 +1,7 @@
 package com.middle.platform.manage.biz.domain.req;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,16 +18,19 @@ public class IotDevicePara {
     /**
      * 所属产品
      */
+    @NotNull(message = "所属产品不能为空")
     private Long productId;
 
     /**
      * 设备名称
      */
+    @NotBlank(message = "设备名称不能为空")
     private String name;
 
     /**
      * 设备sn码
      */
+    @NotBlank(message = "SN不能为空")
     private String sn;
 
     /**

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotDeviceService.java

@@ -1,6 +1,7 @@
 package com.middle.platform.manage.biz.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -159,7 +160,7 @@ public class IotDeviceService {
         Optional.ofNullable(dictApi.query(DictType.VENDORS_TYPE, String.valueOf(detail.getVendors()))).ifPresent(cache -> detail.setVendorsLabel(cache.getLabel()));
         Optional.ofNullable(dictApi.query(DictType.DATA_FORMAT_TYPE, String.valueOf(detail.getDataFormat()))).ifPresent(cache -> detail.setDataFormatLabel(cache.getLabel()));
         Optional.ofNullable(cacheService.getKey(String.format(CacheConstant.ONLINE_CACHE, detail.getGuid()))).ifPresent(t -> {
-            detail.setOnlineTime((LocalDateTime) t);
+            detail.setOnlineTime(LocalDateTimeUtil.parse((String) t));
             detail.setStatus(1);
         });
         return detail;

iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/controller/MenuController.java

@@ -4,7 +4,7 @@ import com.middle.platform.common.utils.Result;
 import com.middle.platform.system.biz.entity.SysMenu;
 import com.middle.platform.system.biz.service.SysMenuService;
 import jakarta.annotation.Resource;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,7 +26,7 @@ public class MenuController {
      *
      * @return
      */
-    @PostMapping("/list")
+    @GetMapping("/list")
     public Result<List<SysMenu>> list() {
         return Result.ok(sysMenuService.list());
     }