From 46a35f95b4caddb52ec886ce0ee7d9f81fbf8bb6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 12:55:18 +0800
Subject: [PATCH] 修改电子围栏历史报警按alarm_time逆序返回数据
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index c3cdb5a..faf2331 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -2,7 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.core.domain.entity.SysConfig;
+import com.ruoyi.health.client.EquipmentsHealthClient;
import com.ruoyi.health.param.GetFMTrendParam;
import com.ruoyi.health.param.GetTrendParam;
import com.ruoyi.system.service.ISysConfigService;
@@ -277,4 +278,30 @@
return Results.succeed();
}
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:GetPartsAlertLeve')")
+ @ApiOperation("鑾峰彇鐐�")
+ @GetMapping("GetPartsAlertLevel")
+ public Results GetPartsAlertLevel(Integer id){
+ List<SysConfig> sysConfigs = configService.getAccPwd();
+ String account = null,password = null,url = null;
+ for (int i = 0; i < sysConfigs.size(); i++) {
+ SysConfig sysConfig = sysConfigs.get(i);
+ if("eqHealthUrl".equals(sysConfig.getConfigKey())){
+ url = sysConfig.getConfigValue();
+ }
+ if("eqHealthAccount".equals(sysConfig.getConfigKey())){
+ account = sysConfig.getConfigValue();
+ }
+ if("eqHealthPassword".equals(sysConfig.getConfigKey())){
+ password = sysConfig.getConfigValue();
+ }
+ }
+ String tokenUrl = url+"/RoadFlowApi/Home/ValidLogin";
+ Map<String, Object> loginResult = EquipmentsHealthClient.getToken(tokenUrl, account, password);
+ String token = (String) ((Map<String, Object>) ((Map<String, Object>) loginResult.get("data")).get("data")).get("token");
+ String GetPartsAlertLeveUrl = url + "/RoadFlowApi/ZX/MeasureData/GetPartsAlertLevel";
+ Map<String, Object> map = EquipmentsHealthClient.GetPartsAlertLeve(GetPartsAlertLeveUrl, token,id);
+ return Results.succeed(map);
+ }
}
--
Gitblit v1.9.3