From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
index 9002ac9..60a41e8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
@@ -13,8 +13,10 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
+import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.LightPoleHeelingMapper;
import lombok.AllArgsConstructor;
@@ -26,6 +28,7 @@
@AllArgsConstructor
public class LightPoleHeelingService extends BaseServiceImpl<LightPoleHeelingMapper, LightPoleHeeling> {
private LightPoleHeelingMapper lightPoleHeelingMapper;
+ private LightPoleHeelingEquipmentService lightPoleHeelingEquipmentService;
/**
* 妯＄硦鏌ヨ
@@ -41,10 +44,23 @@
lightPoleHeelingListParam.setKeyword(lightPoleHeelingListParam.getKeyword().trim());
}
- List<LightPoleHeeling> lightPoleHeelings
- = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword(), lightPoleHeelingListParam.getProcessingState());
+ List<LightPoleHeeling> lightPoleHeelings;
+ if (SecurityUtils.getClientId() == null) {
+ lightPoleHeelings = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword()
+ , lightPoleHeelingListParam.getProcessingState(), null);
+ } else {
+ lightPoleHeelings = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword()
+ , lightPoleHeelingListParam.getProcessingState(), SecurityUtils.getUserId());
+ }
return lightPoleHeelings;
+ }
+
+ /**
+ * 鏍规嵁Mac鑾峰彇鏈�鏂版暟鎹�
+ */
+ public LightPoleHeeling getLightPoleHeelingByMac(String mac) {
+ return getOne(Wrappers.lambdaQuery(LightPoleHeeling.class).eq(LightPoleHeeling::getMac, mac));
}
/**
@@ -200,6 +216,15 @@
} else {
lightPoleHeeling.setWarningLevel(0);//姝ｅ父
}
+ /**
+ * 灏嗙伅鏉嗗�炬枩纭欢娣诲姞鍒扮‖浠惰〃
+ */
+ LightPoleHeelingEquipment one = lightPoleHeelingEquipmentService.getOne(Wrappers.lambdaQuery(LightPoleHeelingEquipment.class).eq(LightPoleHeelingEquipment::getMac, deviceName));
+ if (one == null) {
+ LightPoleHeelingEquipment equipment = new LightPoleHeelingEquipment();
+ equipment.setMac(deviceName);
+ lightPoleHeelingEquipmentService.addLightPoleHeelingEquipment(equipment);
+ }
return save(lightPoleHeeling);
}
--
Gitblit v1.9.3