From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java | 71 +++++++++++++++--------------------
1 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
index c5219bb..ac7a622 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
@@ -2,15 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.data.BaseResp;
-import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.SnapConf;
import com.fzzy.igds.mapper.SnapConfMapper;
import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -25,41 +22,40 @@
/**
* 鏌ヨ鍒楄〃鏁版嵁
*
- * @param param 鏌ヨ鍙傛暟
+ * @param deptId 鏌ヨ鍙傛暟
* @return 鏁版嵁鍒楄〃
*/
- public List<SnapConf> selectList(SnapConf param) {
- QueryWrapper<SnapConf> queryWrapper = getQueryWrapper(param);
+ public List<SnapConf> selectList(String deptId) {
+
+ QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
+
+ if(StringUtils.isNotBlank(deptId)){
+ queryWrapper.eq("dept_id", deptId);
+ }
return snapConfMapper.selectList(queryWrapper);
}
/**
- * 灏佽鏌ヨ鏉′欢
- *
- * @param param 鏌ヨ鍙傛暟
- * @return 鏌ヨ鏋勯�犲櫒
+ * 鑾峰彇鏇存柊閰嶇疆鏁伴噺
+ * @param deptId
+ * @param start
+ * @param end
+ * @return
*/
- public QueryWrapper<SnapConf> getQueryWrapper(SnapConf param) {
+ public int getUpdateCount(String deptId, Date start, Date end) {
+
QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
- if(null == param) param= new SnapConf();
- // 璁剧疆鍏徃ID骞朵綔涓烘煡璇㈡潯浠�
- param.setCompanyId(ContextUtil.getCompanyId());
- queryWrapper.eq("company_id", param.getCompanyId());
- // 鎸夋洿鏂版椂闂村�掑簭鎺掑簭
- queryWrapper.orderByDesc("update_time");
-
- return queryWrapper;
- }
-
- /**
- * 鏍规嵁ID鏌ヨ璇︽儏
- *
- * @param id 涓婚敭ID
- * @return 瀹炰綋瀵硅薄
- */
- public SnapConf selectById(String id) {
- return snapConfMapper.selectById(id);
+ if(StringUtils.isNotBlank(deptId)){
+ queryWrapper.eq("dept_id", deptId);
+ }
+ if (null != start) {
+ queryWrapper.ge("update_time", start);
+ }
+ if (null != end) {
+ queryWrapper.le("update_time", end);
+ }
+ return snapConfMapper.selectCount(queryWrapper);
}
/**
@@ -71,9 +67,13 @@
public BaseResp insertData(SnapConf param) {
try {
param.setId(ContextUtil.generateId());
- param.setCompanyId(ContextUtil.getCompanyId());
+ if(StringUtils.isBlank(param.getCompanyId())){
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
param.setCreateBy(ContextUtil.getLoginUserName());
param.setCreateTime(new Date());
+ param.setUpdateBy(ContextUtil.getLoginUserName());
+ param.setUpdateTime(new Date());
return snapConfMapper.insert(param) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
} catch (Exception e) {
log.error("鎻掑叆蹇媿閰嶇疆鏁版嵁寮傚父", e);
@@ -97,17 +97,6 @@
return BaseResp.error("鏇存柊澶辫触锛�" + e.getMessage());
}
}
-
- /**
- * 鍒犻櫎鎸囧畾ID鐨勬暟鎹�
- *
- * @param param 瑕佸垹闄ょ殑璁板綍
- * @return 鎿嶄綔缁撴灉
- */
- public BaseResp deleteData(SnapConf param) {
- return snapConfMapper.deleteById(param) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
- }
-
/**
* 鏇存柊鎵ц鏃堕棿
--
Gitblit v1.9.3