From c386374de5ff4a65904124ef839e6862518d27fa Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期三, 16 四月 2025 09:12:30 +0800
Subject: [PATCH] v2.0.2，更新时间4.16
---
src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java
index 813531d..c5b84df 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbAlarmsystemServiceImpl.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hxzkmonitor.mapper.TbCompanyMapper;
+import com.hxzkmonitor.mapper.TbGuangboMapper;
import com.hxzkmonitor.mapper.TbUserMapper;
-import com.hxzkmonitor.pojo.TbAlarmsystem;
+import com.hxzkmonitor.pojo.*;
import com.hxzkmonitor.mapper.TbAlarmsystemMapper;
import com.hxzkmonitor.pojo.TbAlarmsystem;
-import com.hxzkmonitor.pojo.TbCompany;
-import com.hxzkmonitor.pojo.TbUser;
import com.hxzkmonitor.service.TbAlarmsystemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -34,6 +33,9 @@
public class TbAlarmsystemServiceImpl extends ServiceImpl<TbAlarmsystemMapper, TbAlarmsystem> implements TbAlarmsystemService {
private final TbCompanyMapper tbCompanyMapper;
private final TbUserMapper tbUserMapper;
+
+ private final TbGuangboMapper tbGuangboMapper;
+
@Override
public IPage<TbAlarmsystem> searchAlarmsystem(Page page, String keyword,String username) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
@@ -113,11 +115,20 @@
@Override
public Integer addorupAlarmsystem(TbAlarmsystem tbAlarmsystem) {
- if (tbAlarmsystem.getId() != null) {
- return baseMapper.updateById(tbAlarmsystem);
- } else {
- return baseMapper.insert(tbAlarmsystem);
+
+ if (tbAlarmsystem.getId() != null) {
+ return baseMapper.updateById(tbAlarmsystem);
+ } else {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tagid", tbAlarmsystem.getTagid());
+ baseMapper.selectList(queryWrapper);
+ if ( baseMapper.selectList(queryWrapper).size()>0){
+ return -1;
+ }else{
+ return baseMapper.insert(tbAlarmsystem);
+ }
}
+
}
@Override
@@ -133,6 +144,14 @@
queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("tagid",userPage.getRecords().get(i).getGuangboid());
+ TbGuangbo tbGuangbo = tbGuangboMapper.selectOne(queryWrapper2);
+ if (tbGuangbo!=null){
+ userPage.getRecords().get(i).setGuangboname(tbGuangbo.getName());
+ }
+
}
return userPage;
}else{
@@ -144,6 +163,15 @@
queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("tagid",userPage.getRecords().get(i).getGuangboid());
+ TbGuangbo tbGuangbo = tbGuangboMapper.selectOne(queryWrapper2);
+ if (tbGuangbo!=null){
+ userPage.getRecords().get(i).setGuangboname(tbGuangbo.getName());
+ }
+
+// guangboname
}
return userPage;
}
--
Gitblit v1.9.3