From 578bfcb3f58c5458d2c60fe37c3e56ebcda98e18 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 05 三月 2025 15:15:03 +0800
Subject: [PATCH] 标准功能搬迁
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 56 +++-----------------------------------------------------
1 files changed, 3 insertions(+), 53 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
index f1f3ba4..e38d9fb 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
@@ -1,20 +1,16 @@
package com.ruoyi.basic.service.impl;
-import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.StandardTemplateMapper;
import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.service.StandardTemplateService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.Date;
import java.util.List;
/**
@@ -29,9 +25,6 @@
private StandardTemplateMapper standardTemplateMapper;
-
- private final NumberGenerator<StandardTemplate> numberGenerator;
-
@Override
public IPage<StandardTemplate> selectStandardTemplatePageList(Page page, StandardTemplate standardTemplate) {
return standardTemplateMapper.selectStandardTemplatePageList(page, QueryWrappers.queryWrappers(standardTemplate));
@@ -39,12 +32,6 @@
@Override
public int addStandardTemplate(StandardTemplate standardTemplate) {
- if (StringUtils.isBlank(standardTemplate.getNumber())) {
- String giveCode = numberGenerator.generateNumberWithPrefix(5,
- "MB" + DateUtil.format(new Date(), "yyMM"),
- StandardTemplate::getNumber);
- standardTemplate.setNumber(giveCode);
- }
return standardTemplateMapper.insert(standardTemplate);
}
@@ -68,32 +55,17 @@
@Override
public String getStandTempThingById(Integer templateId) {
- StandardTemplate standardTemplate = standardTemplateMapper.selectOne(Wrappers.<StandardTemplate>lambdaQuery()
- .eq(StandardTemplate::getId, templateId)
- .select(StandardTemplate::getThing));
+ StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
if(standardTemplate==null){
return null;
}else{
return standardTemplate.getThing();
}
- // 鏌ヨ鍘嬬缉鍚庣殑鏁版嵁
-// String thing = standardTemplateMapper.selectCompressThing(templateId);
-// if (StringUtils.isNotBlank(thing)) {
-// try {
-// return DecompressMySQLData.decompress(java.util.Base64.getDecoder().decode(thing));
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// } else {
-// return null;
-// }
}
@Override
public String getStandTempNameById(Integer templateId) {
- StandardTemplate standardTemplate = standardTemplateMapper.selectOne(Wrappers.<StandardTemplate>lambdaQuery()
- .eq(StandardTemplate::getId, templateId)
- .select(StandardTemplate::getName));
+ StandardTemplate standardTemplate = standardTemplateMapper.selectById(templateId);
if(standardTemplate==null){
return null;
}else{
@@ -104,27 +76,5 @@
@Override
public StandardTemplate getStandTempIdByName(String name) {
return standardTemplateMapper.getStandTempIdByName(name);
- }
-
- /**
- * 澶嶅埗鍘熷璁板綍妯℃澘
- * @param newTemplate
- * @return
- */
- @Override
- public int copyStandardTemplate(StandardTemplate newTemplate) {
- // 鏌ヨ鏃фā鏉�
- StandardTemplate standardTemplate = baseMapper.selectById(newTemplate.getId());
- newTemplate.setThing(standardTemplate.getThing());
-
- if (StringUtils.isBlank(newTemplate.getNumber())) {
- String giveCode = numberGenerator.generateNumberWithPrefix(5,
- "MB" + DateUtil.format(new Date(), "yyMM"),
- StandardTemplate::getNumber);
- newTemplate.setNumber(giveCode);
- }
- newTemplate.setId(null);
-
- return standardTemplateMapper.insert(newTemplate);
}
}
--
Gitblit v1.9.3