Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

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

@@ -51,9 +51,10 @@
      System.out.println(content.toString());

   }
   public static InterfaceLogService interfaceLogService = null;
   private static void saveInterfaceLog(String s, String result,Map<String, String> path) {
      InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
      if(bean !=null){
//      InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
      if(interfaceLogService !=null){
         InterfaceLog hkMonitoryLogDO=new InterfaceLog();
         hkMonitoryLogDO.setType(0);
         hkMonitoryLogDO.setCreateDate(new Date());
@@ -62,7 +63,7 @@
         hkMonitoryLogDO.setRepose(result);
         hkMonitoryLogDO.setName(path.get(HKConstants.https));
         hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
         bean.create(hkMonitoryLogDO);
         interfaceLogService.create(hkMonitoryLogDO);
      }
   }

@@ -467,12 +468,23 @@
      return  result;
   }
   /**
    *   查询一卡通权限下载任务进度
    *   查询一卡通权限查询设备通道的人员权限下载详情总数v2
    * @param body
    * @return
    */
   public static String taskProgress(String body) {
      Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgress);
      String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
      saveInterfaceLog(body,result,path);
      return  result;
   }
   /**
    *   查询一卡通权限下载任务进度
    * @param body
    * @return
    */
   public static String taskProgressNum(String body) {
      Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgressNum);
      String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post请求application/json类型参数
      saveInterfaceLog(body,result,path);
      return  result;
@@ -499,8 +511,18 @@
      saveInterfaceLog(body,result,path);
      return  result;
   }



   /**
    * 查询权限条目列表
    * @param body
    * @return
    */
   public static String authItemList(String body) {
      Map<String, String> path = getPath(HKConstants.InterfacePath.authItemList);
      Map<String, String> header = new HashMap<>();
      header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
      String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post请求application/json类型参数
      saveInterfaceLog(body,result,path);
      return  result;
   }

}