Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

机台，标签配置压缩

Browse Source
This commit is contained in:
liuzhaotian
2024-07-09 15:39:21 +08:00
parent 6b7e30e0aa
commit b5086b450b
16 changed files with 473 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java
+5 -1
View File
@@ -3,6 +3,7 @@ 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;
@@ -23,6 +24,8 @@ 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;
@@ -103,7 +106,8 @@ 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();
List<LabelDO> list = labelService.getLabelPage(pageReqVO).getList()
.stream().map(m->m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
// 导出 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
+5 -1
View File
@@ -1,5 +1,6 @@
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;
@@ -8,6 +9,8 @@ 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;
@@ -108,7 +111,8 @@ 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();
List<LabelTemplateDO> list = labelTemplateService.getLabelTemplatePage(pageReqVO).getList()
.stream().map(m->m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
// 导出 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/controller/admin/machine/MachineController.java
+12 -2
View File
@@ -1,12 +1,10 @@
package com.cf.imes.module.system.controller.admin.machine;
import com.cf.imes.framework.common.enums.CommonStatusEnum;
import com.cf.imes.framework.es.core.valid.CreateGroup;
import com.cf.imes.framework.es.core.valid.UpdateGroup;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.machine.vo.*;
import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import com.cf.imes.module.system.service.machine.MachineService;
import com.cf.imes.module.system.service.machine.MachineTemplateService;
@@ -139,4 +137,16 @@ public class MachineController {
return success(list);
}
@GetMapping("getBrandAndModel")
@Operation(summary = "获得机台的品牌跟型号")
//@PreAuthorize("@ss.hasPermission('machine::query')")
public CommonResult<Map<String, List<MachineBrandModelRespVO>>> getBrandAndModel(@RequestParam Long type) {
return success(machineService.getBrandAndModel(type));
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java
+9
View File
@@ -31,6 +31,15 @@ public class CuttingRespVO {
@Schema(description = "标签id")
private Long labelId;
@Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("品牌")
private String brand;
@Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
@ExcelProperty("型号")
private String model;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java
+8 -8
View File
@@ -29,23 +29,23 @@ public class CuttingSaveReqVO {
private Integer machineType;
@Schema(description = "标签id")
@NotNull(message = "标签id不能空")
// @NotNull(message = "标签id不能空")
private Long labelId;
@Schema(description = "机台模板id")
@NotNull(groups = CreateGroup.class, message = "机台模板id不能空")
private Long templateId;
/* @Schema(description = "机台配置")
@Valid
private CuttingSettingDO machineSettingDO;*/
@Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "机台的品牌不能为空")
private String brand;
@Schema(description = "型号", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "机台的型号不能为空")
private String model;
@Schema(description = "机台配置")
private JSONObject machineSettingDO;
/* @Schema(description = "样式配置")
@Valid
private StyleMachineDO styleMachineDO;*/
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineBrandModelRespVO.java
+17
View File
@@ -0,0 +1,17 @@
package com.cf.imes.module.system.controller.admin.machine.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@Schema(description = "机台的型号信息")
public class MachineBrandModelRespVO {
@Schema(description = "机台的品牌")
private String brand;
@Schema(description = "机台的型号")
private String model;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java
+9 -6
View File
@@ -15,11 +15,13 @@ public class MachineConvert {
public static MachineDO convert(CuttingSaveReqVO createReqVO) {
return MachineDO.builder()
.machineType(createReqVO.getMachineType())
.name(createReqVO.getName())
.id(createReqVO.getId())
.labelId(createReqVO.getLabelId())
.setting(createReqVO.getMachineSettingDO().toJSONString())
.machineType(createReqVO.getMachineType())
.name(createReqVO.getName())
.id(createReqVO.getId())
.labelId(createReqVO.getLabelId())
.setting(createReqVO.getMachineSettingDO().toJSONString())
.brand(createReqVO.getBrand())
.model(createReqVO.getModel())
.build();
}
@@ -29,7 +31,8 @@ public class MachineConvert {
.id(machineDO.getId())
.machineSettingDO(JSON.parseObject(machineDO.getSetting()))
.createTime(machineDO.getCreateTime())
.labelId(machineDO.getLabelId())
.brand(machineDO.getBrand())
.model(machineDO.getModel())
.name(machineDO.getName())
.machineType(machineDO.getMachineType())
.labelId(machineDO.getLabelId())
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/MachineDO.java
+11
View File
@@ -45,4 +45,15 @@ public class MachineDO extends OrganBaseDO {
*/
private String setting;
/**
* 品牌
*/
private String brand;
/**
* 型号
*/
private String model;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateDO.java
+11
View File
@@ -37,6 +37,17 @@ public class MachineTemplateDO extends BaseDO {
*/
private String setting;
/**
* 品牌
*/
private String brand;
/**
* 型号
*/
private String model;
/**
* 标签id
*/
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
+9
View File
@@ -40,4 +40,13 @@ public interface MachineTemplateMapper extends BaseMapperX<MachineTemplateDO> {
Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
OrganTemplateResp selectOrganTemplate(Long organId);
default MachineTemplateDO selectMachineId(String brand, String model) {
return selectOne(new LambdaQueryWrapperX<MachineTemplateDO>()
.eqIfPresent(MachineTemplateDO::getBrand,brand)
.eqIfPresent(MachineTemplateDO::getModel,model));
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java
+18 -7
View File
@@ -1,6 +1,7 @@
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;
@@ -34,6 +35,7 @@ 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();
@@ -45,6 +47,10 @@ 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);
}
@@ -71,6 +77,7 @@ 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;
}
@@ -83,7 +90,8 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
@Override
public Map<String, List<LabelTemplateRespVO>> getGroupList() {
List<LabelTemplateDO> labelTemplateDOS = labelTemplateMapper.selectList();
List<LabelTemplateDO> labelTemplateDOS = labelTemplateMapper.selectList()
.stream().map( m-> m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList());
List<LabelTemplateRespVO> labelTemplateRespVOS = BeanUtils.toBean(labelTemplateDOS, LabelTemplateRespVO.class);
return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(LabelTemplateRespVO::getType));
}
@@ -99,6 +107,7 @@ 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;
}
@@ -116,13 +125,15 @@ public class LabelTemplateServiceImpl implements LabelTemplateService {
.eq(LabelTemplateDO::getIsDefault, Boolean.TRUE)
.eq(LabelTemplateDO::getType, labelTemplateDO.getType())
);
if(CollectionUtil.isEmpty(labelTemplateDOS) || labelTemplateDOS.size()>1) {
throw exception(DEFAULT_TEMPLATE_COUNT);
// if(CollectionUtil.isEmpty(labelTemplateDOS) || labelTemplateDOS.size()>1) {
// throw exception(DEFAULT_TEMPLATE_COUNT);
// }
if(!labelTemplateDOS.isEmpty()){
LabelTemplateDO templateDO = new LabelTemplateDO();
templateDO.setId(labelTemplateDOS.get(0).getId());
templateDO.setIsDefault(Boolean.FALSE);
labelTemplateMapper.updateById(templateDO);
}
LabelTemplateDO templateDO = new LabelTemplateDO();
templateDO.setId(labelTemplateDOS.get(0).getId());
templateDO.setIsDefault(Boolean.FALSE);
labelTemplateMapper.updateById(templateDO);
labelTemplateDO.setIsDefault(Boolean.TRUE);
labelTemplateMapper.updateById(labelTemplateDO);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java
+24 -9
View File
@@ -2,6 +2,7 @@ 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.*;
@@ -42,6 +43,7 @@ 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();
@@ -54,6 +56,10 @@ 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);
}
@@ -86,34 +92,43 @@ 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) {
return labelMapper.selectPage(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;
}
@Override
public Map<String, List<LabelRespVO>> getGroupList(Long organId) {
List<LabelDO> LabelDOS = labelMapper.selectList(new LambdaQueryWrapperX<LabelDO>().eqIfPresent(LabelDO::getOrganId, 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<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>()
.eq(LabelDO::getOrganId,getUserOrganId())
.eqIfPresent(LabelDO::getType, 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());
// .eq(LabelDO::getOrganId,getUserOrganId())
// .eqIfPresent(LabelDO::getType, 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());
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
+2
View File
@@ -82,4 +82,6 @@ public interface MachineService {
PageResult<MachineDO> page(MachinePageReqVO pageParam);
List<MachineSimpleRespVO> simpleList(Long organId,Long type);
Map<String, List<MachineBrandModelRespVO>> getBrandAndModel(Long type);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+59 -1
View File
@@ -11,6 +11,7 @@ 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;
@@ -24,10 +25,12 @@ import com.cf.imes.module.system.dal.dataobject.machine.DrillSettingDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO;
import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateLimitDO;
import com.cf.imes.module.system.dal.mysql.machine.MachineMapper;
import com.cf.imes.module.system.dal.mysql.machine.MachineLimitMapper;
import com.cf.imes.module.system.dal.mysql.machinetemplate.MachineTemplateLimitMapper;
import com.cf.imes.module.system.dal.mysql.machinetemplate.MachineTemplateMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -78,6 +81,9 @@ public class MachineServiceImpl implements MachineService {
@Resource
private MachineTemplateLimitMapper machineTemplateLimitMapper;
@Resource
private MachineTemplateMapper machineTemplateMapper;
@Resource
private OrderPlanApi orderPlanApi;
@@ -86,13 +92,22 @@ public class MachineServiceImpl implements MachineService {
public Long createCutting(CuttingSaveReqVO createReqVO) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
assert loginUser != null;
// MachineTemplateDO machineTemplateDO = machineTemplateMapper.selectMachineId(createReqVO.getBrand(), createReqVO.getModel());
MachineTemplateLimitDO organMachineTemplateDO = machineTemplateLimitMapper.selectOne(new LambdaQueryWrapperX<MachineTemplateLimitDO>()
.eq(MachineTemplateLimitDO::getMachineId, createReqVO.getTemplateId())
.eq(MachineTemplateLimitDO::getOrganId, loginUser.getOrganId())
);
// 插入
MachineDO machineDO = MachineConvert.convert(createReqVO);
// if(createReqVO.getMachineSettingDO().isEmpty()) {
// machineDO.setSetting(machineTemplateDO.getSetting());
// }
// 将机台的配置数据进行压缩
machineDO.setSetting(JsonUtils.zipString(machineDO.getSetting()));
machineMapper.insert(machineDO);
MachineLimitDO machineLimitDO = MachineLimitDO.builder()
.organId(loginUser.getOrganId())
.machineId(machineDO.getId())
@@ -113,6 +128,13 @@ public class MachineServiceImpl implements MachineService {
// 更新
MachineDO updateObj = MachineConvert.convert(updateReqVO);
//MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class);
// 判断传入的机台配置是否存在，如果存在，压缩数据后更新
if(!updateReqVO.getMachineSettingDO().isEmpty()){
updateObj.setSetting(JsonUtils.zipString(updateObj.getSetting()));
}
machineMapper.updateById(updateObj);
}
@@ -142,6 +164,10 @@ 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);
}
@@ -312,16 +338,48 @@ public class MachineServiceImpl implements MachineService {
return BeanUtils.toBean(machineDOS, MachineSimpleRespVO.class);
}
@Override
public Map<String, List<MachineBrandModelRespVO>> getBrandAndModel(Long type) {
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.eqIfPresent(MachineDO::getOrganId, getUserOrganId())
.eqIfPresent(MachineDO::getMachineType, type)
.select(MachineDO::getModel,MachineDO::getBrand)
).stream().filter(f -> (!Objects.equals(f.getModel(), ""))).toList();
List<MachineBrandModelRespVO> machineVOS = BeanUtils.toBean(machineDOS, MachineBrandModelRespVO.class);
Map<String, List<MachineBrandModelRespVO>> map = machineVOS.stream().collect(Collectors.groupingBy(MachineBrandModelRespVO::getBrand));
return map;
}
private void validateExists(Long id) {
if (machineMapper.selectById(id) == null) {
throw exception(MACHINE_NOT_EXISTS);
}
}
private Boolean validateBrandAndModel(String brand, String model){
return true;
}
@Override
public PageResult<MachineDO> getPage(MachinePageReqVO pageReqVO) {
return machineMapper.selectPage(pageReqVO);
// return machineMapper.selectPage(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);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+25 -5
View File
@@ -13,6 +13,7 @@ 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;
@@ -156,6 +157,10 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
@Transactional(rollbackFor = Exception.class)
public Long createCuttingTemplate(CuttingTemplateSaveReqVO reqVO) {
MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO);
if(!templateDO.getSetting().isEmpty()){
templateDO.setSetting(JsonUtils.zipString(templateDO.getSetting()));
}
machineTemplateMapper.insert(templateDO);
return templateDO.getId();
}
@@ -163,6 +168,10 @@ 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;
}
@@ -170,6 +179,7 @@ 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);
}
@@ -198,6 +208,8 @@ 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);
@@ -224,7 +236,10 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
@Override
public Map<Integer, List<MachineTemplateDO>> getMachineTemplateTree() {
List<MachineTemplateDO> machineTemplateDOS = machineTemplateMapper.selectList();
List<MachineTemplateDO> machineTemplateDOS = machineTemplateMapper.selectList()
// 将机台的配置进行解压
.stream().map(m -> m.setSetting(JsonUtils.unzipString(m.getSetting()))).collect(Collectors.toList());
Map<Integer, List<MachineTemplateDO>> map = machineTemplateDOS.stream().collect(Collectors.groupingBy(MachineTemplateDO::getMachineType));
return map;
}
@@ -256,9 +271,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
throw exception(MACHINE_TEMPLATE_NOT_EXISTS);
}
List<MachineTemplateDO> machineTemplateDOS = machineTemplateMapper.selectList(MachineTemplateDO::getMachineType, templateDO.getMachineType(), MachineTemplateDO::getIsDefault, Boolean.TRUE);
// if(CollectionUtil.isEmpty(machineTemplateDOS) || machineTemplateDOS.size()>1) {
// throw exception(DEFAULT_TEMPLATE_COUNT);
// }
if(CollectionUtil.isEmpty(machineTemplateDOS) || machineTemplateDOS.size()>1) {
throw exception(DEFAULT_TEMPLATE_COUNT);
}
if(!machineTemplateDOS.isEmpty()){
MachineTemplateDO machineTemplateDO = new MachineTemplateDO();
@@ -396,7 +411,12 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
if(CollectionUtil.isEmpty(machineIds)) {
return new PageResult<>();
}*/
return machineTemplateMapper.selectPage(pageParam, new ArrayList<>());
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;
}