From 26220601f74874186865626c051ea08373ea44bb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 三月 2026 15:29:52 +0800
Subject: [PATCH] 导入，创建id避免重复
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 39 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 ffb5ba9..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,14 +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.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -22,63 +20,102 @@
private SnapConfMapper snapConfMapper;
/**
- * 鏌ヨ鎵�鏈夋暟鎹�
+ * 鏌ヨ鍒楄〃鏁版嵁
*
- * @param param
- * @author sgj
- * @date 2025/12/10
+ * @param deptId 鏌ヨ鍙傛暟
+ * @return 鏁版嵁鍒楄〃
*/
- public List<SnapConf> listAll(IgdsBaseParam param) {
-
- if (null == param)
- return snapConfMapper.selectList(null);
+ public List<SnapConf> selectList(String deptId) {
QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotEmpty(param.getName())) {
- queryWrapper.like("name", param.getName());
+
+ if(StringUtils.isNotBlank(deptId)){
+ queryWrapper.eq("dept_id", deptId);
}
return snapConfMapper.selectList(queryWrapper);
}
/**
- * 鏂板鏁版嵁
- *
- * @param snapConf
- * @author sgj
- * @date 2025/12/10
+ * 鑾峰彇鏇存柊閰嶇疆鏁伴噺
+ * @param deptId
+ * @param start
+ * @param end
+ * @return
*/
- public BaseResp addData(SnapConf snapConf) {
- snapConf.setId(ContextUtil.generateId());
- snapConf.setCompanyId(ContextUtil.getCompanyId());
- snapConf.setUpdateBy(ContextUtil.getLoginUserName());
- snapConf.setUpdateTime(new Date());
- snapConf.setCreateBy(ContextUtil.getLoginUserName());
- snapConf.setCreateTime(new Date());
- return snapConfMapper.insert(snapConf) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+ public int getUpdateCount(String deptId, Date start, Date end) {
+
+ QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
+
+ 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);
}
/**
- * 鏇存柊鏁版嵁
+ * 鎻掑叆鏂版暟鎹�
*
- * @param snapConf
- * @author sgj
- * @date 2025/12/10
+ * @param param 鏁版嵁瀹炰綋
+ * @return 鎿嶄綔缁撴灉
*/
- public BaseResp updateData(SnapConf snapConf) {
- snapConf.setUpdateBy(ContextUtil.getLoginUserName());
- snapConf.setUpdateTime(new Date());
- return snapConfMapper.updateById(snapConf) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+ public BaseResp insertData(SnapConf param) {
+ try {
+ param.setId(ContextUtil.generateId());
+ 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);
+ return BaseResp.error("娣诲姞澶辫触锛�" + e.getMessage());
+ }
}
/**
- * 鍒犻櫎鏁版嵁
+ * 鏇存柊宸叉湁鏁版嵁
*
- * @param snapConf
- * @author sgj
- * @date 2025/12/10
+ * @param param 鏁版嵁瀹炰綋
+ * @return 鎿嶄綔缁撴灉
*/
- public BaseResp deleteData(SnapConf snapConf) {
- return snapConfMapper.deleteById(snapConf) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
+ public BaseResp updateData(SnapConf param) {
+ try {
+ param.setUpdateBy(ContextUtil.getLoginUserName());
+ param.setUpdateTime(new Date());
+ return snapConfMapper.updateById(param) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
+ } catch (Exception e) {
+ log.error("鏇存柊蹇媿閰嶇疆鏁版嵁寮傚父", e);
+ return BaseResp.error("鏇存柊澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 鏇存柊鎵ц鏃堕棿
+ *
+ */
+ public void updateActHour(SnapConf param) {
+ // 鍒涘缓鏇存柊鏉′欢鍖呰鍣�
+ QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
+ // 璁剧疆缁勭粐ID鏉′欢
+ queryWrapper.eq("company_id", param.getCompanyId());
+ // 鍒涘缓鏇存柊瀹炰綋锛屽彧鏇存柊鎵ц鏃堕棿鐩稿叧瀛楁
+ SnapConf updateEntity = new SnapConf();
+ updateEntity.setActHour1(param.getActHour1());
+ updateEntity.setActHour2(param.getActHour2());
+ updateEntity.setActHour3(param.getActHour3());
+ updateEntity.setUpdateTime(new Date());
+ updateEntity.setUpdateBy(ContextUtil.getLoginUserName());
+ // 鎵ц鎵归噺鏇存柊
+ snapConfMapper.update(updateEntity, queryWrapper);
}
}
--
Gitblit v1.9.3