From 3945388625b6577a2574a88f109e314fe58dbe67 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 16:57:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
index 19ab541..a80a484 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
@@ -1,8 +1,17 @@
package com.sandu.ximon.admin.service;
+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.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.InterphoneHostParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.InterphoneHostBo;
import com.sandu.ximon.dao.domain.InterphoneHost;
+import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.InterphoneHostMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -15,6 +24,8 @@
public class InterphoneHostService extends BaseServiceImpl<InterphoneHostMapper, InterphoneHost> {
private final InterphoneHostMapper interphoneHostMapper;
+
+ private final InterphoneHostSubService interphoneHostSubService;
/**
@@ -34,6 +45,11 @@
if (byId == null) {
return false;
}
+
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getHostMac(), PoleBindingEnums.FOR_HELP);
+ if (!belong) {
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
InterphoneHost interphoneHost = new InterphoneHost();
interphoneHost.setHostId(id);
BeanUtils.copyProperties(interphoneHostParam, interphoneHost);
@@ -48,6 +64,11 @@
*/
public boolean deleteHost(Integer id) {
InterphoneHost byId = getById(id);
+
+ InterphoneHostSubPole one = interphoneHostSubService.getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class).eq(InterphoneHostSubPole::getHostId, id));
+ if (one != null) {
+ throw new BusinessException("璇ヤ富鏈哄瓨鍦ㄧ粦瀹氬叧绯伙紝涓嶈兘鍒犻櫎");
+ }
if (byId == null) {
return false;
}
@@ -71,10 +92,16 @@
/**
* 鏌ヨ涓绘満鍒楄〃
*/
- public List<InterphoneHost> getHostList() {
- List<InterphoneHost> list = list();//TODO
- return list();
+ public List<InterphoneHostBo> getInterphoneHostList(BaseConditionVO baseConditionVO, String keyword) {
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ List<InterphoneHostBo> list;
+ if (SecurityUtils.getClientId() == null) {
+ list = interphoneHostMapper.getInterphoneHostList(keyword, null);
+ } else {
+ list = interphoneHostMapper.getInterphoneHostList(keyword, SecurityUtils.getUserId());
+ }
+ return list;
}
-
-
}
--
Gitblit v1.9.3