From ed8c5ee6ccdd7d56c4ec300e79eaecb9f0aac6b7 Mon Sep 17 00:00:00 2001
From: zhaoxianglong <you@example.com>
Date: Wed, 22 May 2024 16:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=AE=A1=E6=8E=A7=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcDeviceController.java        | 41 ++++++++++++++++++-
 .../NonAutomaticWarningController.java        |  2 +-
 .../service/impl/DcOperLogServiceImpl.java    | 31 +++++++-------
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
index d51047ce..bf72978f 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@@ -577,14 +577,14 @@ public class DcDeviceController extends BaseController {
     }
 
     /**
-     * 查询物联设备事件数据
+     * 查询物联设备指定事件数据
      *
      * @param deviceId   物联设备id
      * @param eventId    事件id
      * @param queryParam 查询条件
      * @return 查询事件结果
      */
-    @ApiOperation("查询事件历史数据列表")
+    @ApiOperation("查询指定事件历史数据列表")
     @GetMapping("/events/history/{deviceId}/{eventId}")
     public AjaxResult queryPagerDeviceEvents(
             @PathVariable @Parameter(description = "设备ID") String deviceId,
@@ -608,6 +608,43 @@ public class DcDeviceController extends BaseController {
         return JSON.parseObject(response.body().string(), AjaxResult.class);
     }
 
+
+    /**
+     * 查询物联设备指定事件数据
+     *
+     * @param deviceId   物联设备id
+     * @param type    类型
+     * @param queryParam 查询条件
+     * @return 查询事件结果
+     */
+    @ApiOperation("查询指定事件历史数据列表")
+    @GetMapping("/events/history/{deviceId}/type/{type}")
+    public AjaxResult listPagerDeviceEvents(
+            @PathVariable @Parameter(description = "设备ID") String deviceId,
+            @PathVariable @Parameter(description = "事件ID") String type,
+            @Parameter(hidden = true) HashMap<String, Object> queryParam
+    ) throws HttpException, IOException {
+
+        if (!StringUtils.hasText(deviceId) || !StringUtils.hasText(type)) {
+            return AjaxResult.error("设备未接入");
+        }
+        if (type.equals("all")){
+
+            OkHttp okHttp = new OkHttp();
+
+            RequestParams requestParams = new RequestParams(queryParam);
+
+            Response response // 请求响应
+                    = okHttp
+                    .url(iotAddress + "/api/iot/device/logs/"+deviceId) // 请求地址
+                    .data(requestParams)
+                    .get(); // 请求方法
+            return JSON.parseObject(response.body().string(), AjaxResult.class);
+        }else {
+            return queryPagerDeviceEvents(deviceId, type, queryParam);
+        }
+    }
+
     /**
      * 获取物联设备物模型
      *
diff --git a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
index 69a29eda..3b1ee9bc 100644
--- a/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
@@ -52,7 +52,7 @@ public class NonAutomaticWarningController extends BaseController {
     @Autowired
     private ISysConfigService configService;
 
-    /*
+    /*millimeterWaveRadar
      * 调用功能
      * */
     @ApiOperation("事件订阅")
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java
index a7ca7493..dcd70a49 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java
@@ -69,24 +69,25 @@ public class DcOperLogServiceImpl extends ServiceImpl<DcOperLogMapper, DcOperLog
         if (endTime != null && startTime != null) {
             lambdaQueryWrapper.between(DcOperLog::getOperTime, startTime, endTime);
         }
-        if (dcOperLog.getStatus()!=null){
+        if (dcOperLog.getStatus() != null) {
             lambdaQueryWrapper.eq(DcOperLog::getStatus, dcOperLog.getStatus());
         }
         lambdaQueryWrapper.select(
-                DcOperLog::getId,
-                DcOperLog::getDcDeviceId,
-                DcOperLog::getDcDeviceType,
-                DcOperLog::getDcDeviceName,
-                DcOperLog::getDcDeviceType,
-                DcOperLog::getOperName,
-                DcOperLog::getDeptName,
-                DcOperLog::getOperType,
-                DcOperLog::getOperIp,
-                DcOperLog::getOperLocation,
-                DcOperLog::getOperParam,
-                DcOperLog::getJsonResult,
-                DcOperLog::getStatus,
-                DcOperLog::getOperTime)
+                        DcOperLog::getId,
+                        DcOperLog::getDcDeviceId,
+                        DcOperLog::getDcDeviceType,
+                        DcOperLog::getDcDeviceName,
+                        DcOperLog::getDcDeviceType,
+                        DcOperLog::getOperName,
+                        DcOperLog::getDeptName,
+                        DcOperLog::getOperType,
+                        DcOperLog::getOperIp,
+                        DcOperLog::getOperLocation,
+                        DcOperLog::getOperParam,
+                        DcOperLog::getJsonResult,
+                        DcOperLog::getStatus,
+                        DcOperLog::getOperTime,
+                        DcOperLog::getRemark)
                 .orderByDesc(DcOperLog::getOperTime);
         return lambdaQueryWrapper;
     }