TRX há 1 ano atrás
pai
commit
095811766a

+ 6 - 0
src/main/java/com/zswl/dataservice/controller/free/GateWayFreeController.java

@@ -49,4 +49,10 @@ public class GateWayFreeController {
         return gateWayInfoService.gateWayBindDevice(param);
     }
 
+    @Operation(summary = "ServerTime")
+    @RequestMapping(value = "ServerTime", method = {RequestMethod.GET})
+    public ResultContent ServerTime() {
+        return ResultContent.buildSuccess(System.currentTimeMillis());
+    }
+
 }

+ 2 - 2
src/main/java/com/zswl/dataservice/controller/iot/IotController.java

@@ -65,7 +65,7 @@ public class IotController {
     }
 
     @Parameter(in = ParameterIn.HEADER, name = "accessToken", required = false, description = "accessToken")
-    @Operation(summary = "查询模版")
+    @Operation(summary = "查询模版详情")
     @RequestMapping(value = "getIotTemplate", method = {RequestMethod.GET})
     public ResultContent<IotTemplateModel> getIotTemplate(@Parameter(name = "id", description = "数据id") String id) {
         return iotService.getIotTemplate(id);
@@ -108,7 +108,7 @@ public class IotController {
     }
 
     @Parameter(in = ParameterIn.HEADER, name = "accessToken", required = false, description = "accessToken")
-    @Operation(summary = "物模型列表-分页查询")
+    @Operation(summary = "物模型属性-服务-方法列表-分页查询")
     @RequestMapping(value = {"pageIotMain"}, method = {RequestMethod.POST})
     public ResultContent<Page<IotMainModel>> pageIotMain(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
             @Parameter(required = false) IotMainSearch param) {

+ 1 - 1
src/main/java/com/zswl/dataservice/service/iot/IotServiceImpl.java

@@ -293,7 +293,7 @@ public class IotServiceImpl extends SuperService {
         }
 
         IotTemplate newIotTemplate = new IotTemplate();
-        BeanUtils.copyProperties(param, newIotTemplate, "id", "createTime", "updateTime");
+        BeanUtils.copyProperties(iotTemplate, newIotTemplate, "id", "createTime", "updateTime");
         newIotTemplate.setIotDataType(IotDataType.Device);
         newIotTemplate.setIotTemplateId(param.getTemplateId());
         newIotTemplate.setDeviceId(deviceInfo.getDeviceId());