aijinhui
2023-09-12 e2b395793db64ae9a118d786d6e28ffaeb667583
设备健康点位
已修改2个文件
29 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/health/client/EquipmentsHealthClient.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/health/client/EquipmentsHealthClient.java
@@ -87,7 +87,6 @@
        try {
            String message = responseBody.string();
            System.out.println("////////////");
            System.out.println(message);
            Map<String,Object> result = (Map<String, Object>) JSON.parse(message);
            return result;
@@ -98,13 +97,14 @@
        }
    }
    public static Map<String,Object> GetPartsAlertLeve(String url,String token){//获取单台油井信息和测点
    public static Map<String,Object> GetPartsAlertLeve(String url,String token,Integer id){
        OkHttpClient okHttpClient = new OkHttpClient();
        RequestBody formBody = new FormBody.Builder()
//        MediaType mediaType = MediaType.parse("application/json; charset=utf-8");
//        RequestBody formBody = RequestBody.create(mediaType, "");
        RequestBody formBody = new Builder()
                .add("equipId", String.valueOf(id))
                .build();
        Request request = new Request.Builder().url(url).post(formBody).addHeader("roadflow-token",token).build();
        Response response = null;
        try {
            response = okHttpClient.newCall(request).execute();
@@ -117,7 +117,6 @@
        try {
            String message = responseBody.string();
            System.out.println("////////////");
            System.out.println(message);
            Map<String,Object> result = (Map<String, Object>) JSON.parse(message);
            return result;
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;
@@ -283,25 +282,26 @@
    @PreAuthorize("@ss.hasPermi('sy:syCar:GetPartsAlertLeve')")
    @ApiOperation("获取点")
    @GetMapping("GetPartsAlertLeve")
    public Results GetPartsAlertLeve(){
    public Results GetPartsAlertLeve(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);
    }
}