From 0143b00ead241cc2b894745eff9d8ed5493b0b68 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 16:19:04 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 130 +++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 72 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 d591e72..9a6d314 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.DeviceStatus;
@@ -60,6 +61,7 @@
private final RedisService redisService;
private final PoleBindingService poleBindingService;
private final PoleGroupRelationService groupRelationService;
+ private final ClientService clientService;
public boolean addPole(PoleParam param) {
Pole pole = new Pole();
@@ -111,9 +113,6 @@
public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
- // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
- //List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
-// PageHelper.startPage(pageNo, pageSize);
List<Pole> list = new ArrayList<>();
LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
if (SecurityUtils.getClientId() == null) {
@@ -130,12 +129,6 @@
}
list = list(wrapper);
- List<Pole> bindList = new ArrayList<>();//宸茬粦瀹氬鎴�
- List<Pole> unbindList = new ArrayList<>();//鏈粦瀹氬鎴�
- List<Pole> isTrue = new ArrayList<>();//瀹炰綋鐏潌
- List<Pole> isFalse = new ArrayList<>();//铏氭嫙鐏潌
- List<Pole> online = new ArrayList<>();//鍦ㄧ嚎
- List<Pole> offline = new ArrayList<>();//绂荤嚎
if (param.getGroupid() != null) {
// List<Long> poleIds = new ArrayList<>();
List<Pole> pole = new ArrayList<>();
@@ -147,10 +140,6 @@
);
list = pole;
}
-
-// List<Pole> bind = isBind(list, param);
-// List<Pole> aTrue = isTrue(list, param);
-// List<Pole> onLine = isOnLine(list, param);
if (param.getBingStates() != 2) {//鏄惁缁戝畾
list = isBind(list, param);// 缁戝畾/鏈粦瀹�
@@ -177,64 +166,6 @@
}
}
-
-// list.forEach(bindwarpper -> {
-//// Long clientId = bindwarpper.getClientId();
-// if (bindwarpper.getClientId() == null) {//鍒ゆ柇鏄惁缁戝畾
-// unbindList.add(bindwarpper);
-// if (bindwarpper.getDeviceCode() == null) {//鍒ゆ柇鐏潌绫诲瀷
-// isFalse.add(bindwarpper);
-// } else {
-// isTrue.add(bindwarpper);
-// }
-// } else {
-// bindList.add(bindwarpper);
-// if (bindwarpper.getDeviceCode() == null) {
-// isFalse.add(bindwarpper);
-// } else {
-// isTrue.add(bindwarpper);
-// }
-// }
-// });
-// if (param.getBingStates() == 1) { //鏈粦瀹�
-// list = unbindList;
-// } else if (param.getBingStates() == 0) {//宸茬粦瀹�
-// list = bindList;
-// }// else {//鍏ㄩ儴
-//// list = list(wrapper);
-//// }
-//
-// if (param.getIsTrue() == 1) { //铏氭嫙鐏潌
-// list = isFalse;
-// } else if (param.getIsTrue() == 0) {//瀹炰綋鐏潌
-// setOnline(list);
-// list = isTrue;
-// list.forEach(onLinePole -> {
-// System.out.println("online---------------------------------------------------"+("ONLINE").equals(onLinePole.getOnLineState()));
-// System.out.println("online---------------------------------------------------"+(onLinePole.getOnLineState()));
-// if (("ONLINE").equals(onLinePole.getOnLineState())) {
-// online.add(onLinePole);
-// } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
-// offline.add(onLinePole);
-// }
-// });
-// } else {//鍏ㄩ儴
-// setOnline(list);
-// list.forEach(onLinePole -> {
-// // System.out.println("online-----------------------"+onLinePole.getOnLineState());
-// if (("ONLINE").equals(onLinePole.getOnLineState())) {
-// online.add(onLinePole);
-// } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
-// offline.add(onLinePole);
-// }
-// });
-// }
-//
-// if (param.getOnLineStates() == 1) { //绂荤嚎
-// list = offline;
-// } else if (param.getOnLineStates() == 0) {//鍦ㄧ嚎
-// list = online;
-// }
setCount(list);
return list;
}
@@ -639,7 +570,10 @@
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦�");
}
- pole.setClientId(clientId);
+ pole.setUserId(clientId);
+ if(!clientService.findClientId(clientId)){
+ pole.setClientId(clientService.getClientId(clientId));
+ }
r = updateById(pole);
if (!r) {
@@ -649,4 +583,56 @@
}
return r;
}
+
+
+ public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword,Long cilentId) {
+ LambdaQueryWrapper<Pole> eq;
+// if(SecurityUtils.getClientId()!=null){
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if(clientService.findClientId(cilentId)){
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
+ }else{
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
+ .or(
+ pole->{
+ pole.eq(Pole::getUserId, cilentId);
+ }
+ );
+ }
+
+// }else {
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+// eq = Wrappers.lambdaQuery(Pole.class);
+// }
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (!keyword.isEmpty()){
+ eq.like(Pole::getPoleName,keyword).or(
+ code->{
+ code.like(Pole::getPoleCode,keyword);
+ }
+ ).or(
+ deviceCode->{
+ deviceCode.like(Pole::getDeviceCode,keyword);
+ }
+ );
+ }
+ List<Pole> list ;
+ list =list(eq);
+ setCount(list);
+ setOnline(list);
+ return list;
+ }
+
+
+ /**
+ * 鏍规嵁鐏潌id鏌ヨ鐏潌缁戝畾璁惧
+ */
+ public List<Pole> getBindByPoleId(Long poleId){
+ List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));
+
+ return list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId,poleId));
+ }
+
+
}
--
Gitblit v1.9.3