diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index c14922b09..a34aa9c99 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -132,5 +132,19 @@ public class MachineTemplateController { return success(machineTemplateService.authTemplatePage(page)); } + @PostMapping("org-auth-template") + @Operation(summary = "组织模板授权") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult auth(@RequestBody MachineOrgAuthReq vo) { + return success(machineTemplateService.auth(vo)); + } + + @GetMapping("organ-template-page") + @Operation(summary = "组织模板授权分页列表") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult> organTemplatePage(OrganTemplatePage page) { + return success(machineTemplateService.organTemplatePage(page)); + } + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthVO.java new file mode 100644 index 000000000..84f847311 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthVO.java @@ -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; + +/** + * @author Beal + */ +@Data +public class AuthVO { + @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") + private Boolean showPriorFacing; + @Schema(description = "双工位") + private Boolean showDualWorkstation; + @Schema(description = "自动贴标") + private Boolean showAutoNotePrinter; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuth.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuth.java new file mode 100644 index 000000000..48944c4c5 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuth.java @@ -0,0 +1,19 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class MachineAuth { + @Schema(description = "机台模板id") + private Long machineId; + @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") + private Boolean showPriorFacing; + @Schema(description = "双工位") + private Boolean showDualWorkstation; + @Schema(description = "自动贴标") + private Boolean showAutoNotePrinter; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java new file mode 100644 index 000000000..6af97f83b --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineOrgAuthReq.java @@ -0,0 +1,21 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +import java.util.List; + +/** + * @author Beal + */ +@Data +public class MachineOrgAuthReq { + + @Schema(description = "组织id") + private Long organId; + @Schema(description = "权限列表") + private List machineAuthList; + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplatePage.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplatePage.java new file mode 100644 index 000000000..8a23ac2cb --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplatePage.java @@ -0,0 +1,17 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.cf.imes.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class OrganTemplatePage extends PageParam { + @Schema(description = "组织id") + private Long organId; + @Schema(description = "机台模板名称") + private String templateName; + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplateResp.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplateResp.java new file mode 100644 index 000000000..9e3cd5766 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplateResp.java @@ -0,0 +1,33 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; + +/** + * @author Beal + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OrganTemplateResp { + @Schema(description = "组织id") + private Long organId; + @Schema(description = "组织名称") + private String organName; + @Schema(description = "更新时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) + private Date updateTime; + @Schema(description = "机台模板列表") + private List authTemplateList; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplateVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplateVO.java new file mode 100644 index 000000000..ea4000e45 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/OrganTemplateVO.java @@ -0,0 +1,28 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class OrganTemplateVO { + @Schema(description = "机台模板id") + private Long templateId; + @Schema(description = "机台模板名称") + private String templateName; + @Schema(description = "机台模板类型") + private Integer machineType; + @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") + private Boolean showPriorFacing; + @Schema(description = "双工位") + private Boolean showDualWorkstation; + @Schema(description = "自动贴标") + private Boolean showAutoNotePrinter; + + @JsonIgnore + private Long organId; + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java index e324352b0..b8abf43eb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java @@ -161,10 +161,10 @@ public class CuttingSettingDO extends ESDocument { //高级设置 - @Schema(description ="默认true，显示开料机工作模式(是否排钻/造型，sc)配置") + @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") private Boolean showPriorFacing; @Schema(description = "双工位") - private Boolean dualWorkstation; + private Boolean showDualWorkstation; @Schema(description = "自动贴标") private Boolean showAutoNotePrinter; @Schema(description = "排版方式") @@ -239,7 +239,7 @@ public class CuttingSettingDO extends ESDocument { @Schema(description = "默认false，启用自定义板件编号") - private Boolean allowBlockNo_Note; + private Boolean showAllowBlockNo_Note; @Schema(description = "默认空，机台备注") private String remark; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java index b16b85039..53244f0ed 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java @@ -165,10 +165,10 @@ public class CuttingTemplateMachineDO extends ESDocument { //高级设置 - @Schema(description ="默认true，显示开料机工作模式(是否排钻/造型，sc)配置") + @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") private Boolean showPriorFacing; @Schema(description = "双工位") - private Boolean dualWorkstation; + private Boolean showDualWorkstation; @Schema(description = "自动贴标") private Boolean showAutoNotePrinter; @Schema(description = "排版方式") @@ -243,7 +243,7 @@ public class CuttingTemplateMachineDO extends ESDocument { @Schema(description = "默认false，启用自定义板件编号") - private Boolean allowBlockNo_Note; + private Boolean showAllowBlockNo_Note; @Schema(description = "默认空，机台备注") private String remark; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java new file mode 100644 index 000000000..53eedcc3f --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/OrganMachineDO.java @@ -0,0 +1,39 @@ +package com.cf.imes.module.system.dal.dataobject.machinetemplate; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * @author Beal + */ +@Data +@TableName("system_organ_machine") +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OrganMachineDO { + @TableId + private Long id; + private Long organId; + private Long machineId; + private LocalDateTime createTime; + /** + * 加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置 + */ + private Boolean showPriorFacing; + /** + * 双工位 + */ + private Boolean showDualWorkstation; + /** + * 自动贴标 + */ + private Boolean showAutoNotePrinter; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java index 55b09cbc8..a732c8cb3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cf.imes.framework.common.pojo.PageResult; 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.AuthTemplatePage; -import com.cf.imes.module.system.controller.admin.machine.vo.AuthTemplateResp; -import com.cf.imes.module.system.controller.admin.machine.vo.AutoTemplateVO; -import com.cf.imes.module.system.controller.admin.machine.vo.MachinePageReqVO; +import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,4 +32,10 @@ public interface MachineTemplateMapper extends BaseMapperX { Page selectAuthTemplatePage(@Param("page") IPage authTemplateRespPage, @Param("vo") AuthTemplatePage page); List selectAuthTemplateList(Map map); + + Page selectOrganTemplatePage(@Param("page") Page respPage, @Param("vo") OrganTemplatePage page); + + List selectOrganTemplateList(Map map); + + Page xxselectOrganTemplatePage(@Param("page") Page respPage, @Param("vo") OrganTemplatePage page); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/OrganMachineMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/OrganMachineMapper.java new file mode 100644 index 000000000..ca247dff2 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/OrganMachineMapper.java @@ -0,0 +1,10 @@ +package com.cf.imes.module.system.dal.mysql.machinetemplate; + +import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.module.system.dal.dataobject.machinetemplate.OrganMachineDO; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrganMachineMapper extends BaseMapperX { + +} 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 60949aadc..5285daea8 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 @@ -46,4 +46,8 @@ public interface MachineTemplateService { Map> getMachineTemplateTree(); PageResult authTemplatePage(AuthTemplatePage page); + + Boolean auth(MachineOrgAuthReq vo); + + PageResult organTemplatePage(OrganTemplatePage page); } 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 8e0d8afd4..ec1edf7aa 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 @@ -26,9 +26,11 @@ import com.cf.imes.module.system.dal.dataobject.machine.UserMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.CuttingTemplateMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.DrillTemplateMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; +import com.cf.imes.module.system.dal.dataobject.machinetemplate.OrganMachineDO; import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO; import com.cf.imes.module.system.dal.mysql.machine.UserMachineMapper; import com.cf.imes.module.system.dal.mysql.machinetemplate.MachineTemplateMapper; +import com.cf.imes.module.system.dal.mysql.machinetemplate.OrganMachineMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -36,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.IOException; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -68,6 +71,9 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Resource private MachineTemplateMapper machineTemplateMapper; + @Resource + private OrganMachineMapper organMachineMapper; + @Override @Transactional(rollbackFor = Exception.class) public Long createDrillTemplate(DrillTemplateSaveReqVO reqVO) { @@ -103,7 +109,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public DrillTemplateRespVO getDirllTemplateById(Long id) { MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); - if(Objects.isNull(templateDO)) { + if (Objects.isNull(templateDO)) { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } DrillTemplateRespVO respVO = Convert.convert(DrillTemplateRespVO.class, templateDO); @@ -115,13 +121,13 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public Boolean deleteDrillTemplate(Long id) { MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); - if(Objects.isNull(templateDO)) { + 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()))); + .query(b -> b.term(t -> t.field("templateId").value(templateDO.getId()))); try { elasticsearchClient.deleteByQuery(builder.build()); } catch (IOException e) { @@ -135,14 +141,14 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public Boolean batchDeleteDrillTemplate(List ids) { List machineTemplateDOS = machineTemplateMapper.selectBatchIds(ids); - if(CollectionUtil.isEmpty(machineTemplateDOS)) { + 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()); + .query(TermsQuery.of(e -> e.field("templateId").terms(b -> b.value(fieldValues)))._toQuery()); try { elasticsearchClient.deleteByQuery(builder.build()); } catch (IOException e) { @@ -187,7 +193,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public CuttingTemplateRespVO getCuttingTemplateById(String id) { MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); - if(Objects.isNull(templateDO)) { + if (Objects.isNull(templateDO)) { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); @@ -199,14 +205,14 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public Boolean batchDeleteCuttingTemplate(List ids) { List machineTemplateDOS = machineTemplateMapper.selectBatchIds(ids); - if(CollectionUtil.isEmpty(machineTemplateDOS)) { + 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(CUTTING_MACHINE_INX) - .query(TermsQuery.of(e-> e.field("templateId").terms(b->b.value(fieldValues)))._toQuery()); + .query(TermsQuery.of(e -> e.field("templateId").terms(b -> b.value(fieldValues)))._toQuery()); try { elasticsearchClient.deleteByQuery(builder.build()); } catch (IOException e) { @@ -223,16 +229,16 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { .eq(MachineTemplateDO::getIsDefault, Boolean.TRUE) .eq(MachineTemplateDO::getMachineType, 1) ); - if(CollectionUtil.isNotEmpty(machineTemplateDOS)) { - if(machineTemplateDOS.size() > 1) { - throw exception(DEFAULT_TEMPLATE_COUNT); - } - MachineTemplateDO templateDO = machineTemplateDOS.get(0); - CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); - Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); - respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o); - return respVO; - } + if (CollectionUtil.isNotEmpty(machineTemplateDOS)) { + if (machineTemplateDOS.size() > 1) { + throw exception(DEFAULT_TEMPLATE_COUNT); + } + MachineTemplateDO templateDO = machineTemplateDOS.get(0); + CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); + Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); + respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o); + return respVO; + } throw exception(DEFAULT_TEMPLATE_COUNT); } @@ -242,8 +248,8 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { .eq(MachineTemplateDO::getIsDefault, Boolean.TRUE) .eq(MachineTemplateDO::getMachineType, 2) ); - if(CollectionUtil.isNotEmpty(machineTemplateDOS)) { - if(machineTemplateDOS.size() > 1) { + if (CollectionUtil.isNotEmpty(machineTemplateDOS)) { + if (machineTemplateDOS.size() > 1) { throw exception(DEFAULT_TEMPLATE_COUNT); } MachineTemplateDO templateDO = machineTemplateDOS.get(0); @@ -265,20 +271,28 @@ 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()); + 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.xxselectOrganTemplatePage(respPage, page); + return new PageResult<>(pageRes.getRecords(), pageRes.getTotal()); + } + + @Override public Boolean deleteCuttingTemplate(Long id) { MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); - if(Objects.isNull(templateDO)) { + if (Objects.isNull(templateDO)) { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } // 删除 DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() .index(CUTTING_MACHINE_INX) - .query(b->b.term(t->t.field("templateId").value(templateDO.getId()))); + .query(b -> b.term(t -> t.field("templateId").value(templateDO.getId()))); try { elasticsearchClient.deleteByQuery(builder.build()); } catch (IOException e) { @@ -289,15 +303,15 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { return Boolean.TRUE; } - private Object buildResp(Long machineTemplateId, String index, Class clazz) { + 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)))); + 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)) { + if (CollectionUtil.isNotEmpty(hits)) { Hit hit = hits.get(0); return hit.source(); } @@ -313,7 +327,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Transactional(rollbackFor = Exception.class) public Boolean auth(MachineAuthVO vo) { userMachineMapper.delete(new LambdaQueryWrapperX().eq(UserMachineDO::getUserId, vo.getUserId())); - if(CollectionUtil.isNotEmpty(vo.getMachinesIds())) { + if (CollectionUtil.isNotEmpty(vo.getMachinesIds())) { ArrayList userMachineDOS = new ArrayList<>(); for (Long machinesId : vo.getMachinesIds()) { userMachineDOS.add(UserMachineDO.builder() @@ -326,6 +340,36 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { return Boolean.TRUE; } + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean auth(MachineOrgAuthReq vo) { + organMachineMapper.delete(new LambdaQueryWrapperX().eq(OrganMachineDO::getOrganId, vo.getOrganId())); + + List machineAuthList = vo.getMachineAuthList(); + + if(CollectionUtil.isNotEmpty(machineAuthList)) { + List organMachineDOS = new ArrayList<>(); + LocalDateTime now = LocalDateTime.now(); + for (MachineAuth machineAuth : machineAuthList) { + organMachineDOS.add( + OrganMachineDO.builder() + .createTime(now) + .organId(vo.getOrganId()) + .machineId(machineAuth.getMachineId()) + .showDualWorkstation(machineAuth.getShowDualWorkstation()) + .showAutoNotePrinter(machineAuth.getShowAutoNotePrinter()) + .showPriorFacing(machineAuth.getShowPriorFacing()) + .build() + ); + + } + organMachineMapper.insertBatch(organMachineDOS); + } + + return Boolean.TRUE; + } + + /* @Override public PageResult pageCutting(PageParam pageParam) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); @@ -360,7 +404,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { }*/ @Override - public PageResult page(MachinePageReqVO pageParam) { + public PageResult page(MachinePageReqVO pageParam) { /* LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); List machineIds = userMachineMapper.selectList(new LambdaQueryWrapperX().eq(UserMachineDO::getUserId, loginUser.getId())) .stream() @@ -369,7 +413,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { if(CollectionUtil.isEmpty(machineIds)) { return new PageResult<>(); }*/ - return machineTemplateMapper.selectPage(pageParam, new ArrayList<>()); + return machineTemplateMapper.selectPage(pageParam, new ArrayList<>()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml index 3949d575e..6ed2b29d2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml @@ -13,6 +13,28 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file