Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java

@@ -84,10 +84,17 @@
    * @param url 视频预览url
    * @param cameraIndexCode 监控点唯一标识
    * @param protocol
    * @param transmode
    * @param expand
    * @return
    */
   public static String GetCameraPreviewURL(Integer type,String url, String cameraIndexCode, String protocol,String expand,Integer streamType) {
   public static String GetCameraPreviewURL(Integer type,
                                  String url,
                                  String cameraIndexCode,
                                  String protocol,
                                  Integer transmode,
                                  String expand,
                                  Integer streamType) {
      /**
       * 组装请求参数
       */
@@ -95,7 +102,7 @@
      jsonBody.put("cameraIndexCode", cameraIndexCode);
      jsonBody.put("streamType",streamType);
      jsonBody.put("protocol", protocol);
      jsonBody.put("transmode", 1);
      jsonBody.put("transmode", transmode);
      if (null!= expand && !expand.equals("")) {
         jsonBody.put("expand", expand);
      }
@@ -363,6 +370,26 @@
      return common(null==eventVO.getType()?1:eventVO.getType(),url, body);
   }

   /**
    * 调用水尺检测信息
    * @param type
    * @param url
    * @return
    */
   public static String getStaffGaugeMon(Integer type, String url) {
      /**
       * 组装请求参数
       */
      JSONObject jsonBody = new JSONObject();
      String body = jsonBody.toJSONString();

      /**
       * 调用接口并返回数据
       * post请求application/json类型参数;
       */
      return common(null==type?1:type,url, body);
   }

//   public static void main(String[] args) {
//
//      String previewURL = GetCameraPreviewURL(1, HkConstant.previewURLs,