From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 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 2ae2533..1ab165d 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();
@@ -567,16 +569,29 @@
}
Pole pole = new Pole();
- String strh = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
- pole.setDeviceCode(strh);
- pole.setPoleName(strh);
- String strm = uniqueMac.substring(0, uniqueMac.length() - 2);
- int i = Integer.parseInt(strm);
- pole.setPoleCode(generatePoleCode());
- pole.setDeviceType(i);
- setMac = save(pole);
+ /* String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
+ String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
+ pole.setDeviceCode(uniqueMac);
+ pole.setPoleName(uniqueMac);
+ /* int i = Integer.parseInt(strm);*/
+ if("00".equals(a1DeviceMacRespInnerFrame.getType())){
+ pole.setDeviceType(0);
+ }else if("01".equals(a1DeviceMacRespInnerFrame.getType())){
+ pole.setDeviceType(1);
+ }
- return setMac;
+ pole.setPoleCode(generatePoleCode());
+ Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
+// setMac = save(pole);
+ if(one==null){
+ return save(pole);
+ }else {
+ pole.setId(one.getId());
+ return updateById(pole);
+ }
+
+
+
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
@@ -626,7 +641,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) {
@@ -636,4 +654,44 @@
}
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;
+ }
}
--
Gitblit v1.9.3