Merge remote-tracking branch 'origin/master'

jiangping

2024-12-13 1110e717afecf1cc78950a5f054bfa0c1b159ae1

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

@@ -312,6 +312,17 @@
   public static String getTodoListPage(Map<String, String> body)  throws  Exception{
      return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
   }

   /**
    *消防看板-4温湿度数据
    * @param body
    * @return
    */
   public static String temperatureHumidityDataStatistic(String body) {
      return startDoPostStringArtemisAdmin(HKConstants.InterfacePath.temperatureHumidityDataStatistic,body);
   }


   /**
    *   获取门禁点列表
    * @param body
@@ -387,6 +398,17 @@
      saveInterfaceLog(body,result,path,pathStr[1]);
      return result;
   }


   public static String startDoPostStringArtemisAdmin(String[] pathStr,String body){
      Map<String, String> path = getPath(pathStr[0]);
      Map<String, String> header = new HashMap<>();
      header.put("userId", "admin");
      String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
      saveInterfaceLog(body,result,path,pathStr[1]);
      return result;
   }

   public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
      Map<String, String> path = getPath(pathStr[0]);
      Map<String, String> header = new HashMap<>();
@@ -409,15 +431,15 @@
      String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
      saveInterfaceLog(body,result,path,pathStr[1]);
      return result;

   }


   public static String startDoPostStringArtemis(String[] pathStr,Map<String, String> querys,Map<String, String> header,String body){
      Map<String, String> path = getPath(pathStr[0]);
      header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
      String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post请求application/json类型参数
      saveInterfaceLog(body,result,path,pathStr[1]);
      return result;

   }
   /**
    *   签离访客预约
@@ -832,6 +854,7 @@
   public static String findAlarmBaseDataStatistic(String body) {
      return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body);
   }

   /**
    *安防看板-- b
    * @param body