~liusuyi/ruoyi-api.git

			@@ -458,7 +458,7 @@
			}

			/**
			* @描述获取分辨率
			* @描述获取通道压缩参数
			* @参数 [cameraId, channelNum]
			* @返回值 java.lang.String
			* @创建人刘苏义
			@@ -466,92 +466,150 @@
			* @修改人和其它信息
			*/
			@Override
			public String getVideoResolution(CameraCmd cmd) {
			public Map<String,String> getVideoCompressionCfg(CameraCmd cmd) {
			String cameraId = cmd.getCameraId();
			Integer channelNum = cmd.getChanNo();
			Integer chanNo = cmd.getChanNo();
			if (!GlobalVariable.loginMap.containsKey(cameraId)) {
			return " ";
			return null;
			}
			Integer userId = GlobalVariable.loginMap.get(cameraId);

			String ResResolution = "";
			NET_DVR_COMPRESSIONCFG_V30 resolution = new NET_DVR_COMPRESSIONCFG_V30();
			resolution.write();
			Pointer pioint = resolution.getPointer();
			Map<String,String> map=new HashMap<>();
			NET_DVR_COMPRESSIONCFG_V30 compressioncfg = new NET_DVR_COMPRESSIONCFG_V30();
			compressioncfg.write();
			Pointer pioint = compressioncfg.getPointer();
			IntByReference ibrBytesReturned = new IntByReference(0);
			try {
			boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, HCNetSDK.NET_DVR_GET_COMPRESSCFG_V30, channelNum, pioint, resolution.size(), ibrBytesReturned);
			boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, HCNetSDK.NET_DVR_GET_COMPRESSCFG_V30, chanNo, pioint, compressioncfg.size(), ibrBytesReturned);
			if (bool) {
			resolution.read();
			compressioncfg.read();
			//码流类型：0-视频流，1-复合流，0xfe- 自动（和源一致）
			String streamType="";
			switch(compressioncfg.struNormHighRecordPara.byStreamType)
			{
			case 0: streamType="视频流";break;
			case 1: streamType="复合流";break;
			default:streamType="未知";break;
			}
			//视频编码类型：0-私有264，1-标准h264，2-标准mpeg4，7-M-JPEG，8-MPEG2，9-SVAC，10-标准h265，0xfe- 自动（和源一致），0xff-无效
			String videoEncType="";
			switch (compressioncfg.struNormHighRecordPara.byVideoEncType)
			{
			case 0:videoEncType="私有264";break;
			case 1:videoEncType="标准h264";break;
			case 2:videoEncType="标准mpeg4";break;
			case 7:videoEncType="M-JPEG";break;
			case 8:videoEncType="MPEG2";break;
			case 9:videoEncType="SVAC";break;
			case 10:videoEncType="标准h265";break;
			default: videoEncType="未知";break;
			}
			//视频码率
			String videoBitrate="";
			switch (compressioncfg.struNormHighRecordPara.dwVideoBitrate)
			{
			case 0:videoBitrate="保留";break;
			case 1:videoBitrate="16K(保留)";break;
			case 2:videoBitrate="32K";break;
			case 3:videoBitrate="48k";break;
			case 4:videoBitrate="64k";break;
			case 5:videoBitrate="80k";break;
			case 6:videoBitrate="96k";break;
			case 7:videoBitrate="128k";break;
			case 8:videoBitrate="160k";break;
			case 9:videoBitrate="192k";break;
			case 10:videoBitrate="224k";break;
			case 11:videoBitrate="256K";break;
			case 12:videoBitrate="320K";break;
			case 13:videoBitrate="384K";break;
			case 14:videoBitrate="448K";break;
			case 15:videoBitrate="512K";break;
			case 16:videoBitrate="640K";break;
			case 17:videoBitrate="768K";break;
			case 18:videoBitrate="896K";break;
			case 19:videoBitrate="1024K";break;
			case 20:videoBitrate="1280K";break;
			case 21:videoBitrate="1536K";break;
			case 22:videoBitrate="1792K";break;
			case 23:videoBitrate="2048K";break;
			case 24:videoBitrate="3072K";break;
			case 25:videoBitrate="4096K";break;
			case 26:videoBitrate="8192K";break;
			case 27:videoBitrate="16384K";break;
			default:videoBitrate="其他";break;
			}
			//视频输出口分辨率：0- 1024x768，1- 1280x720，2-1280x1024，3- 1680x1050，4- 1920x1080，5- 3840*2160
			// byte byStreamType = resolution.struNormHighRecordPara.byStreamType;
			// int dwVideoBitrate = resolution.struNormHighRecordPara.dwVideoBitrate;
			int byResolution = resolution.struNormHighRecordPara.byResolution;
			switch (byResolution) {
			String resolution="";
			switch (compressioncfg.struNormHighRecordPara.byResolution) {
			case 0:
			ResResolution = "DCIF(528384/528320)";
			resolution = "DCIF(528384/528320)";
			break;
			case 1:
			ResResolution = "CIF(352288/352240)";
			resolution = "CIF(352288/352240)";
			break;
			case 2:
			ResResolution = "QCIF(176144/176120)";
			resolution = "QCIF(176144/176120)";
			break;
			case 3:
			ResResolution = "4CIF(704576/704480)";
			resolution = "4CIF(704576/704480)";
			break;
			case 4:
			ResResolution = "2CIF(704288/704240)";
			resolution = "2CIF(704288/704240)";
			break;
			case 6:
			ResResolution = "QVGA(320*240)";
			resolution = "QVGA(320*240)";
			break;
			case 7:
			ResResolution = "QQVGA(160*120)";
			resolution = "QQVGA(160*120)";
			break;
			case 16:
			ResResolution = "VGA(640*480)";
			resolution = "VGA(640*480)";
			break;
			case 17:
			ResResolution = "UXGA(1600*1200)";
			resolution = "UXGA(1600*1200)";
			break;
			case 18:
			ResResolution = "SVGA(800*600)";
			resolution = "SVGA(800*600)";
			break;
			case 19:
			ResResolution = "HD720P(1280*720)";
			resolution = "HD720P(1280*720)";
			break;
			case 20:
			ResResolution = "XVGA(1280*960)";
			resolution = "XVGA(1280*960)";
			break;
			case 21:
			ResResolution = "HD900P(1600*900)";
			resolution = "HD900P(1600*900)";
			break;
			case 22:
			ResResolution = "1360*1024";
			resolution = "1360*1024";
			break;
			case 23:
			ResResolution = "1536*1536";
			resolution = "1536*1536";
			break;
			case 24:
			ResResolution = "1920*1920";
			resolution = "1920*1920";
			break;
			case 27:
			ResResolution = "1920*1080p";
			resolution = "1920*1080p";
			break;
			case 28:
			ResResolution = "2560*1920";
			resolution = "2560*1920";
			break;
			case 29:
			ResResolution = "1600*304";
			resolution = "1600*304";
			break;
			case 30:
			ResResolution = "2048*1536";
			resolution = "2048*1536";
			break;
			default:
			ResResolution = "不在当前分辨率索引，请联系管理员添加";
			resolution = "不在当前分辨率索引，请联系管理员添加";
			break;
			}
			map.put("resolution",resolution);
			map.put("videoBitrate",videoBitrate);
			map.put("videoEncType",videoEncType);
			map.put("streamType",streamType);

			} else {
			int code = hCNetSDK.NET_DVR_GetLastError();
			log.error("控制失败,请稍后重试" + code);
			@@ -559,7 +617,7 @@
			} catch (Exception ex) {
			log.error(ex.getMessage());
			}
			return ResResolution;
			return map;
			}

			/**