TRX 1 rok temu
rodzic
commit
398430d07c

+ 8 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/iot/IotController.java

@@ -2,6 +2,7 @@ package com.zhongshu.iot.server.core.controller.iot;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.models.baseParam.IDParam;
 import com.github.microservice.models.baseParam.NameModel;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.FunctionType;
@@ -159,4 +160,11 @@ public class IotController {
         return iotService.getDeviceIotMain(param.getDeviceId(), FunctionType.Server);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到物模型属性值的最新值")
+    @RequestMapping(value = "getPropertyValueByIotMainId", method = {RequestMethod.POST})
+    public ResultContent getPropertyValueByIotMainId(@RequestBody IDParam param) {
+        return iotService.getPropertyValueByIotMainId(param.getId());
+    }
+
 }

+ 12 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotServiceImpl.java

@@ -662,6 +662,18 @@ public class IotServiceImpl extends SuperService {
         return toSimpleModel(entity);
     }
 
+    public ResultContent<Object> getPropertyValueByIotMainId(String iotMainId) {
+        if (StringUtils.isEmpty(iotMainId)) {
+            return ResultContent.buildFail("");
+        }
+        IotMain iotMain = iotMainDao.findTopById(iotMainId);
+        if (ObjectUtils.isEmpty(iotMain)) {
+            return ResultContent.buildFail("");
+        }
+        Object value = iotDeviceDataService.getDevicePropertyModel(iotMain.getDeviceId(), iotMain.getIdentifier());
+        return ResultContent.buildSuccess(value);
+    }
+
     public IotTemplateSimpleModel toSimpleModel(IotTemplate entity) {
         IotTemplateSimpleModel model = null;
         if (ObjectUtils.isNotEmpty(entity)) {