Revert "机台，标签-配置数据压缩"

This reverts commit 6b861b4ea4.

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/machine/MachineApiImpl.java

@@ -52,7 +52,7 @@ public class MachineApiImpl implements MachineApi {
                 .id(cutting.getId())
                 .machineType(cutting.getMachineType())
                 .name(cutting.getName())
-                .setting(JsonUtils.unzipString(cutting.getMachineSettingDO().toJSONString()))
+                .setting(cutting.getMachineSettingDO().toJSONString())
                 .label(JsonUtils.toJsonString(label))
                 .build();
         return success(machineDTO);

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java

@@ -3,7 +3,6 @@ package com.cf.imes.module.system.controller.admin.label;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.common.pojo.PageResult;
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.framework.excel.core.util.ExcelUtils;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
@@ -24,8 +23,6 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
 import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -106,8 +103,7 @@ public class LabelController {
     public void exportLabelExcel(@Valid LabelPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<LabelDO> list = labelService.getLabelPage(pageReqVO).getList()
-                .stream().map(m->m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
+        List<LabelDO> list = labelService.getLabelPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "标签.xls", "数据", LabelRespVO.class,
                         BeanUtils.toBean(list, LabelRespVO.class));

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java

@@ -1,6 +1,5 @@
 package com.cf.imes.module.system.controller.admin.labeltemplate;
 
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -9,8 +8,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 import java.util.*;
 import java.io.IOException;
-import java.util.stream.Collectors;
-
 import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.pojo.CommonResult;
@@ -111,8 +108,7 @@ public class LabelTemplateController {
     public void exportLabelTemplateExcel(@Valid LabelTemplatePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<LabelTemplateDO> list = labelTemplateService.getLabelTemplatePage(pageReqVO).getList()
-                .stream().map(m->m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
+        List<LabelTemplateDO> list = labelTemplateService.getLabelTemplatePage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "标签模板.xls", "数据", LabelTemplateRespVO.class,
                         BeanUtils.toBean(list, LabelTemplateRespVO.class));

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java

@@ -1,7 +1,6 @@
 package com.cf.imes.module.system.convert.machine;
 
 import com.alibaba.fastjson.JSON;
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingTemplateRespVO;
 import com.cf.imes.module.system.controller.admin.machine.vo.CuttingTemplateSaveReqVO;
@@ -28,7 +27,7 @@ public class MachineTemplateConvert {
                 .machineType(reqVO.getMachineType())
                 .id(reqVO.getId())
                 .name(reqVO.getName())
-                .setting(JsonUtils.zipString(reqVO.getSetting().toJSONString()))
+                .setting(reqVO.getSetting().toJSONString())
                 .build();
     }
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java

@@ -1,7 +1,6 @@
 package com.cf.imes.module.system.service.labeltemplate;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -35,7 +34,6 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
     public Long createLabelTemplate(LabelTemplateSaveReqVO createReqVO) {
         // 插入
         LabelTemplateDO labelTemplate = BeanUtils.toBean(createReqVO, LabelTemplateDO.class);
-        labelTemplate.setTemplate(JsonUtils.zipString(labelTemplate.getTemplate()));
         labelTemplateMapper.insert(labelTemplate);
         // 返回
         return labelTemplate.getId();
@@ -47,10 +45,6 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
         validateLabelTemplateExists(updateReqVO.getId());
         // 更新
         LabelTemplateDO updateObj = BeanUtils.toBean(updateReqVO, LabelTemplateDO.class);
-        if(!updateReqVO.getTemplate().isEmpty()){
-            updateObj.setTemplate(JsonUtils.zipString(updateObj.getTemplate()));
-
-        }
         labelTemplateMapper.updateById(updateObj);
     }
 
@@ -77,7 +71,6 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
     @Override
     public LabelTemplateRespVO getLabelTemplate(Long id) {
         LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id);
-        labelTemplateDO.setTemplate(JsonUtils.unzipString(labelTemplateDO.getTemplate()));
         LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class);
         return labelTemplateRespVO;
     }
@@ -90,8 +83,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
 
     @Override
     public Map<String, List<LabelTemplateRespVO>> getGroupList() {
-        List<LabelTemplateDO> labelTemplateDOS = labelTemplateMapper.selectList()
-                .stream().map( m-> m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
+        List<LabelTemplateDO> labelTemplateDOS = labelTemplateMapper.selectList();
         List<LabelTemplateRespVO> labelTemplateRespVOS = BeanUtils.toBean(labelTemplateDOS, LabelTemplateRespVO.class);
         return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(LabelTemplateRespVO::getType));
     }
@@ -107,7 +99,6 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
                 throw exception(DEFAULT_TEMPLATE_COUNT);
             }
             LabelTemplateDO labelTemplateDO = labelTemplateDOS.get(0);
-            labelTemplateDO.setTemplate(JsonUtils.unzipString(labelTemplateDO.getTemplate()));
             LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class);
             return labelTemplateRespVO;
         }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java

