From c58e2b7b027b88eee3f101ce690a111315fc6324 Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 1 Apr 2024 17:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=88=E6=9D=83=E6=9C=BA?= =?UTF-8?q?=E5=8F=B0=E6=A8=A1=E6=9D=BF=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/MachineTemplateController.java | 10 ++++++ .../admin/machine/vo/TemplateAutoResp.java | 34 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java 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 f0b3b8500..d3bddac40 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 @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.machine; 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.object.BeanUtils; 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.service.machine.MachineTemplateService; @@ -154,5 +155,14 @@ public class MachineTemplateController { return success(machineTemplateService.organTemplateByOrganId(organId)); } + @GetMapping("page-template-machine-auth") + @Operation(summary = "授权机台模板分页") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { + PageResult page = machineTemplateService.page(pageParam); + List list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class); + 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/controller/admin/machine/vo/TemplateAutoResp.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java new file mode 100644 index 000000000..3a01e3bab --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java @@ -0,0 +1,34 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class TemplateAutoResp { + @Schema(description = "机台模板id") + private Long id; + /** + * 名称 + */ + @Schema(description = "机台模板名称") + private String name; + /** + * 1机台设备 2CNC设备 + */ + @Schema(description = "机台模板类别") + private Integer machineType; + /** + * 是否默认模板 + */ + private Boolean isDefault; + @Schema(description ="加工模式 开料机加工模式 默认true,显示开料机工作模式(是否排钻/造型,sc)配置") + private Boolean showPriorFacing = false; + @Schema(description = "双工位") + private Boolean showDualWorkstation = false; + @Schema(description = "自动贴标") + private Boolean showAutoNotePrinter = false; +}