From 5d2e1672c1ad8a0fa890b35b560d2f966095fc25 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 二月 2025 10:05:50 +0800
Subject: [PATCH] 原始模板压缩
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java | 5 +-
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java | 5 +-
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 23 +++++------
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java | 3 -
ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java | 63 +++++++++++++++++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 1
6 files changed, 80 insertions(+), 20 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
index 55cb2a9..50b1b89 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
@@ -56,8 +56,7 @@
@ApiOperation(value = "缂栬緫妯℃澘缂栧埗")
@GetMapping("/getEditTemplatePreparation")
public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
- StandardTemplate byId = standardTemplateService.getById(id);
- return Result.success(byId.getThing());
+ return Result.success(standardTemplateService.getStandTempThingById(id));
}
@ApiOperation(value = "澶嶅埗鍘熷璁板綍妯℃澘")
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
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
index c314bc8..e5c9add 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessComplainController.java
@@ -60,9 +60,8 @@
}
@ApiOperation(value = "瀵煎嚭鍒楄〃")
- @PostMapping("/exportProcessComplain")
- public void exportProcessComplain(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
- ProcessComplain processComplain = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ProcessComplain.class);
+ @GetMapping("/exportProcessComplain")
+ public void exportProcessComplain(ProcessComplain processComplain,HttpServletResponse response) throws Exception {
processComplainService.exportProcessComplain(processComplain,response);
}
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
index 921d222..e682cf6 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -44,11 +45,11 @@
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty("鍒涘缓鏃堕棿")
- private Date createTime;
+ private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("淇敼鏃堕棿")
- private Date updateTime;
+ private LocalDateTime updateTime;
@ApiModelProperty("妯℃澘缂栧彿")
private String number;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index c33bb08..ea73459 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -612,6 +612,7 @@
.eq(InsOrderStandardTemplate::getInsOrderId, order.getId()));
thing = one.getThing();
if (StrUtil.isNotEmpty(thing)) {
+ thing = GZipUtil.uncompress(thing);
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java
new file mode 100644
index 0000000..da8cc61
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java
@@ -0,0 +1,63 @@
+package com.ruoyi.common.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * 鍘嬬缉瑙ｅ帇宸ュ叿绫�
+ */
+public class GZipUtil {
+
+
+ /**
+ * 鍘嬬缉
+ * @param str
+ * @return
+ */
+ public static String compress(String str) {
+ if (str == null || str.trim().length() == 0) {
+ return null;
+ }
+
+ try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+ GZIPOutputStream gzip = new GZIPOutputStream(out)) {
+ gzip.write(str.getBytes("utf-8"));
+ gzip.close();
+
+ return new String(out.toByteArray(), "iso-8859-1");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return str;
+ }
+
+ }
+
+ /**
+ * 瑙ｅ帇
+ * @param str
+ * @return
+ */
+ public static String uncompress(String str) {
+ if (str == null || str.trim().length() == 0) {
+ return null;
+ }
+
+ try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ByteArrayInputStream in = new ByteArrayInputStream(str.getBytes("iso-8859-1"))){
+ GZIPInputStream ungzip = new GZIPInputStream(in);
+ byte[] buffer = new byte[1024];
+ int n;
+ while ((n = ungzip.read(buffer)) >= 0) {
+ out.write(buffer, 0, n);
+ }
+
+ return new String(out.toByteArray(), "utf-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return str;
+ }
+
+ }
+}
--
Gitblit v1.9.3