From f68f5bf6ae56c18561eb8ccba9fb9693f128551c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 11 二月 2026 09:36:07 +0800
Subject: [PATCH] 客户问题优化调整9

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java |  104 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
index 06f71df..507d246 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -1,11 +1,13 @@
 package com.fzzy.igds.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fzzy.igds.data.BaseResp;
 import com.fzzy.igds.data.IgdsBaseParam;
 import com.fzzy.igds.domain.SnapRecord;
 import com.fzzy.igds.mapper.SnapRecordMapper;
 import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -21,34 +23,118 @@
     @Resource
     private SnapRecordMapper snapRecordMapper;
 
-    public List<SnapRecord> listAll(IgdsBaseParam param) {
+    /**
+     * 鍒嗛〉鏌ヨ鏁版嵁
+     *
+     * @param page
+     * @param param
+     */
+    public void listPage(Page<SnapRecord> page, IgdsBaseParam param) {
+        QueryWrapper<SnapRecord> queryWrapper = getQueryWrapper(param);
+        snapRecordMapper.selectPage(page, queryWrapper);
+    }
 
-        if (null == param)
-            return snapRecordMapper.selectList(null);
+    /**
+     * 灏佽鏌ヨ鏉′欢
+     *
+     * @param param
+     */
+    public QueryWrapper<SnapRecord> getQueryWrapper(IgdsBaseParam param) {
+        QueryWrapper<SnapRecord> queryWrapper = new QueryWrapper<>();
+
+        param.setCompanyId(ContextUtil.getCompanyId());
+        queryWrapper.eq("company_id", param.getCompanyId());
+
+        //搴撳尯妫�绱�
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.eq("dept_id", param.getDeptId());
+        }
+        // 鏀跺偍鍏徃妫�绱�
+        if (StringUtils.isNotBlank(param.getKey())) {
+            queryWrapper.likeRight("dept_id", param.getKey());
+        }
+        //鎶撴媿鏃堕棿妫�绱�
+        if (null != param.getStart()) {
+            queryWrapper.ge("snap_time",param.getStart());
+        }
+        if (null != param.getEnd()) {
+            queryWrapper.le("snap_time", param.getEnd());
+        }
+        //鏍囩妫�绱�
+        if (StringUtils.isNotBlank(param.getName())) {
+            queryWrapper.like("tags", param.getName());
+        }
+
+        queryWrapper.orderByDesc("create_time");
+
+        return queryWrapper;
+    }
+
+    /**
+     * 鏌ヨ鎵�鏈夋暟鎹�
+     *
+     * @param param
+     * @author sgj
+     * @date 2025/12/10
+     */
+    public List<SnapRecord> getListByParam(IgdsBaseParam param) {
+        if (null == param){
+            param = new IgdsBaseParam();
+        }
 
         QueryWrapper<SnapRecord> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(param.getName())) {
-            queryWrapper.like("name", param.getName());
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.likeRight("dept_id", param.getDeptId());
         }
+        if (null != param.getStart()) {
+            queryWrapper.ge("snap_time", DateUtil.getCurZero(param.getStart()));
+        }
+        if (null != param.getEnd()) {
+            queryWrapper.le("snap_time", DateUtil.getNextZero(param.getEnd()));
+        }
+        queryWrapper.orderByDesc("snap_time");
         return snapRecordMapper.selectList(queryWrapper);
     }
 
-    public BaseResp addData(SnapRecord snapRecord) {
-        snapRecord.setId(ContextUtil.generateId());
-        snapRecord.setCompanyId(ContextUtil.getCompanyId());
+    /**
+     * 鎸佷箙鍖栦繚瀛�
+     * @param snapRecord
+     */
+    public void addData(SnapRecord snapRecord) {
+        if(StringUtils.isBlank(snapRecord.getId())){
+            snapRecord.setId(ContextUtil.generateId());
+        }
+        if(StringUtils.isBlank(snapRecord.getCompanyId())){
+            snapRecord.setCompanyId(ContextUtil.getCompanyId());
+        }
+
         snapRecord.setUpdateBy(ContextUtil.getLoginUserName());
         snapRecord.setUpdateTime(new Date());
         snapRecord.setCreateBy(ContextUtil.getLoginUserName());
         snapRecord.setCreateTime(new Date());
-        return snapRecordMapper.insert(snapRecord) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+        snapRecordMapper.insert(snapRecord);
     }
 
+    /**
+     * 鏇存柊鏁版嵁
+     *
+     * @param snapRecord
+     * @author sgj
+     * @date 2025/12/10
+     */
     public BaseResp updateData(SnapRecord snapRecord) {
         snapRecord.setUpdateBy(ContextUtil.getLoginUserName());
         snapRecord.setUpdateTime(new Date());
         return snapRecordMapper.updateById(snapRecord) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
     }
 
+    /**
+     * 鍒犻櫎鏁版嵁
+     *
+     * @param snapRecord
+     * @author sgj
+     * @date 2025/12/10
+     */
     public BaseResp deleteData(SnapRecord snapRecord) {
         return snapRecordMapper.deleteById(snapRecord) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
     }

--
Gitblit v1.9.3