From eb23bc41da0a27d1aada95744e0262e8cb4f0385 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 16:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java
index 689ac16..7059108 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceSuggestServiceImpl.java
@@ -1,6 +1,7 @@
package com.iailab.module.ansteel.coking.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.ansteel.coking.dao.CokingTraceSuggestDao;
import com.iailab.module.ansteel.coking.entity.CokingTraceSuggestEntity;
import com.iailab.module.ansteel.coking.service.CokingTraceSuggestService;
@@ -8,6 +9,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -31,12 +34,49 @@
QueryWrapper<CokingTraceSuggestEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("rel_id", relId)
.eq(StringUtils.isNotBlank(sugObj), "sug_obj", sugObj)
- .orderByAsc("sug_obj");
- return cokingTraceSuggestDao.selectList(new QueryWrapper<>());
+ .orderByAsc("create_date");
+ return cokingTraceSuggestDao.selectList(queryWrapper);
}
@Override
public void save(CokingTraceSuggestEntity suggestEntity) {
cokingTraceSuggestDao.insert(suggestEntity);
}
+
+ @Override
+ public void insert(List<CokingTraceSuggestEntity> suggestEntitieList) {
+ cokingTraceSuggestDao.insert(suggestEntitieList);
+ }
+
+ @Override
+ public List<CokingTraceSuggestEntity> getAbnormalData(Map<String, Object> params) {
+ String processType = (String) params.get("processType");
+ String clock = (String) params.get("clock");
+ if (StringUtils.isBlank(clock)) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ }
+
+ QueryWrapper<CokingTraceSuggestEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("sug_obj", processType)
+ .eq("clock", clock)
+ .orderByAsc("create_date");
+ return cokingTraceSuggestDao.selectList(queryWrapper);
+ }
+
+ @Override
+ public void saveTraceSuggest(String relId, String process, String clock, String content, String sugObj) {
+ if (StringUtils.isBlank(content)) {
+ return;
+ }
+ CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
+ suggestEntity.setRelId(relId);
+ suggestEntity.setProcess(process);
+ suggestEntity.setSugObj(sugObj);
+ suggestEntity.setClock(clock);
+ suggestEntity.setContent(content);
+ suggestEntity.setCreateDate(new Date());
+ cokingTraceSuggestDao.insert(suggestEntity);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3