From 28bf6e5a47b7235d829b5f1021cfbec1cb1811d6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 03 八月 2022 16:29:38 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index d50db30..ded784c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -14,7 +14,6 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.DeviceStatus;
-import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
@@ -25,14 +24,18 @@
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.*;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.DeviceStateEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
-import com.sandu.ximon.admin.param.*;
+import com.sandu.ximon.admin.param.PoleBindingParam;
+import com.sandu.ximon.admin.param.PoleParam;
+import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
-import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.vo.PoleBindVO;
@@ -71,6 +74,7 @@
BeanUtils.copyProperties(param, pole);
pole.setPoleCode(generatePoleCode());
pole.setDeviceType(-1);
+ pole.setCentre(1);
boolean save = save(pole);
/**
@@ -99,6 +103,9 @@
Pole update = new Pole();
BeanUtils.copyProperties(param, update);
update.setId(poleId);
+ if (param.getIsCenter() != null) {
+ update.setCentre(param.getIsCenter());
+ }
/**
* 淇敼鐏潌鏃ュ織璁板綍寮�濮�
*/
@@ -257,12 +264,19 @@
List<Pole> poleList;
if (SecurityUtils.getClientId() == null) {
poleList = poleMapper.queryPoleOnLineStatesList(null, param.getIsTrue(),
- param.getBingStates(), param.getGroupid(), param.getKeyword(), orderBy);
+ param.getBingStates(), param.getGroupid(), param.getKeyword(), param.getCenter(), orderBy);
} else {
poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(),
- param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword(), orderBy);
+ param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword(), param.getCenter(), orderBy);
}
+ poleList.forEach(
+ centre -> {
+ if (centre.getCentre() == 0) {
+ centre.setCenter(true);
+ }
+ }
+ );
List<Pole> PoleResult = isOnLine(poleList, param);
setCount(PoleResult);
--
Gitblit v1.9.3