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 = "å¤å¶åå§è®°å½æ¨¡æ¿") 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 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); } } 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; 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); 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; } } }