From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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..e94a9ec 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
@@ -7,6 +7,7 @@
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.GZipUtil;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.StandardTemplateMapper;
import com.ruoyi.basic.pojo.StandardTemplate;
@@ -45,12 +46,19 @@
StandardTemplate::getNumber);
standardTemplate.setNumber(giveCode);
}
+ if (StringUtils.isNotBlank(standardTemplate.getThing())) {
+ standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
+ } else {
+ standardTemplate.setThing(null);
+ }
return standardTemplateMapper.insert(standardTemplate);
}
@Override
public int upStandardTemplate(StandardTemplate standardTemplate) {
- if(standardTemplate.getThing().equals("")){
+ if (StringUtils.isNotBlank(standardTemplate.getThing())) {
+ standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
+ } else {
standardTemplate.setThing(null);
}
return standardTemplateMapper.updateById(standardTemplate);
@@ -74,19 +82,8 @@
if(standardTemplate==null){
return null;
}else{
- return standardTemplate.getThing();
+ return GZipUtil.uncompress(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
--
Gitblit v1.9.3