From 9a5883db73ff33bdec2aa026eb0229109762474f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 13 九月 2023 16:08:01 +0800
Subject: [PATCH] 设备健康列表
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 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 25a597c..b8c777e 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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.domain.entity.SysConfig;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.health.client.EquipmentsHealthClient;
import com.ruoyi.health.param.GetFMTrendParam;
import com.ruoyi.health.param.GetTrendParam;
@@ -70,7 +69,7 @@
}
@PreAuthorize("@ss.hasPermi('sy:syCar:getMeasureByEquipName')")
- @ApiOperation("鑾峰彇鏌愪釜娌逛簳娴嬬偣鍒楄〃")
+ @ApiOperation("鏍规嵁name鑾峰彇鏌愪釜娌逛簳娴嬬偣鍒楄〃")
@GetMapping("getMeasureByEquipName")
public Results getMeasureByEquipName(String equipNumber){
String url = configService.getHealth();
@@ -272,36 +271,51 @@
}
@PreAuthorize("@ss.hasPermi('sy:syCar:getMeasureByEquipKey')")
- @ApiOperation("鑾峰彇鏌愪釜娌逛簳娴嬬偣鍒楄〃")
+ @ApiOperation("鏍规嵁key鑾峰彇鏌愪釜娌逛簳娴嬬偣鍒楄〃")
@GetMapping("getMeasureByEquipKey")
- public Results getMeasureByEquipKey(GetFMTrendParam getFMTrendParam){
+ public Results getMeasureByEquipKey(String equipKey){
+ JSONObject j = new JSONObject();
String url = configService.getHealth();
-
- return Results.succeed();
+ //鑾峰彇璁惧鐨勬祴鐐瑰垪琛�
+ Map<String, Object> hashMap = new HashMap<String, Object>();
+ hashMap.put("EquipKey", equipKey);
+ String eResult = ARDSoapUtil.postSoapResult(url, "GetMeasureByEquipKey", hashMap);
+ if ("".equals(eResult)) {
+ //杩斿洖缁撴灉涓虹┖
+ return Results.succeed("娌℃湁娴嬬偣淇℃伅");
+ }
+ Map<String, Object> map1 = (Map<String, Object>) JSON.parse((String) eResult);
+ if ((int) map1.get("code") == 200) {
+ j.put("code", map1.get("code"));
+ List<Map<String, Object>> list = (List<Map<String, Object>>) JSON.parse((String) map1.get("resdata"));
+ j.put("listResult", list);
+ }
+ return Results.succeed(j);
}
@PreAuthorize("@ss.hasPermi('sy:syCar:GetPartsAlertLeve')")
@ApiOperation("鑾峰彇鐐�")
- @GetMapping("GetPartsAlertLeve")
- public Results GetPartsAlertLeve(){
+ @GetMapping("GetPartsAlertLevel")
+ public Results GetPartsAlertLevel(Integer id){
List<SysConfig> sysConfigs = configService.getAccPwd();
- String acc = null,pwd = null,hu = null;
+ 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())){
- hu = sysConfig.getConfigValue();
+ url = sysConfig.getConfigValue();
}
if("eqHealthAccount".equals(sysConfig.getConfigKey())){
- acc = sysConfig.getConfigValue();
+ account = sysConfig.getConfigValue();
}
if("eqHealthPassword".equals(sysConfig.getConfigKey())){
- pwd = sysConfig.getConfigValue();
+ password = sysConfig.getConfigValue();
}
}
- Map<String, Object> loginResult = EquipmentsHealthClient.getToken(hu, acc, pwd);
+ 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 = hu + "/RoadFlowApi/ZX/MeasureData/GetPartsAlertLeve";
- Map<String, Object> map = EquipmentsHealthClient.GetPartsAlertLeve(GetPartsAlertLeveUrl, 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