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/TbEquipmentServiceImpl.java | 581 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 339 insertions(+), 242 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java
index 6bd7247..8510bca 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbEquipmentServiceImpl.java
@@ -8,6 +8,7 @@
import com.hxzkmonitor.service.TbEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hxzkmonitor.service.TbSystemService;
+import com.hxzkmonitor.util.DateUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wangfei
@@ -35,263 +36,265 @@
private final TbUserMapper tbUserMapper;
+ private final TbEvrydayweiyi2024Mapper tbEvrydayweiyi2024Mapper;
+
+ private final TbAlarmsystemMapper tbAlarmsystemMapper;
+
+
+
@Autowired
TbSystemService tbSystemService;
@Override
- public IPage<TbEquipment> searcheveryday(Page page,String keyword ,String username) {
+ public IPage<TbEquipment> searcheveryday(Page page, String keyword, String username) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
+ queryWrapperu.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",1);
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", 1);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",1);
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", 1);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",1);
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", 1);
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
- }else{
+ } else {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
}
-
-
}
@Override
- public IPage<TbEquipment> searchEquipment(Page page,String keyword,String type,String username) {
+ public IPage<TbEquipment> searchEquipment(Page page, String keyword, String type, String username) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
+ queryWrapperu.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",type);
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", type);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",type);
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", type);
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",type);
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", type);
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
- }else{
+ } else {
QueryWrapper<TbEquipment> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",keyword);
- queryWrapper.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper.eq("tagid", keyword);
+ queryWrapper.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("anchorname",keyword);
- queryWrapper2.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper2.eq("anchorname", keyword);
+ queryWrapper2.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
QueryWrapper<TbEquipment> queryWrapper3 = new QueryWrapper<>();
- queryWrapper3.eq("cid",keyword);
- queryWrapper3.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper3.eq("cid", keyword);
+ queryWrapper3.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
- List<TbEquipment> tagid1= baseMapper.selectList(queryWrapper);
+ List<TbEquipment> tagid1 = baseMapper.selectList(queryWrapper);
List<TbEquipment> anchorname1 = baseMapper.selectList(queryWrapper2);
- List<TbEquipment> cid1= baseMapper.selectList(queryWrapper3);
- if (tagid1.size()>0){
- IPage<TbEquipment> tagid= baseMapper.selectPage(page,queryWrapper);
+ List<TbEquipment> cid1 = baseMapper.selectList(queryWrapper3);
+ if (tagid1.size() > 0) {
+ IPage<TbEquipment> tagid = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < tagid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",tagid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", tagid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// tagid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return tagid;
- }else if (anchorname1.size()>0){
- IPage<TbEquipment> anchorname = baseMapper.selectPage(page,queryWrapper2);
+ } else if (anchorname1.size() > 0) {
+ IPage<TbEquipment> anchorname = baseMapper.selectPage(page, queryWrapper2);
for (int i = 0; i < anchorname.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",anchorname.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", anchorname.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// anchorname.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return anchorname;
- }else if (cid1.size()>0){
- IPage<TbEquipment> cid= baseMapper.selectPage(page,queryWrapper3);
+ } else if (cid1.size() > 0) {
+ IPage<TbEquipment> cid = baseMapper.selectPage(page, queryWrapper3);
for (int i = 0; i < cid.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",cid.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", cid.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// cid.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return cid;
- }else{
+ } else {
return null;
}
}
-
-
}
@@ -299,7 +302,7 @@
@Override
public TbEquipment delEquipment(Integer id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id",id);
+ queryWrapper.eq("id", id);
baseMapper.delete(queryWrapper);
return baseMapper.selectOne(queryWrapper);
}
@@ -309,16 +312,16 @@
Date date = new Date();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
tbEquipment.setAddtime(formatter.format(date));
- if (tbEquipment.getId()!=null){
+ if (tbEquipment.getId() != null) {
return baseMapper.updateById(tbEquipment);
- }else{
+ } else {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",tbEquipment.getType());
- queryWrapper.eq("tagid",tbEquipment.getTagid());
+ queryWrapper.eq("type", tbEquipment.getType());
+ queryWrapper.eq("tagid", tbEquipment.getTagid());
// baseMapper.selectOne(queryWrapper);
- if (baseMapper.selectList(queryWrapper).size()>0){
+ if (baseMapper.selectList(queryWrapper).size() > 0) {
return -1;
- }else{
+ } else {
return baseMapper.insert(tbEquipment);
}
@@ -326,37 +329,118 @@
}
@Override
- public IPage<TbEquipment> everyday(Page page,String username) {
+ public IPage<TbEquipment> everyday(Page page, String username) {
QueryWrapper queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapper2);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
+ queryWrapper2.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",1);
+ queryWrapper.eq("type", 1);
queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < userPage.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
+ userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+ }
+// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+ Calendar calendar = Calendar.getInstance();
+ String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
+// Calendar date = Calendar.getInstance();
+// String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+// Calendar calendar = Calendar.getInstance();
+ String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
+ int i1 = (Integer.parseInt(dated.split("-")[2]) - 1);
+ String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
+ System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
+ if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s) != null) {
+ userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
+ userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
+ userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
+ } else {
+ userPage.getRecords().get(i).setEd("0");
+ userPage.getRecords().get(i).setNd("0");
+ userPage.getRecords().get(i).setTd("0");
+ }
+
+ }
+
+ return userPage;
+ } else {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", 1);
+ queryWrapper.eq("companyid", tbUser.getCsname());
+ queryWrapper.orderByDesc("addtime");
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
+ for (int i = 0; i < userPage.getRecords().size(); i++) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
+ userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
+ }
+ Calendar calendar = Calendar.getInstance();
+ String datey = DateUtil.formatDate4(calendar.getTime(), "yyyy");
+// Calendar date = Calendar.getInstance();
+// String date1 = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
+ Date date = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+// Calendar calendar = Calendar.getInstance();
+ String dated = DateUtil.formatDate4(calendar.getTime(), "yyyy-MM-dd");
+ int i1 = (Integer.parseInt(dated.split("-")[2]) - 1);
+ String s = dated.split("-")[0] + "-" + dated.split("-")[1] + "-" + i1;
+ System.out.println(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s));
+ if (tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s)!=null){
+ userPage.getRecords().get(i).setEd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getEd());
+ userPage.getRecords().get(i).setNd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getNd());
+ userPage.getRecords().get(i).setTd(tbEvrydayweiyi2024Mapper.getweiyi(datey, userPage.getRecords().get(i).getTagid(), s).getTd());
+ }
+
+ }
+ return userPage;
+ }
+
+
+ }
+
+ @Override
+ public IPage<TbEquipment> getEquipmentPage(Page page, String type, String username) {
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("username", username);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapper2);
+ if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", type);
+ queryWrapper.orderByDesc("addtime");
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
+ for (int i = 0; i < userPage.getRecords().size(); i++) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
return userPage;
- }else{
+ } else {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",1);
- queryWrapper.eq("companyid",tbUser.getCsname());
+ queryWrapper.eq("type", type);
+ queryWrapper.eq("companyid", tbUser.getCsname());
queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
+ IPage<TbEquipment> userPage = baseMapper.selectPage(page, queryWrapper);
for (int i = 0; i < userPage.getRecords().size(); i++) {
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
+ queryWrapper1.eq("id", userPage.getRecords().get(i).getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ if (tbCompany != null) {
userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
}
// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
@@ -367,86 +451,44 @@
}
- @Override
- public IPage<TbEquipment> getEquipmentPage(Page page,String type,String username) {
- QueryWrapper queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.eq("username",username);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapper2);
- if (Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",type);
- queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
- for (int i = 0; i < userPage.getRecords().size(); i++) {
- QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
- userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
- }
-// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
-
- }
- return userPage;
- }else{
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",type);
- queryWrapper.eq("companyid",tbUser.getCsname());
- queryWrapper.orderByDesc("addtime");
- IPage<TbEquipment> userPage = baseMapper.selectPage(page,queryWrapper);
- for (int i = 0; i < userPage.getRecords().size(); i++) {
- QueryWrapper queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.eq("id",userPage.getRecords().get(i).getCompanyid());
- TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
- if (tbCompany!=null){
- userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
- }
-// userPage.getRecords().get(i).setCompany(tbCompany.getCompanyname());
- }
- return userPage;
- }
-
-
- }
-
@Override
- public Map<String,Object> getEquipment(Integer type,String username,String phone) {
+ public Map<String, Object> getEquipment(Integer type, String username, String phone) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
- queryWrapper.eq("type",'1');
+ queryWrapper.eq("type", '1');
queryWrapper.orderByDesc("addtime");
List<TbEquipment> monitorNum = baseMapper.selectList(queryWrapper);
QueryWrapper queryWrapper1 = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper1.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper1.eq("companyid", tbUser.getCsname());
}
- queryWrapper1.eq("type",'0');
+ queryWrapper1.eq("type", '0');
queryWrapper1.orderByDesc("addtime");
List<TbEquipment> standardNum = baseMapper.selectList(queryWrapper1);
QueryWrapper queryWrapper2 = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper2.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper2.eq("companyid", tbUser.getCsname());
}
- queryWrapper2.eq("onlie",'0');
+ queryWrapper2.eq("onlie", '0');
queryWrapper2.orderByDesc("addtime");
List<TbEquipment> offlineNum = baseMapper.selectList(queryWrapper2);
QueryWrapper queryWrapper3 = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper3.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper3.eq("companyid", tbUser.getCsname());
}
- queryWrapper3.eq("status","鏈鐞�");
+ queryWrapper3.eq("status", "鏈鐞�");
queryWrapper3.orderByDesc("alarmtime");
List<TbAlarmrecord> alarmNum = tbAlarmrecordMapper.selectList(queryWrapper3);
@@ -455,44 +497,71 @@
List<TbSystem> messageNum = tbSystemMapper.selectList(queryWrapper4);
List<TbSystem> list1 = tbSystemService.list();
- Map<String,Object> map = new HashMap<>();
- map.put("monitorNumList",monitorNum);
- map.put("monitorNum",monitorNum.size());
- map.put("standardNumList",standardNum);
- map.put("standardNum",standardNum.size());
- map.put("offlineNumList",offlineNum);
- map.put("offlineNum",offlineNum.size());
- map.put("alarmNumList",alarmNum);
- map.put("alarmNum",alarmNum.size());
- map.put("alerttime",list1.get(0).getAlerttime());
- map.put("messageNum",Integer.parseInt(messageNum.get(0).getDatanum()));
+ Map<String, Object> map = new HashMap<>();
+ map.put("monitorNumList", monitorNum);
+ map.put("monitorNum", monitorNum.size());
+ map.put("standardNumList", standardNum);
+ map.put("standardNum", standardNum.size());
+ map.put("offlineNumList", offlineNum);
+ map.put("offlineNum", offlineNum.size());
+ map.put("alarmNumList", alarmNum);
+ map.put("alarmNum", alarmNum.size());
+ map.put("alerttime", list1.get(0).getAlerttime());
+ map.put("messageNum", Integer.parseInt(messageNum.get(0).getDatanum()));
return map;
- }
- @Override
- public List<TbEquipment> getEquipmentmonitor(String username,String phone) {
- QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
- QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
- }
- queryWrapper.eq("type",1);
- return baseMapper.selectList(queryWrapper);
}
@Override
- public List<TbEquipment> getEquipmenttwo(String username,String phone) {
+ public List<TbEquipment> getEquipmentmonitor(String username, String phone) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
- queryWrapper.eq("type",1);
+ queryWrapper.eq("type", 1);
+ List<TbEquipment> tbEquipments = baseMapper.selectList(queryWrapper);
+ for (int i = 0; i < tbEquipments.size(); i++) {
+ QueryWrapper queryWrapperas = new QueryWrapper<>();
+ queryWrapperas.eq("tagid", tbEquipments.get(i).getTagid());
+ tbAlarmsystemMapper.selectOne(queryWrapperas);
+ String ed = "N";
+ String nd = "N";
+ String hd = "N";
+ if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv()!=null){
+ ed = tbAlarmsystemMapper.selectOne(queryWrapperas).getEdsv();
+ }
+ if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv()!=null){
+ nd = tbAlarmsystemMapper.selectOne(queryWrapperas).getNdsv();
+ }
+ if ( tbAlarmsystemMapper.selectOne(queryWrapperas)!=null && tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv()!=null){
+ hd = tbAlarmsystemMapper.selectOne(queryWrapperas).getHdsv();
+ }
+//if (tbEquipments.get(i).getEdmm()!=null){
+ tbEquipments.get(i).setEdmm(tbEquipments.get(i).getEdmm()+"/"+ed );
+ tbEquipments.get(i).setNdmm(tbEquipments.get(i).getNdmm()+"/"+ nd);
+ tbEquipments.get(i).setHdmm(tbEquipments.get(i).getHdmm()+"/"+hd );
+//}
+
+ }
+
+
+ return tbEquipments;
+ }
+
+ @Override
+ public List<TbEquipment> getEquipmenttwo(String username, String phone) {
+ QueryWrapper queryWrapperu = new QueryWrapper<>();
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
+ }
+ queryWrapper.eq("type", 1);
queryWrapper.orderByDesc("jxtime");
queryWrapper.last("LIMIT 20");
return baseMapper.selectList(queryWrapper);
@@ -500,14 +569,14 @@
@Override
- public List<TbEquipment> getalldevice(String username,String phone) {
+ public List<TbEquipment> getalldevice(String username, String phone) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
- queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ queryWrapperu.eq("username", username);
+ queryWrapperu.eq("adminphone", phone);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
// queryWrapper.eq("type",1);
// queryWrapper.orderByDesc("jxtime");
@@ -518,25 +587,53 @@
@Override
public TbEquipment getByTagid(String tagid) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("tagid",tagid);
+ queryWrapper.eq("tagid", tagid);
TbEquipment standardNum = baseMapper.selectOne(queryWrapper);
+ if (standardNum != null) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("id", standardNum.getCompanyid());
+ TbCompany tbCompany = tbCompanyMapper.selectOne(queryWrapper1);
+ standardNum.setCompany(tbCompany.getCompanyname());
+ }
+
return standardNum;
}
@Override
- public List<TbEquipment> search(String username,String query) {
+ public List<TbEquipment> search(String username, String query) {
QueryWrapper queryWrapperu = new QueryWrapper<>();
- queryWrapperu.eq("username",username);
+ queryWrapperu.eq("username", username);
// queryWrapperu.eq("adminphone",phone);
- TbUser tbUser= tbUserMapper.selectOne(queryWrapperu);
+ TbUser tbUser = tbUserMapper.selectOne(queryWrapperu);
QueryWrapper queryWrapper = new QueryWrapper<>();
- if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")){
- queryWrapper.eq("companyid",tbUser.getCsname());
+ if (!Objects.equals(tbUser.getRole(), "瓒呯骇绠＄悊鍛�")) {
+ queryWrapper.eq("companyid", tbUser.getCsname());
}
- queryWrapper.eq("type",1);
+ queryWrapper.eq("type", 1);
queryWrapper.like("tagid", query);
queryWrapper.orderByDesc("addtime");
return baseMapper.selectList(queryWrapper);
}
+
+
+ @Override
+ public List<TbEquipment> jzsearch(String query,String type) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type", type);
+ queryWrapper.like("tagid", query);
+ queryWrapper.orderByDesc("addtime");
+// queryWrapper.last("LIMIT 5");
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<TbEquipment> jzsearchfive(String type) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+
+ queryWrapper.eq("type", type);
+ queryWrapper.orderByDesc("addtime");
+ queryWrapper.last("LIMIT 5");
+ return baseMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3