Merge remote-tracking branch 'origin/master'

jiangping

2024-12-26 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -434,6 +434,12 @@
      saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
      return result;
   }
   public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> querys ,Map<String, String> header ){
      Map<String, String> path = getPath(pathStr[0]);
      String result = ArtemisHttpUtil.doGetArtemis(path, querys, null, null,  header);
      saveInterfaceLog(JSONObject.toJSONString(querys),result,path,pathStr[1]);
      return result;
   }
   public static String startDoGetStringArtemisJson(String[] pathStr,Map<String,String> body ){
      Map<String, String> path = getPath(pathStr[0]);
      Map<String, String> header = new HashMap<>();
@@ -891,12 +897,22 @@
      return startDoPostStringArtemis(HKConstants.InterfacePath.userOpenidSave,null,header,body);
   }
   /**
    *通过openId或userName等删除绑定信息
    * @param param
    * @return
    */
   public static String userOpenidDel(Map<String,String>  param) {
      Map<String,String> header = new HashMap<>();
      header.put("userId","admin");
      return startDoGetStringArtemis(HKConstants.InterfacePath.userOpenidDel,param,header);
   }
   /**
    *分页查询设备监测历史数据
    * @param body
    * @return
    */
   public static String minitorDataSearch(String body) {
      return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearch,body);
      return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearchV1,body);
   }
   /**
    * 统计园区总体的安防设备数量，在线数、在线率、离线数、离线率