From e8dc9598b482830ca7fa60c6869687a32448137d Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期一, 17 三月 2025 10:57:37 +0800
Subject: [PATCH] 新增储罐管理，数据分析新增导出功能
---
src/main/java/com/hxzkmonitor/service/impl/TbBaidumapServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/hxzkmonitor/service/impl/TbBaidumapServiceImpl.java b/src/main/java/com/hxzkmonitor/service/impl/TbBaidumapServiceImpl.java
index 7fa91aa..5c7285b 100644
--- a/src/main/java/com/hxzkmonitor/service/impl/TbBaidumapServiceImpl.java
+++ b/src/main/java/com/hxzkmonitor/service/impl/TbBaidumapServiceImpl.java
@@ -3,16 +3,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hxzkmonitor.mapper.TbUserMapper;
import com.hxzkmonitor.pojo.TbBaidumap;
import com.hxzkmonitor.pojo.TbBaidumap;
import com.hxzkmonitor.mapper.TbBaidumapMapper;
+import com.hxzkmonitor.pojo.TbDuanxinlog;
+import com.hxzkmonitor.pojo.TbUser;
import com.hxzkmonitor.service.TbBaidumapService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -23,7 +29,10 @@
* @since 2024-08-22
*/
@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class TbBaidumapServiceImpl extends ServiceImpl<TbBaidumapMapper, TbBaidumap> implements TbBaidumapService {
+
+ private final TbUserMapper tbUserMapper;
@Override
public IPage<TbBaidumap> searchBaidumap(Page page, String keyword) {
QueryWrapper<TbBaidumap> queryWrapper = new QueryWrapper<>();
@@ -65,9 +74,26 @@
}
@Override
- public IPage<TbBaidumap> getBaidumapPage(Page page) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
- return userPage;
+ public IPage<TbBaidumap> getBaidumapPage(Page page, 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.orderByDesc("addtime");
+ IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
+ return userPage;
+
+ } else {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("companyname", tbUser.getCaname());
+ queryWrapper.orderByDesc("addtime");
+ IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
+ return userPage;
+ }
+// QueryWrapper queryWrapper = new QueryWrapper<>();
+// IPage<TbBaidumap> userPage = baseMapper.selectPage(page, queryWrapper);
+// return userPage;
}
}
--
Gitblit v1.9.3