From e277d6cd1edbe9bc1e5258f0b7a4d3ddf6ed2f9a Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 16 Aug 2024 11:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E6=8E=88=E6=9D=83=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/machine/MachineAuthController.java | 5 +- .../MachineTemplateAuthController.java | 44 ++- .../MachineTemplateLimitDO.java | 7 + .../MachineTemplateLimitMapper.java | 23 ++ .../machine/MachineTemplateService.java | 15 +- .../machine/MachineTemplateServiceImpl.java | 306 +++++++++--------- .../MachineTemplateLimitMapper.xml | 106 ++++++ 7 files changed, 329 insertions(+), 177 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/resources/mapper/machinetemplate/MachineTemplateLimitMapper.xml diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java index a799b25fb..881814206 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java @@ -4,7 +4,6 @@ import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; -import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; import com.cf.imes.module.system.service.machine.MachineService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -29,8 +28,8 @@ public class MachineAuthController { @Resource private MachineService machineService; - @PostMapping("organ-auth") - @Operation(summary = "组织机台授权") + @PutMapping("insert-organ-auth") + @Operation(summary = "组织机台授权新增") @PreAuthorize("@ss.hasPermission('machine-auth::update')") public CommonResult auth(@RequestBody MachineOrgAuthReq vo) { return success(machineService.auth(vo)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateAuthController.java index 1f1bde10f..71793cd8a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateAuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateAuthController.java @@ -2,8 +2,10 @@ package com.cf.imes.module.system.controller.admin.machine; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.system.controller.admin.machine.vo.*; -import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; +import com.cf.imes.module.system.controller.admin.machine.vo.MachineOrgAuthReq; +import com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplatePage; +import com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateResp; +import com.cf.imes.module.system.controller.admin.machine.vo.TemplateAutoResp; import com.cf.imes.module.system.service.machine.MachineTemplateService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -12,8 +14,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; import static com.cf.imes.framework.common.pojo.CommonResult.success; @@ -28,13 +28,23 @@ public class MachineTemplateAuthController { @Resource private MachineTemplateService machineTemplateService; - @PostMapping("organ-auth-template") - @Operation(summary = "组织模板授权") + @PutMapping("insert-organ-auth-template") + @Operation(summary = "组织模板授权新增") @PreAuthorize("@ss.hasPermission('machine-template-auth::update')") public CommonResult auth(@RequestBody MachineOrgAuthReq vo) { return success(machineTemplateService.auth(vo)); } + + @PostMapping("update-organ-auth-template") + @Operation(summary = "组织模板授权修改") + @PreAuthorize("@ss.hasPermission('machine-template-auth::update')") + public CommonResult updateTemplateAuth(@RequestBody MachineOrgAuthReq vo) { + return success(machineTemplateService.updateTemplateAuth(vo)); + } + + + @GetMapping("organ-template-page") @Operation(summary = "组织模板授权分页列表") @PreAuthorize("@ss.hasPermission('machine-template-auth::query')") @@ -50,18 +60,18 @@ public class MachineTemplateAuthController { return success(machineTemplateService.organTemplateByOrganId(organId)); } - @GetMapping("page-template-machine-auth") - @Operation(summary = "授权机台模板分页") + @GetMapping("organ-template-machine-auth") + @Operation(summary = "查询机台模板授权信息") + @Parameter(name = "organId", description = "组织id", required = true, example = "1") @PreAuthorize("@ss.hasPermission('machine-template-auth::query')") - public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { - PageResult page = machineTemplateService.page(pageParam); - List list = page.getList().stream().map(e->TemplateAutoResp.builder() - .id(e.getId()) - .machineType(e.getMachineType()) - .templateName(e.getName()) - .build() - ).collect(Collectors.toList()); + public CommonResult getTemplateAuth(@RequestParam(required = false) Long organId ) { + return success(machineTemplateService.getTemplateAuth(organId)); +// List list = page.getList().stream().map(e->TemplateAutoResp.builder() +// .id(e.getId()) +// .machineType(e.getMachineType()) +// .templateName(e.getName()) +// .build() +// ).collect(Collectors.toList()); - return success(new PageResult(list, page.getTotal())); } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateLimitDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateLimitDO.java index 3758fb7bf..62b723e2e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateLimitDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateLimitDO.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.dal.dataobject.machinetemplate; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; @@ -41,4 +42,10 @@ public class MachineTemplateLimitDO { * 自动贴标 */ private Boolean showAutoNotePrinter; + /** + * 是否删除 + */ + @TableLogic + private Boolean deleted; + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateLimitMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateLimitMapper.java index 797ba8157..4c7e40da7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateLimitMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateLimitMapper.java @@ -1,10 +1,33 @@ package com.cf.imes.module.system.dal.mysql.machinetemplate; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.module.system.controller.admin.machine.vo.MachineTemplateBrandReqVO; +import com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplatePage; +import com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateResp; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateLimitDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface MachineTemplateLimitMapper extends BaseMapperX { + + Page selectMachinePage(@Param("respPage") Page respPage, @Param("page") OrganTemplatePage page); + + + List selectMachineList(@Param("organIds") List organIds,@Param("templateName") String templateName); + + + + + default List selectListByOrganId(Long organId) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(MachineTemplateLimitDO::getDeleted,false) + .eqIfPresent(MachineTemplateLimitDO::getOrganId,organId)); + } + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java index 1b6af03db..a3af3402a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java @@ -1,6 +1,5 @@ package com.cf.imes.module.system.service.machine; -import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; @@ -19,15 +18,6 @@ public interface MachineTemplateService { PageResult page(MachinePageReqVO pageParam); - Long createDrillTemplate(DrillTemplateSaveReqVO reqVO); - - Boolean updateDrillTemplate(DrillTemplateSaveReqVO reqVO); - - DrillTemplateRespVO getDirllTemplateById(Long id); - - Boolean deleteDrillTemplate(Long id); - - Boolean batchDeleteDrillTemplate(List ids); Long createCuttingTemplate(CuttingTemplateSaveReqVO reqVO); @@ -42,7 +32,6 @@ public interface MachineTemplateService { Map> getMachineTemplateTree(); - PageResult authTemplatePage(AuthTemplatePage page); Boolean auth(MachineOrgAuthReq vo); @@ -55,6 +44,8 @@ public interface MachineTemplateService { void updateMachineTemplateBrand(MachineTemplateBrandReqVO reqVO); + TemplateAutoResp getTemplateAuth(Long organId); + + Boolean updateTemplateAuth(MachineOrgAuthReq vo); -// Boolean setDefaultTemplate(Long id); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 9a5af3233..1e31ed10a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -1,23 +1,13 @@ package com.cf.imes.module.system.service.machine; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.elasticsearch._types.FieldValue; -import co.elastic.clients.elasticsearch._types.query_dsl.*; -import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; -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.enums.CommonStatusEnum; import com.cf.imes.framework.common.enums.MachineTypeEnum; 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.es.core.dal.ESDocument; -import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; import com.cf.imes.module.system.controller.admin.machine.vo.*; @@ -62,8 +52,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { //钻孔机台模板配置索引 private static final String DRILL_MACHINE_INX = "drill_machine_template"; - @Resource - private ESDocumentService esDocumentService; @Resource private UserMachineMapper userMachineMapper; @@ -81,90 +69,10 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Resource private MachineBrandMapper machineBrandMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public Long createDrillTemplate(DrillTemplateSaveReqVO reqVO) { - MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); - machineTemplateMapper.insert(templateDO); - DrillTemplateMachineDO setting = reqVO.getSetting(); - setting.setTemplateId(templateDO.getId()); - try { - esDocumentService.createByFluentDSL(DRILL_MACHINE_INX, setting.getId(), setting); - } catch (Exception e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - } - return templateDO.getId(); - } + @Resource + private OrganMapper organMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateDrillTemplate(DrillTemplateSaveReqVO reqVO) { - MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); - machineTemplateMapper.updateById(templateDO); - DrillTemplateMachineDO machineDO = reqVO.getSetting(); - Map map = BeanUtil.beanToMap(machineDO); - try { - esDocumentService.updateById(DRILL_MACHINE_INX, machineDO.getId(), DrillTemplateMachineDO.class, map); - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - } - return Boolean.TRUE; - } - @Override - public DrillTemplateRespVO getDirllTemplateById(Long id) { - MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); - if (Objects.isNull(templateDO)) { - throw exception(MACHINE_TEMPLATE_NOT_EXISTS); - } - DrillTemplateRespVO respVO = Convert.convert(DrillTemplateRespVO.class, templateDO); - Object o = buildResp(templateDO.getId(), DRILL_MACHINE_INX, DrillTemplateMachineDO.class); - respVO.setDrillTemplateMachineDO((DrillTemplateMachineDO) o); - return respVO; - } - - @Override - public Boolean deleteDrillTemplate(Long id) { - MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); - if (Objects.isNull(templateDO)) { - throw exception(MACHINE_TEMPLATE_NOT_EXISTS); - } - // 删除 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(DRILL_MACHINE_INX) - .query(b -> b.term(t -> t.field("templateId").value(templateDO.getId()))); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - } - machineTemplateMapper.deleteById(id); - return Boolean.TRUE; - } - - @Override - public Boolean batchDeleteDrillTemplate(List ids) { - List machineTemplateDOS = machineTemplateMapper.selectBatchIds(ids); - if (CollectionUtil.isEmpty(machineTemplateDOS)) { - throw exception(MACHINE_TEMPLATE_NOT_EXISTS); - } - - List fieldValues = machineTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(DRILL_MACHINE_INX) - .query(TermsQuery.of(e -> e.field("templateId").terms(b -> b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - } - machineTemplateMapper.deleteBatchIds(ids); - return Boolean.TRUE; - } @Override @Transactional(rollbackFor = Exception.class) @@ -288,18 +196,61 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } - @Override - public PageResult authTemplatePage(AuthTemplatePage page) { - Page respPage = new Page<>(page.getPageNo(), page.getPageSize()); - Page pageRes = machineTemplateMapper.selectAuthTemplatePage(respPage, page); - return new PageResult<>(pageRes.getRecords(), pageRes.getTotal()); - } @Override public PageResult organTemplatePage(OrganTemplatePage page) { Page respPage = new Page<>(page.getPageNo(), page.getPageSize()); - Page pageRes = machineTemplateMapper.selectOrganTemplatePage(respPage, page); - return new PageResult<>(pageRes.getRecords(), pageRes.getTotal()); + +// List machineTemplateDOS = machineTemplateMapper.selectMachineTemplate(page.getTemplateName()); +// +// List machineTemplateIds = machineTemplateDOS.stream().map(m -> m.getId()).toList(); +// +// MPJLambdaWrapperX lambdaWrapperX = new MPJLambdaWrapperX<>(); +// lambdaWrapperX.leftJoin(MachineTemplateLimitDO.class, MachineTemplateLimitDO::getMachineId, OrganizationDO::getId) +// .eqIfExists(OrganizationDO::getName,page.getOrganId()) +// .in(MachineTemplateLimitDO::getMachineId, machineTemplateIds) +// .distinct(); +// +// PageResult pageResult = organMapper.selectJoinPage(page, OrganizationDO.class, lambdaWrapperX); +// +// +// List organIds = pageResult.getList().stream().map(OrganizationDO::getId).toList(); + + Page organTemplateRespPage = machineTemplateLimitMapper.selectMachinePage(respPage, page); + + // 分页查询出的组织信息 + List organTemplateRespPageRecords = organTemplateRespPage.getRecords(); + + List organIds = organTemplateRespPageRecords.stream().map(OrganTemplateResp::getOrganId).toList(); + + + if(organIds.isEmpty()){ + return null; + } + + List machineTemplateBrandReqVOS = machineTemplateLimitMapper.selectMachineList(organIds,page.getTemplateName()); + + + // 查询品牌名称 + List brandIds = machineTemplateBrandReqVOS.stream().map(MachineTemplateBrandReqVO::getId).toList(); + + List machineBrandDOS = machineBrandMapper.selectBatchIds(brandIds); + + for (MachineTemplateBrandReqVO machineTemplateBrandReqVO : machineTemplateBrandReqVOS) { + machineTemplateBrandReqVO.setBrand(machineBrandDOS.stream() + .filter(f->f.getId().equals(machineTemplateBrandReqVO.getId())) + .map(MachineBrandDO::getBrand) + .findAny().orElse(null)); + } + + for (OrganTemplateResp organTemplateRespPageRecord : organTemplateRespPageRecords) { + organTemplateRespPageRecord.setMachineTemplateBrandReqVOS(machineTemplateBrandReqVOS.stream() + .filter(f->f.getOrganId().equals(organTemplateRespPageRecord.getOrganId())) + .toList()); + } + + return new PageResult<>(organTemplateRespPage.getRecords(), organTemplateRespPage.getTotal()); + } @Override @@ -341,29 +292,111 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } -// @Override -// @Transactional -// public Boolean setDefaultTemplate(Long id) { -// MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); -// if (Objects.isNull(templateDO)) { -// throw exception(MACHINE_TEMPLATE_NOT_EXISTS); -// } -// List machineTemplateDOS = machineTemplateMapper.selectList(MachineTemplateDO::getMachineType, templateDO.getMachineType(), MachineTemplateDO::getIsDefault, Boolean.TRUE); -// if(CollectionUtil.isEmpty(machineTemplateDOS) || machineTemplateDOS.size()>1) { -// throw exception(DEFAULT_TEMPLATE_COUNT); -// } -// -// if(!machineTemplateDOS.isEmpty()){ -// MachineTemplateDO machineTemplateDO = new MachineTemplateDO(); -// machineTemplateDO.setId(machineTemplateDOS.get(0).getId()); -// machineTemplateDO.setIsDefault(Boolean.FALSE); -// machineTemplateMapper.updateById(machineTemplateDO); -// } -// -// templateDO.setIsDefault(Boolean.TRUE); -// machineTemplateMapper.updateById(templateDO); -// return Boolean.TRUE; -// } + @Override + public TemplateAutoResp getTemplateAuth(Long organId) { + + // todo 逻辑增强已完成，已完成如果按照组织查询，只查询当前组织下没有进行授权的机台，数据正确性待确认 + + TemplateAutoResp templateAutoResp = new TemplateAutoResp(); + + + List machineIds; + + if(organId != null){ + + List machineTemplateLimitDOS = machineTemplateLimitMapper.selectListByOrganId(organId); + + machineIds = machineTemplateLimitDOS.stream().map(MachineTemplateLimitDO::getMachineId).distinct().toList(); + + } else { + machineIds = new ArrayList<>(); + } + + List organizationDOS = organMapper.selectOrganList(CommonStatusEnum.ENABLE.getStatus()); + + + templateAutoResp.setOrganSimpleRespVOS(BeanUtils.toBean(organizationDOS, OrganSimpleRespVO.class)); + + + List machineBrandDOS = machineBrandMapper.selectListByType(MachineTypeEnum.CUTTING.getType()); + + + templateAutoResp.setMachineBrand(BeanUtils.toBean(machineBrandDOS, TemplateAutoResp.MachineBrand.class)); + + + List brandIds = machineBrandDOS.stream().map(MachineBrandDO::getId).toList(); + + + List machineTemplateDoS = machineTemplateMapper + .selectList( new MPJLambdaWrapperX() + .in(MachineTemplateDO::getBrandId, brandIds) + .select(MachineTemplateDO::getId, MachineTemplateDO::getBrandId, MachineTemplateDO::getName)); + + + List machineTemplates = BeanUtils.toBean(machineTemplateDoS, TemplateAutoResp.MachineTemplate.class); + + + if(!machineIds.isEmpty()) { + + for (TemplateAutoResp.MachineBrand machineBrand : templateAutoResp.getMachineBrand()) { + + machineBrand.setMachineTemplates(machineTemplates.stream().filter(f -> f.getBrandId().equals(machineBrand.getId())).toList()); + + + List machineTemplate = new ArrayList<>(machineBrand.getMachineTemplates().stream() + + .filter(f -> !machineIds.contains(f.getId())) + + .toList()); + + + machineBrand.setMachineTemplates(machineTemplate.stream().distinct().toList()); + + } + + return templateAutoResp; + + } + + + for (TemplateAutoResp.MachineBrand machineBrand : templateAutoResp.getMachineBrand()) { + + machineBrand.setMachineTemplates(machineTemplates.stream().filter(f -> f.getBrandId().equals(machineBrand.getId())).toList()); + + } + + + return templateAutoResp; + + + } + + + + @Override + public Boolean updateTemplateAuth(MachineOrgAuthReq vo) { + + List machineAuthList = vo.getMachineAuthList(); + + if(!machineAuthList.isEmpty()) { + List machineTemplateLimitDOS = new ArrayList<>(); + + for (MachineAuth machineAuth : machineAuthList) { + + machineTemplateLimitDOS.add(MachineTemplateLimitDO.builder() + .id(machineAuth.getMachineId()) + .showAutoNotePrinter(machineAuth.getShowAutoNotePrinter()) + .showDualWorkstation(machineAuth.getShowDualWorkstation()) + .showPriorFacing(machineAuth.getShowPriorFacing()) + .build()); + } + + machineTemplateLimitMapper.updateBatch(machineTemplateLimitDOS); + } + + return true; + + } @Override @@ -377,25 +410,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { return Boolean.TRUE; } - private Object buildResp(Long machineTemplateId, String index, Class clazz) { - SearchRequest.Builder builder = new SearchRequest.Builder(); - builder.index(index); - builder.query(q -> q.term(TermQuery.of(e -> e.field("templateId").value(machineTemplateId)))); - SearchResponse searchSetting = null; - try { - SearchResponse search = elasticsearchClient.search(builder.build(), clazz); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - Hit hit = hits.get(0); - return hit.source(); - } - return null; - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - } - } - @Override @Transactional(rollbackFor = Exception.class) @@ -417,7 +431,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override @Transactional(rollbackFor = Exception.class) public Boolean auth(MachineOrgAuthReq vo) { - machineTemplateLimitMapper.delete(new LambdaQueryWrapperX().eq(MachineTemplateLimitDO::getOrganId, vo.getOrganId())); + + // 去掉授权删除 +// machineTemplateLimitMapper.delete(new LambdaQueryWrapperX().eq(MachineTemplateLimitDO::getOrganId, vo.getOrganId())); List machineAuthList = vo.getMachineAuthList(); diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/machinetemplate/MachineTemplateLimitMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/machinetemplate/MachineTemplateLimitMapper.xml new file mode 100644 index 000000000..4e128b03f --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/machinetemplate/MachineTemplateLimitMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file