mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 13:42:07 +08:00
新增授权机台模板分页接口
This commit is contained in:
+10
@@ -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.CommonResult;
|
||||||
import com.cf.imes.framework.common.pojo.PageParam;
|
import com.cf.imes.framework.common.pojo.PageParam;
|
||||||
import com.cf.imes.framework.common.pojo.PageResult;
|
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.controller.admin.machine.vo.*;
|
||||||
import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO;
|
import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO;
|
||||||
import com.cf.imes.module.system.service.machine.MachineTemplateService;
|
import com.cf.imes.module.system.service.machine.MachineTemplateService;
|
||||||
@@ -154,5 +155,14 @@ public class MachineTemplateController {
|
|||||||
return success(machineTemplateService.organTemplateByOrganId(organId));
|
return success(machineTemplateService.organTemplateByOrganId(organId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("page-template-machine-auth")
|
||||||
|
@Operation(summary = "授权机台模板分页")
|
||||||
|
@PreAuthorize("@ss.hasPermission('machine-template::query')")
|
||||||
|
public CommonResult<PageResult<TemplateAutoResp>> pageTemplateAuth(MachinePageReqVO pageParam) {
|
||||||
|
PageResult<MachineTemplateDO> page = machineTemplateService.page(pageParam);
|
||||||
|
List<TemplateAutoResp> list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class);
|
||||||
|
return success(new PageResult<TemplateAutoResp>(list, page.getTotal()));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+34
@@ -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;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user