@@ -2,7 +2,6 @@ package com.cf.imes.module.system.service.lable;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.cf.imes.framework.common.pojo.PageResult;
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.module.system.controller.admin.label.vo.*;
@@ -18,7 +17,6 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
 import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXISTS;
 import static com.cf.imes.module.system.enums.ErrorCodeConstants.MACHINE_USE_LABEL;
 
@@ -43,7 +41,6 @@ public class LabelServiceImpl implements LabelService {
     public Long createLabel(LabelSaveReqVO createReqVO) {
         // 插入
         LabelDO Label = BeanUtils.toBean(createReqVO, LabelDO.class);
-        Label.setTemplate(JsonUtils.zipString(Label.getTemplate()));
         labelMapper.insert(Label);
         // 返回
         return Label.getId();
@@ -56,10 +53,6 @@ public class LabelServiceImpl implements LabelService {
         validateLabelExists(updateReqVO.getId());
         // 更新
         LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class);
-        if(!updateReqVO.getTemplate().isEmpty()){
-            updateObj.setTemplate(JsonUtils.zipString(updateObj.getTemplate()));
-        }
-
         labelMapper.updateById(updateObj);
     }
 
@@ -92,40 +85,27 @@ public class LabelServiceImpl implements LabelService {
     @Override
     public LabelRespVO getLabel(Long id) {
         LabelDO LabelDO = labelMapper.selectById(id);
-        LabelDO.setTemplate(JsonUtils.unzipString(LabelDO.getTemplate()));
         LabelRespVO LabelRespVO = BeanUtils.toBean(LabelDO, LabelRespVO.class);
         return LabelRespVO;
     }
 
     @Override
     public PageResult<LabelDO> getLabelPage(LabelPageReqVO pageReqVO) {
-
-        PageResult<LabelDO> labelDOPageResult = labelMapper.selectPage(pageReqVO);
-
-        labelDOPageResult.setList(labelDOPageResult.getList().stream().map(m -> m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList()));
-
-        return labelDOPageResult;
+        return labelMapper.selectPage(pageReqVO);
     }
 
 
 
     @Override
     public Map<String, List<LabelRespVO>> getGroupList(Long organId) {
-        List<LabelDO> LabelDOS = labelMapper.selectList(new LambdaQueryWrapperX<LabelDO>()
-                                .eqIfPresent(LabelDO::getOrganId, organId)
-                        /*.eq(LabelDO::getDeleted,false)*/)
-                .stream().map(m -> m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
+        List<LabelDO> LabelDOS = labelMapper.selectList(new LambdaQueryWrapperX<LabelDO>().eqIfPresent(LabelDO::getOrganId, organId));
         List<LabelRespVO> LabelRespVOS = BeanUtils.toBean(LabelDOS, LabelRespVO.class);
         return LabelRespVOS.stream().collect(Collectors.groupingBy(LabelRespVO::getType));
     }
 
     @Override
     public List<LabelDO> list(String type) {
-
-        return labelMapper.selectList(new LambdaQueryWrapperX<LabelDO>()
-                        .eqIfPresent(LabelDO::getType, type)
-                        .eq(LabelDO::getOrganId,getUserOrganId()))
-                .stream().map( m -> m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
+        return labelMapper.selectList(new LambdaQueryWrapperX<LabelDO>().eqIfPresent(LabelDO::getType, type));
     }
 
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -11,7 +11,6 @@ import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.search.Hit;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.es.core.dal.ESDocument;
 import com.cf.imes.framework.es.core.service.ESDocumentService;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -88,8 +87,6 @@ public class MachineServiceImpl implements MachineService {
         );
         // 插入
         MachineDO machineDO = MachineConvert.convert(createReqVO);
-        // 将机台的配置数据进行压缩
-        machineDO.setSetting(JsonUtils.zipString(machineDO.getSetting()));
         machineMapper.insert(machineDO);
         MachineLimitDO machineLimitDO = MachineLimitDO.builder()
                 .organId(loginUser.getOrganId())
@@ -110,12 +107,7 @@ public class MachineServiceImpl implements MachineService {
         validateExists(updateReqVO.getId());
         // 更新
         MachineDO updateObj = MachineConvert.convert(updateReqVO);
-        // 判断传入的机台配置是否存在，如果存在，压缩数据后更新
-        if(!updateReqVO.getMachineSettingDO().isEmpty()){
-            updateObj.setSetting(JsonUtils.zipString(updateObj.getSetting()));
-        }
-
-//        MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class);
+        //MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class);
         machineMapper.updateById(updateObj);
     }
 
@@ -141,10 +133,6 @@ public class MachineServiceImpl implements MachineService {
     @Override
     public CuttingRespVO getCutting(Long id) {
         MachineDO machineDO = machineMapper.selectById(id);
-
-        // 对机台的配置进行解压
-        machineDO.setSetting(JsonUtils.unzipString(machineDO.getSetting()));
-
         if (Objects.isNull(machineDO)) {
             throw exception(MACHINE_NOT_EXISTS);
         }
@@ -324,13 +312,7 @@ public class MachineServiceImpl implements MachineService {
 
     @Override
     public PageResult<MachineDO> getPage(MachinePageReqVO pageReqVO) {
-
-        PageResult<MachineDO> machineDOPageResult = machineMapper.selectPage(pageReqVO);
-        // 将查询到的机台的数据中的配置信息进行解压
-        List<MachineDO> list = machineDOPageResult.getList().stream().map(m -> m.setSetting(JsonUtils.unzipString(m.getSetting()))).collect(Collectors.toList());
-        return machineDOPageResult.setList(list);
-
-
+        return machineMapper.selectPage(pageReqVO);
     }
 
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java

@@ -13,7 +13,6 @@ import co.elastic.clients.elasticsearch.core.search.Hit;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.PageResult;
-import com.cf.imes.framework.common.util.json.JsonUtils;
 import com.cf.imes.framework.es.core.dal.ESDocument;
 import com.cf.imes.framework.es.core.service.ESDocumentService;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -157,7 +156,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public Long createCuttingTemplate(CuttingTemplateSaveReqVO reqVO) {
         MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO);
-        templateDO.setSetting(JsonUtils.zipString(templateDO.getSetting()));
         machineTemplateMapper.insert(templateDO);
         return templateDO.getId();
     }
@@ -165,10 +163,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
     @Override
     public Boolean updateCuttingTemplate(CuttingTemplateSaveReqVO reqVO) {
         MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO);
-        if(!reqVO.getSetting().isEmpty()){
-            templateDO.setSetting(JsonUtils.zipString(templateDO.getSetting()));
-
-        }
         machineTemplateMapper.updateById(templateDO);
         return Boolean.TRUE;
     }
@@ -176,7 +170,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
     @Override
     public CuttingTemplateRespVO getCuttingTemplateById(String id) {
         MachineTemplateDO templateDO = machineTemplateMapper.selectById(id);
-        templateDO.setSetting(JsonUtils.unzipString(templateDO.getSetting()));
         if (Objects.isNull(templateDO)) {
             throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
         }
@@ -205,8 +198,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
                 throw exception(DEFAULT_TEMPLATE_COUNT);
             }
             MachineTemplateDO templateDO = machineTemplateDOS.get(0);
-            // 将机台的模板配置进行解压
-            templateDO.setSetting(JsonUtils.unzipString(templateDO.getSetting()));
             return MachineTemplateConvert.convert1(templateDO);
         }
         throw exception(DEFAULT_TEMPLATE_NOT_EXISTS);
@@ -233,10 +224,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
 
     @Override
     public Map<Integer, List<MachineTemplateDO>> getMachineTemplateTree() {
-        List<MachineTemplateDO> machineTemplateDOS = machineTemplateMapper.selectList()
-                // 将机台的配置进行解压
-                .stream().map(m -> m.setSetting(JsonUtils.unzipString(m.getSetting()))).collect(Collectors.toList());
-
+        List<MachineTemplateDO> machineTemplateDOS = machineTemplateMapper.selectList();
         Map<Integer, List<MachineTemplateDO>> map = machineTemplateDOS.stream().collect(Collectors.groupingBy(MachineTemplateDO::getMachineType));
         return map;
     }
@@ -405,12 +393,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
         if(CollectionUtil.isEmpty(machineIds)) {
             return new PageResult<>();
         }*/
-
-        PageResult<MachineTemplateDO> machineTemplateDOPageResult = machineTemplateMapper.selectPage(pageParam, new ArrayList<>());
-        // 将机台模板的配置进行解压
-        machineTemplateDOPageResult.setList(machineTemplateDOPageResult.getList().stream().map(m -> m.setSetting(JsonUtils.unzipString(m.getSetting()))).collect(Collectors.toList()));
-
-        return machineTemplateDOPageResult;
+        return machineTemplateMapper.selectPage(pageParam, new ArrayList<>());
     }