From bd959da23dfa97c60fee8c4818384e99d45fc879 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期四, 18 四月 2024 16:51:25 +0800
Subject: [PATCH] 版本：航锦化工 更新日志 1：聚集离开建筑后取消闪烁，2：聚集后产生大屏告警提示，聚集人员离开后大屏不显示告警提示，后台可查询到。
---
src/main/java/com/hxzk/service/impl/PersonServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java b/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java
index d6577fe..3b60998 100644
--- a/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java
+++ b/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java
@@ -1,6 +1,8 @@
package com.hxzk.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -8,10 +10,12 @@
import com.hxzk.mapper.PersonDao;
import com.hxzk.pojo.TbPerson;
import com.hxzk.pojo.TbTag;
+import com.hxzk.pojo.TbWarning;
import com.hxzk.service.PersonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
@Service
@@ -41,6 +45,13 @@
public PageInfo<com.hxzk.deo.TbPerson> findpersonSearch(Integer page, Integer limit, com.hxzk.deo.TbPerson person) {
PageHelper.startPage(page,limit);
List<com.hxzk.deo.TbPerson> cardList = personDao.findAllsearch(person);
+ PageInfo<com.hxzk.deo.TbPerson> info = new PageInfo<>(cardList);
+ return info;
+ }
+
+ @Override
+ public PageInfo<com.hxzk.deo.TbPerson> findpersonSearchDepart(com.hxzk.deo.TbPerson person) {
+ List<com.hxzk.deo.TbPerson> cardList = personDao.findAllsearchDepart(person);
PageInfo<com.hxzk.deo.TbPerson> info = new PageInfo<>(cardList);
return info;
}
@@ -84,9 +95,7 @@
@Override
public PageInfo<TbPerson> findAllRenYuan(Integer page, Integer limit) {
PageHelper.startPage(page,limit);
- QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("baoliu19", "铻嶅悎缁堢").or().eq("baoliu19", "绯荤粺榛樿");
- List<TbPerson> cardList = baseMapper.selectList(queryWrapper);
+ List<TbPerson> cardList = personDao.findPersonAll();
PageInfo<TbPerson> info = new PageInfo<>(cardList);
return info;
}
@@ -135,9 +144,15 @@
}
@Override
- public List<TbPersonAndDepartment> findSanWei() {
+ public List<TbPersonAndDepartment> findSanWeiOnline() {
QueryWrapper queryWrapper = new QueryWrapper<>();
return personDao.findAllBuMen2();
+ }
+
+ @Override
+ public List<TbPersonAndDepartment> findSanWeiOffOnline() {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ return personDao.findAllBuMen3();
}
@Override
@@ -157,6 +172,17 @@
@Override
public List<TbPersonAndDepartment> findfloor(String floor) {
return personDao.findAllBuMen1(floor);
+ }
+
+ @Override
+ public List<TbPerson> FindFidPersons(String[] FID) {
+ LambdaQueryWrapper<TbPerson> queryWrapper = Wrappers.lambdaQuery(TbPerson.class);
+ // 鏋勯�犳煡璇㈡潯浠�
+ queryWrapper.in(TbPerson::getBaoliu39, FID);
+
+ // 鏌ヨ鏁版嵁搴�
+ List<TbPerson> resultList = baseMapper.selectList(queryWrapper);
+ return resultList;
}
@Override
@@ -191,4 +217,22 @@
public TbPersonAndDepartment findOnePerson(TbPersonAndDepartment person) {
return personDao.findOnePerson(person);
}
+
+ @Override
+ public List<TbPerson> findSanWeiFloorPerson(String baoliu38) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("baoliu39",baoliu38);
+ queryWrapper.eq("p_online","1");
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<TbPerson> FindShowJianZhu() {
+ return personDao.FindShowJianZhu();
+ }
+
+ @Override
+ public List<TbPerson> FindShowJianZhuStop() {
+ return personDao.FindShowJianZhuStop();
+ }
}
--
Gitblit v1.9.3