XMPoleManager.git

			@@ -97,7 +97,8 @@
			*/
			@PostMapping("/addYSYMonitor")
			public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
			YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
			// YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
			YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

			if ("200".equals(addMonitorDto.getCode())) {
			return ResponseUtil.success(addMonitorDto);
			@@ -143,7 +144,7 @@
			if ("200".equals(getMonitorDto.getCode())) {
			Monitor monitor = new Monitor();
			monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
			monitor.setDevicesCode(monitorParam.getValidateCode());
			// monitor.setDevicesCode(monitorParam.getValidateCode());
			monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
			monitor.setDeviceType(getMonitorDto.getData().getModel());
			monitor.setEquipmentState(getMonitorDto.getData().getStatus());
			@@ -172,7 +173,7 @@
			if ("200".equals(getMonitorDto.getCode())) {
			Monitor monitor = new Monitor();
			monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
			monitor.setDevicesCode(monitorParam.getValidateCode());
			// monitor.setDevicesCode(monitorParam.getValidateCode());
			monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
			monitor.setDeviceType(getMonitorDto.getData().getModel());
			monitor.setEquipmentState(getMonitorDto.getData().getStatus());

			@@ -24,7 +24,7 @@
			//设备序列号,存在英文字母的设备序列号，字母需为大写
			private String deviceSerial;
			//设备验证码，设备机身上的六位大写字母
			private String validateCode;
			// private String validateCode;
			/**
			* 结束萤石云摄像头相关参数
			*/

			@@ -107,14 +107,15 @@
			*
			* @param accessToken 授权过程获取的access_token
			* @param deviceSerial 设备序列号,存在英文字母的设备序列号，字母需为大写
			* @param validateCode 设备验证码，设备机身上的六位大写字母
			// * @param validateCode 设备验证码，设备机身上的六位大写字母
			*/
			public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
			// public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
			public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {

			Map<String, Object> paramMap = new HashMap<>();
			paramMap.put("accessToken", accessToken);
			paramMap.put("deviceSerial", deviceSerial);
			paramMap.put("validateCode", validateCode);
			// paramMap.put("validateCode", validateCode);
			String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
			System.out.println(s);
			YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);

	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/param/MonitorParam.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史