From 19bbb04fe271943850e5b0cdba1aaeed633bc83f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 08 六月 2023 16:25:08 +0800
Subject: [PATCH] 添加swagger
---
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index 39b4483..9cad7d3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -8,6 +8,7 @@
import java.util.List;
import java.util.Objects;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -16,8 +17,10 @@
import com.smartor.domain.PatUpInfoVO;
import com.smartor.mapper.BaseTagMapper;
import com.smartor.mapper.PatArchivetagMapper;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.ss.formula.functions.Now;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
@@ -116,7 +119,7 @@
@Override
@Transactional
- public PatUpInfoVO importFilehandle(String username, MultipartFile file) {
+ public PatUpInfoVO importFilehandle(SysUser user, String tags, MultipartFile file) {
PatUpInfoVO patUpInfoVO = new PatUpInfoVO();
Integer successNum = 0;
Integer failNum = 0;
@@ -213,10 +216,19 @@
}
//鎮ｉ兘鏍囩鏄惁涓虹┖
- if (ObjectUtils.isEmpty(row.getCell(7))) {
- addRemark("鎮ｈ�呮爣绛句负绌�", patArchive);
+ if (ObjectUtils.isEmpty(row.getCell(7)) || StringUtils.isEmpty(row.getCell(7).toString())) {
+ if (StringUtils.isEmpty(tags)) {
+ addRemark("鎮ｈ�呮爣绛句负绌�", patArchive);
+ } else {
+ patArchive.setTag(tags);
+
+ }
} else {
- patArchive.setTag(row.getCell(7).toString());
+ if (StringUtils.isNotEmpty(tags)) {
+ patArchive.setTag(row.getCell(7).toString() + "," + tags);
+ } else {
+ patArchive.setTag(row.getCell(7).toString());
+ }
}
//鍒ゆ柇澶囨敞鏄惁涓虹┖
@@ -231,17 +243,32 @@
patArchiveMapper.insertPatArchive(patArchive);
//鏍规嵁鏍囩鍚嶆煡璇㈠嚭鏍囩淇℃伅
- String s = row.getCell(7).toString();
+ String s = patArchive.getTag();
String[] split = s.split(",");
for (String tagName : split) {
BaseTag baseTag = new BaseTag();
baseTag.setTagname(tagName);
List<BaseTag> baseTags = baseTagMapper.selectBaseTagList(baseTag);
- BaseTag baseTag1 = baseTags.get(0);
+
+ //濡傛灉璇ユ爣绛句负绌猴紝鐜版爣绛剧鐞嗘病鏈夊嚭鐜拌繃鐨勬柊鏍囩鏃讹紝鑷姩灏嗘爣绛炬坊鍔犲埌"鏍囩绠＄悊"鏈垎绫烩�滀腑銆傜紪杈戜汉涓哄鍏ヨ处鍙�
+ if (CollectionUtils.isEmpty(baseTags)) {
+ baseTag = new BaseTag();
+ baseTag.setTagcategoryid(1L);
+ baseTag.setTagname(tagName);
+ baseTag.setOrgid(user.getDeptId().toString());
+ baseTag.setDelFlag("0");
+ baseTag.setCreateBy(user.getUserName());
+ baseTag.setCreateTime(new Date());
+ baseTag.setCreateBy(user.getUserName());
+ baseTag.setCreateTime(new Date());
+ baseTagMapper.insertBaseTag(baseTag);
+ } else {
+ baseTag = baseTags.get(0);
+ }
// 鏂板鎮ｈ�呮。妗堟爣绛�
- PatArchivetag patArchivetag = DtoConversionUtils.sourceToTarget(baseTag1, PatArchivetag.class);
- patArchivetag.setUpdateBy(username);
+ PatArchivetag patArchivetag = DtoConversionUtils.sourceToTarget(baseTag, PatArchivetag.class);
+ patArchivetag.setUpdateBy(user.getUserName());
patArchivetag.setCreateTime(new Date());
patArchivetag.setPatid(patArchive.getPatid());
patArchivetagMapper.insertPatArchivetag(patArchivetag);
--
Gitblit v1.9.3