TRX 1 жил өмнө
parent
commit
4b06ab3679

+ 1 - 1
OneCardIotClient/src/main/java/com/zhongshu/iot/client/model/artemis/OperationMessageResultModel.java

@@ -34,7 +34,7 @@ public class OperationMessageResultModel extends SuperModel {
     @Schema(description = "设备ID")
     private String deviceId;
 
-    @Schema(description = "分组ID")
+    @Schema(description = "分组code")
     private String projectCode;
 
     @Schema(description = "网关ID")

+ 12 - 6
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/devices/OperationMessageController.java

@@ -3,6 +3,7 @@ package com.zhongshu.iot.server.core.controller.devices;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.iot.client.model.artemis.OperationMessageModel;
 import com.zhongshu.iot.client.model.artemis.OperationMessageResultModel;
 import com.zhongshu.iot.client.model.artemis.OperationMessageResultSearch;
@@ -17,9 +18,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -68,11 +69,16 @@ public class OperationMessageController {
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到消息详情")
-    @RequestMapping(value = "getMessageById", method = {RequestMethod.GET})
-    public ResultContent<OperationMessageResultModel> getMessageById(
-            @Parameter(name = "id", description = "数据ID", example = "")
-            @RequestParam("id") String id) {
-        return operationMessageService.getMessageById(id);
+    @RequestMapping(value = "getMessageById", method = {RequestMethod.POST})
+    public ResultContent<OperationMessageResultModel> getMessageById(@RequestBody IDParam param) {
+        return operationMessageService.getMessageById(param.getId());
+    }
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除消息信息")
+    @RequestMapping(value = "deleteMessage", method = {RequestMethod.POST})
+    public ResultContent<OperationMessageResultModel> deleteMessage(@RequestBody IDParam param) {
+        return operationMessageService.deleteResultMessage(param.getId());
     }
 
 

+ 9 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/artemis/OperationMessageService.java

@@ -648,6 +648,15 @@ public class OperationMessageService {
         return ResultContent.buildSuccess(model);
     }
 
+    public ResultContent deleteResultMessage(String id) {
+        OperationMessageResult messageResult = operationMessageResultDao.findTopById(id);
+        if (ObjectUtils.isEmpty(messageResult)) {
+            return ResultContent.buildFail(String.format("数据ID不存在:%s", id));
+        }
+        operationMessageResultDao.delete(messageResult);
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 标记消息已收到
      *