From 962880644910355f05a86d670e7c52c0dd3af685 Mon Sep 17 00:00:00 2001 From: lijunjie Date: Fri, 3 Feb 2023 11:29:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=91=BD=E4=BB=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/OnenetEquipController.java | 9 +++ .../ruoyi/web/domain/dto/OnenetEquipDto.java | 9 +++ .../web/service/IOnenetEquipService.java | 8 ++ .../service/impl/OnenetEquipServiceImpl.java | 65 +++++++++++++-- ruoyi-ui/src/api/device/equips.js | 9 +++ ruoyi-ui/src/views/device/equips/index.vue | 80 ++++++++++++++++++- 6 files changed, 170 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/OnenetEquipController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/OnenetEquipController.java index 71f78e6..c224cfa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/OnenetEquipController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/OnenetEquipController.java @@ -96,6 +96,15 @@ public class OnenetEquipController extends BaseController return success(onenetEquipService.writeCommand(InsertDto)); } + /** + * 缓存命令记录 + */ + @PostMapping("/commandHistory") + public AjaxResult commandHistory(@RequestBody OnenetEquipDto.HistoryDto HistoryDto) + { + return success(onenetEquipService.commandHistory(HistoryDto)); + } + /** * 查询设备数据 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/dto/OnenetEquipDto.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/dto/OnenetEquipDto.java index 73fc26f..52fccbe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/dto/OnenetEquipDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/dto/OnenetEquipDto.java @@ -36,6 +36,15 @@ public class OnenetEquipDto { private String command; } + @ApiModel("OnenetEquipDto - HistoryDto") + @Data + public static class HistoryDto{ + @ApiModelProperty("") + private String imei; + @ApiModelProperty("时间") + private String[] historyTime; + } + @ApiModel("OnenetEquipDto - QureyEquipParam") @Data public static class QureyEquipParam{ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/IOnenetEquipService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/IOnenetEquipService.java index af6ee90..a52f57d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/IOnenetEquipService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/IOnenetEquipService.java @@ -36,6 +36,14 @@ public interface IOnenetEquipService */ public boolean writeCommand(OnenetEquipDto.InsertDto InsertDto); + /** + * 缓存命令记录 + * @param HistoryDto + * @return + */ + public String commandHistory(OnenetEquipDto.HistoryDto HistoryDto); + + /** * 查询设备数据 * @param equipDataParam diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/OnenetEquipServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/OnenetEquipServiceImpl.java index 27d1886..578731a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/OnenetEquipServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/OnenetEquipServiceImpl.java @@ -160,10 +160,61 @@ public class OnenetEquipServiceImpl implements IOnenetEquipService { } } - return false; } + /** + * 缓存命令记录 + * @param HistoryDto + * @return + */ + @Override + public String commandHistory(OnenetEquipDto.HistoryDto HistoryDto) { + if (StrUtil.hasEmpty(HistoryDto.getImei())){ + return null; + } + + OnenetConfig onenetConfigExample = new OnenetConfig(); + onenetConfigExample.setConfigKey("onenet_api_key"); + + List onenetConfigs = onenetConfigMapper.selectOnenetConfigList(onenetConfigExample); + List list = new ArrayList<>(); + if (onenetConfigs.size() > 0) { + HashMap paramMap = new HashMap<>(); + paramMap.put("imei", HistoryDto.getImei()); + + if (!StrUtil.hasEmpty(HistoryDto.getHistoryTime())){ + + paramMap.put("start", HistoryDto.getHistoryTime()[0]); + paramMap.put("end", HistoryDto.getHistoryTime()[1]); + } + + if (paramMap.get("start") == null){ + DateTime yesterday = DateUtil.yesterday(); + + paramMap.put("start", DateUtil.format(yesterday, "yyyy-MM-dd'T'HH:mm:ss")); +// paramMap.put("start", "2023-02-02T10:45:10"); + } + + String url = "http://api.heclouds.com/nbiot/offline/history"; + + OnenetConfig onenetConfig = onenetConfigs.get(0); + + String response = HttpRequest.get(url).header("api-key", onenetConfig.getConfigValue()).form(paramMap).execute().body(); + + JSONObject responseJson = JSON.parseObject(response); + + Integer errno = responseJson.getObject("errno", Integer.class); + if (errno == 0) { + String dataJson = responseJson.getString("data"); + + return dataJson; + } + } + + return null; + } + /** * 查询设备数据 * @param equipDataParam @@ -191,13 +242,13 @@ public class OnenetEquipServiceImpl implements IOnenetEquipService { OnenetConfig onenetConfig = onenetConfigs.get(0); -// String response = HttpRequest.get(url).header("api-key", onenetConfig.getConfigValue()).form(paramMap).execute().body(); + String response = HttpRequest.get(url).header("api-key", onenetConfig.getConfigValue()).form(paramMap).execute().body(); - String response = "{\"errno\":0,\"data\":{\"count\":1,\"datastreams\":[{\"datapoints\":[" + - "{\"at\":\"2023-01-09 17:47:15.969\",\"value\":\"68C00866472059908495852F015100FFFE0A6464220901002310010014731641646400000065014E000000000000182301091747150503000002015116\"}, " + - "{\"at\":\"2023-01-09 17:47:15.969\",\"value\":\"68C00866472059908495852F015100FFFE0A6464220901002310010014731641646400000065014E000000000000182301091747150503000002015116\"}, " + - "{\"at\":\"2023-01-09 17:47:15.969\",\"value\":\"68C00866472059908495852F015100FFFE0A6464220901002310010014731641646400000065014E000000000000182301091747150503000002015116\"}" + - "],\"id\":\"3200_0_5750\"}]},\"error\":\"succ\"}"; +// String response = "{\"errno\":0,\"data\":{\"count\":1,\"datastreams\":[{\"datapoints\":[" + +// "{\"at\":\"2023-01-09 17:47:15.969\",\"value\":\"68C00866472059908495852F015100FFFE0A6464220901002310010014731641646400000065014E000000000000182301091747150503000002015116\"}, " + +// "{\"at\":\"2023-01-09 17:47:15.969\",\"value\":\"68C00866472059908495852F015100FFFE0A6464220901002310010014731641646400000065014E000000000000182301091747150503000002015116\"}, " + +// "{\"at\":\"2023-01-09 17:47:15.969\",\"value\":\"68C00866472059908495852F015100FFFE0A6464220901002310010014731641646400000065014E000000000000182301091747150503000002015116\"}" + +// "],\"id\":\"3200_0_5750\"}]},\"error\":\"succ\"}"; JSONObject responseJson = JSON.parseObject(response); diff --git a/ruoyi-ui/src/api/device/equips.js b/ruoyi-ui/src/api/device/equips.js index 06885cb..87eb96d 100644 --- a/ruoyi-ui/src/api/device/equips.js +++ b/ruoyi-ui/src/api/device/equips.js @@ -26,6 +26,15 @@ export function listEquipDatas(query) { }) } +// 缓存命令记录 +export function listHistorys(query) { + return request({ + url: '/device/equip/commandHistory', + method: 'post', + data: query + }) +} + // 查询推送记录 export function listReceiveDatas(query) { return request({ diff --git a/ruoyi-ui/src/views/device/equips/index.vue b/ruoyi-ui/src/views/device/equips/index.vue index 343d89e..23c470b 100644 --- a/ruoyi-ui/src/views/device/equips/index.vue +++ b/ruoyi-ui/src/views/device/equips/index.vue @@ -30,7 +30,7 @@ - + + + + +