XMPoleManager.git

			@@ -397,7 +397,7 @@
			throw new BusinessException("播放时间需大于零且小于86400000 !");
			}
			VnnoxResult vnnoxResult = poleService.pushAirDataToNova(param);
			if (vnnoxResult == null && vnnoxResult.getSuccess() != null && vnnoxResult.getSuccess().size() != 0) {
			if (vnnoxResult != null && vnnoxResult.getSuccess() != null && !vnnoxResult.getSuccess().isEmpty()) {
			return ResponseUtil.success("推送成功");
			} else {
			return ResponseUtil.fail("推送失败");

			@@ -103,7 +103,7 @@
			}


			LambdaQueryWrapper<PoleBinding> eq = Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId);
			LambdaQueryWrapper<PoleBinding> eq = Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceType, param.getDeviceType()).eq(PoleBinding::getPoleId, poleId);
			List<PoleBinding> list = list(eq);
			if (list.size() != 0) {
			for (PoleBinding poleBinding : list) {
			@@ -114,7 +114,8 @@
			}
			}

			PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, param.getDeviceCode()));
			PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, param.getDeviceCode())
			.eq(PoleBinding::getDeviceType, param.getDeviceType()));
			if (one == null) {
			//充电桩保存绑定关系需要先判断是不是正确的灯杆
			if (deviceType == 2) {
			@@ -189,7 +190,6 @@
			throw new BusinessException("设备不存在绑定情况或灯杆ID不正确");
			}
			}



			/**

	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史