业务代码新增判断兼容算法返回数据错误

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 
 @Service
 public class CommonServiceImpl {
-    private static  final HashMap<String,Object> cacheExecInfo = new HashMap<>();
+    private static final HashMap<String, Object> cacheExecInfo = new HashMap<>();
     //utc时间格式
     public static final String FORMAT_UTC = "yyyy-MM-dd'T'HH:mm:ss'Z'";
     public static final String FORMAT_DEFAULT = "yyyy-MM-dd HH:mm:ss";
@@ -58,7 +58,7 @@ public class CommonServiceImpl {
     @Value("${gkblhf.key:input 1}")
     String gkqjhfkey;
     //----------------工况变量相关性计算请求属性配置------------------------
-    @Value("${gkxgxfxfan.url:b5797e0a-d456-44d3-9f21-9528e5321b74}")
+    @Value("${gkxgxfxfan.url:7e40b660-67d5-4678-886d-da125a3c4587}")
     String gkxgxfxurlfan;
     @Value("${gkxgxfxpv.url:3d583330-1b3c-4c7a-b904-9e94f3de9fc9}")
     String gkxgxfxurlpv;
@@ -990,14 +990,10 @@ public class CommonServiceImpl {
             HashMap<String, Object> realParams = new HashMap<>();
             realParams.put(gkzxzjskey1, values);
             String response = HttpUtil.createPost(baseUrl + jkzsjsfjurl).body(JSON.toJSONString(realParams)).execute().body();
-            logger.info("--------------------repsonse： "+response);
-            logger.info("------------------------------------------调用健康指数计算算法结束----------------------------------------");
             JSONObject result = JSON.parseObject(response).getJSONObject("result");
             if (null != result){
-                JSONArray jsonArray = result.getJSONObject("result1").getJSONArray("rows");
-                List<JSONObject> jsonObjects = jsonArray.toJavaList(JSONObject.class);
-                String s = JSON.toJSONString(result.getJSONObject("result1").getString("rows"));
-             //   List<JSONObject> jsonObjects = JSON.parseArray(s, JSONObject.class);
+                JSONObject jsonObject =result .getJSONObject("result1").getJSONObject("rows");
+                List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(jsonObject), JSONObject.class);
                 List<String> ids = new ArrayList<>();
                 jsonObjects.stream().forEach(e-> ids.add(e.getString("analysisVariableId")));
 
@@ -1009,11 +1005,10 @@ public class CommonServiceImpl {
                     for (JSONObject object : jsonObjects) {
                         if (obj.getSequenceNbr().equals(object.getString("analysisVariableId"))){
                             IdxBizFanHealthIndex idxBizFanHealthIndex = new IdxBizFanHealthIndex();
-                            BeanUtils.copyProperties(obj,idxBizFanHealthIndex);
+                            BeanUtils.copyProperties(idxBizFanHealthIndex,obj);
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
                             idxBizFanHealthIndex.setRecDate(new Date());
-                            idxBizFanHealthIndex.setSequenceNbr(null);
                             //获取健康指数对应等级
                             LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
                             query.eq(IdxBizFanHealthLevel::getAnalysisObjType,"设备");
@@ -1031,6 +1026,12 @@ public class CommonServiceImpl {
                 idxBizFanHealthIndexService.saveBatch(idxBizFanHealthIndexs);
                 }
 
+                try {
+                logger.info("--------------------repsonse： "+response);
+                logger.info("------------------------------------------调用健康指数计算算法结束----------------------------------------");
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
     }