From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index 922431b..83a33ec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -26,6 +26,7 @@
import org.springframework.context.ApplicationContext;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.io.File;
@@ -266,6 +267,7 @@
}
+ @Transactional(rollbackFor = Exception.class)
public void savePoleLightemit(PoleLightemitEntity poleLightemit) {
boolean save = this.save(poleLightemit);
// 缁戝畾鐏潌
@@ -273,9 +275,13 @@
if (save && poleLightemit.getStreetlightId() != null) {
PoleBindingParam poleBindingParam = new PoleBindingParam();
poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
- poleBindingParam.setDeviceType(1);
+ poleBindingParam.setDeviceType(10);
poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
- poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
+
+ if (SpringContextHolder.getBean(PoleService.class).getById(poleLightemit.getStreetlightId()) == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦�");
+ }
+ boolean b = poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
}
/**
@@ -335,7 +341,7 @@
public boolean deletePoleLightemit(List<Long> ledIds) {
List<PoleLightemitEntity> poleLightemitEntities = listByIds(ledIds);
- if (poleLightemitEntities != null && poleLightemitEntities.size() != 0) {
+ if (poleLightemitEntities != null && poleLightemitEntities.size() == 0) {
throw new BusinessException("璁惧涓嶅瓨鍦�");
}
--
Gitblit v1.9.3