From 326334dbf5de8eeb09cdf8dd7a4511ab821e12ff Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 10 五月 2022 18:23:41 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java | 24 +++++++++++++++++++-----
1 files changed, 19 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..c5509c0 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,12 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.service.impl.BaseServiceImpl;
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.mapper.InterphoneHostMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -15,6 +19,8 @@
public class InterphoneHostService extends BaseServiceImpl<InterphoneHostMapper, InterphoneHost> {
private final InterphoneHostMapper interphoneHostMapper;
+
+ private final InterphoneHostSubService interphoneHostSubService;
/**
@@ -48,6 +54,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 RuntimeException("璇ヤ富鏈哄瓨鍦ㄧ粦瀹氬叧绯伙紝涓嶈兘鍒犻櫎");
+ }
if (byId == null) {
return false;
}
@@ -71,10 +82,13 @@
/**
* 鏌ヨ涓绘満鍒楄〃
*/
- public List<InterphoneHost> getHostList() {
- List<InterphoneHost> list = list();//TODO
- return list();
+ public List<InterphoneHostBo> getInterphoneHostList(String keyword) {
+ 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