diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeaToolEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeaToolEntity.java new file mode 100644 index 00000000..e20413f8 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeaToolEntity.java @@ -0,0 +1,47 @@ +package org.springblade.desk.device.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.util.Date; + +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.io.Serial; + +/** + * 量具信息 实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@TableName("MES_MEA_TOOL") +@Schema(description = "MeaTool对象") +@EqualsAndHashCode(callSuper = true) +public class MeaToolEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 序号 + */ + @Schema(description = "序号") + private String orders; + /** + * 尺寸 + */ + @Schema(description = "尺寸") + private String mtSize; + /** + * 量具 + */ + @Schema(description = "量具") + private String mtName; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeasuringUpkeepEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeasuringUpkeepEntity.java new file mode 100644 index 00000000..f40e3c78 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeasuringUpkeepEntity.java @@ -0,0 +1,62 @@ +package org.springblade.desk.device.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.util.Date; + +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.io.Serial; + +/** + * 量具保养 实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@TableName("MES_MEASURING_UPKEEP") +@Schema(description = "MeasuringUpkeep对象") +@EqualsAndHashCode(callSuper = true) +public class MeasuringUpkeepEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 保养单号 + */ + @Schema(description = "保养单号") + private String mmCode; + /** + * 库存物料;外键（库存物料） + */ + @Schema(description = "库存物料;外键（库存物料）") + private Long miId; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + /** + * + */ + @Schema(description = "") + private Long createMan; + /** + * 审批状态;-1 + */ + @Schema(description = "审批状态;-1") + private Short approvalStatus; + /** + * 库存物料 + */ + @Schema(description = "库存物料") + private Long rlsId; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/UpkeepRecordsEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/UpkeepRecordsEntity.java new file mode 100644 index 00000000..13ed891e --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/UpkeepRecordsEntity.java @@ -0,0 +1,71 @@ +package org.springblade.desk.device.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.util.Date; + +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * 设备维修记录 实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@TableName("MES_UPKEEP_RECORDS") +@Schema(description = "UpkeepRecords对象") +@EqualsAndHashCode(callSuper = true) +public class UpkeepRecordsEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备 + */ + @Schema(description = "设备") + private String device; + /** + * 设备编号 + */ + @Schema(description = "设备编号") + private String deviceCode; + /** + * 故障日期 + */ + @Schema(description = "故障日期") + private Date faultDate; + /** + * 故障描述 + */ + @Schema(description = "故障描述") + private String faultMemo; + /** + * 维修日期 + */ + @Schema(description = "维修日期") + private Date upkeepDate; + /** + * 维修结果 + */ + @Schema(description = "维修结果") + private String upkeepResult; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + /** + * 维修人 + */ + @Schema(description = "维修人") + private String upkeepMan; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeaToolExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeaToolExcel.java new file mode 100644 index 00000000..9deb2c97 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeaToolExcel.java @@ -0,0 +1,70 @@ +package org.springblade.desk.device.pojo.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; + +import java.io.Serializable; +import java.io.Serial; + + +/** + * 量具信息 Excel实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class MeaToolExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 序号 + */ + @ColumnWidth(20) + @ExcelProperty("序号") + private String orders; + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal id; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String tenantId; + /** + * 删除标记;1:删除，0:正常 + */ + @ColumnWidth(20) + @ExcelProperty("删除标记;1:删除，0:正常") + private Long isDeleted; + /** + * 尺寸 + */ + @ColumnWidth(20) + @ExcelProperty("尺寸") + private String mtSize; + /** + * 量具 + */ + @ColumnWidth(20) + @ExcelProperty("量具") + private String mtName; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeasuringUpkeepExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeasuringUpkeepExcel.java new file mode 100644 index 00000000..cfc7be09 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeasuringUpkeepExcel.java @@ -0,0 +1,88 @@ +package org.springblade.desk.device.pojo.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; + +import java.io.Serializable; +import java.io.Serial; + + +/** + * 量具保养 Excel实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class MeasuringUpkeepExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal id; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String tenantId; + /** + * 删除标记;1:删除，0:正常 + */ + @ColumnWidth(20) + @ExcelProperty("删除标记;1:删除，0:正常") + private Long isDeleted; + /** + * 保养单号 + */ + @ColumnWidth(20) + @ExcelProperty("保养单号") + private String mmCode; + /** + * 库存物料;外键（库存物料） + */ + @ColumnWidth(20) + @ExcelProperty("库存物料;外键（库存物料）") + private Long miId; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private Long createMan; + /** + * 审批状态;-1 + */ + @ColumnWidth(20) + @ExcelProperty("审批状态;-1") + private Short approvalStatus; + /** + * 库存物料 + */ + @ColumnWidth(20) + @ExcelProperty("库存物料") + private Long rlsId; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/UpkeepRecordsExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/UpkeepRecordsExcel.java new file mode 100644 index 00000000..f902b4ec --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/UpkeepRecordsExcel.java @@ -0,0 +1,100 @@ +package org.springblade.desk.device.pojo.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; + +import java.io.Serializable; +import java.io.Serial; + + +/** + * 设备维修记录 Excel实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class UpkeepRecordsExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal id; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String tenantId; + /** + * 删除标记;1:删除，0:正常 + */ + @ColumnWidth(20) + @ExcelProperty("删除标记;1:删除，0:正常") + private Long isDeleted; + /** + * 设备 + */ + @ColumnWidth(20) + @ExcelProperty("设备") + private String device; + /** + * 设备编号 + */ + @ColumnWidth(20) + @ExcelProperty("设备编号") + private String deviceCode; + /** + * 故障日期 + */ + @ColumnWidth(20) + @ExcelProperty("故障日期") + private Date faultDate; + /** + * 故障描述 + */ + @ColumnWidth(20) + @ExcelProperty("故障描述") + private String faultMemo; + /** + * 维修日期 + */ + @ColumnWidth(20) + @ExcelProperty("维修日期") + private Date upkeepDate; + /** + * 维修结果 + */ + @ColumnWidth(20) + @ExcelProperty("维修结果") + private String upkeepResult; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 维修人 + */ + @ColumnWidth(20) + @ExcelProperty("维修人") + private String upkeepMan; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeaToolVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeaToolVO.java new file mode 100644 index 00000000..43d77922 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeaToolVO.java @@ -0,0 +1,31 @@ +package org.springblade.desk.device.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 量具信息 视图实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MeaToolVO extends MeaToolEntity { + @Serial + private static final long serialVersionUID = 1L; + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeasuringUpkeepVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeasuringUpkeepVO.java new file mode 100644 index 00000000..5da02e02 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeasuringUpkeepVO.java @@ -0,0 +1,31 @@ +package org.springblade.desk.device.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 量具保养 视图实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MeasuringUpkeepVO extends MeasuringUpkeepEntity { + @Serial + private static final long serialVersionUID = 1L; + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/UpkeepRecordsVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/UpkeepRecordsVO.java new file mode 100644 index 00000000..e993c7fc --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/UpkeepRecordsVO.java @@ -0,0 +1,31 @@ +package org.springblade.desk.device.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.springblade.desk.device.pojo.entity.UpkeepRecordsEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 设备维修记录 视图实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class UpkeepRecordsVO extends UpkeepRecordsEntity { + @Serial + private static final long serialVersionUID = 1L; + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeaToolController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeaToolController.java new file mode 100644 index 00000000..2e261df6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeaToolController.java @@ -0,0 +1,135 @@ +package org.springblade.desk.device.controller; + +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import jakarta.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.device.pojo.excel.MeaToolExcel; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import org.springblade.desk.device.pojo.vo.MeaToolVO; +import org.springblade.desk.device.wrapper.MeaToolWrapper; +import org.springblade.desk.device.service.IMeaToolService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; + +import java.util.Map; +import java.util.List; + +import jakarta.servlet.http.HttpServletResponse; + +/** + * 量具信息 控制器 + * + * @author qyl + * @since 2025-12-29 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/meaTool") +@Tag(name = "量具信息", description = "量具信息接口") +public class MeaToolController extends BladeController { + + private final IMeaToolService meaToolService; + + /** + * 量具信息 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入meaTool") + public R detail(MeaToolEntity meaTool) { + MeaToolEntity detail = meaToolService.getOne(Condition.getQueryWrapper(meaTool)); + return R.data(MeaToolWrapper.build().entityVO(detail)); + } + + /** + * 量具信息 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "") + @Parameters({ + @Parameter(name = "mtName", description = "量具", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "mtSize", description = "尺寸", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + }) + public R> page(@Parameter(hidden = true) MeaToolEntity meaTool, Query query) { + IPage pages = meaToolService.selectMeaToolPage(Condition.getPage(query), meaTool); + return R.data(MeaToolWrapper.build().pageVO(pages)); + } + + /** + * 量具信息 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入meaTool") + public R save(@Valid @RequestBody MeaToolEntity meaTool) { + return R.status(meaToolService.save(meaTool)); + } + + /** + * 量具信息 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入meaTool") + public R update(@Valid @RequestBody MeaToolEntity meaTool) { + return R.status(meaToolService.updateById(meaTool)); + } + + /** + * 量具信息 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入meaTool") + public R submit(@Valid @RequestBody MeaToolEntity meaTool) { + return R.status(meaToolService.saveOrUpdate(meaTool)); + } + + /** + * 量具信息 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(meaToolService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-meaTool") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入meaTool") + public void exportMeaTool(@Parameter(hidden = true) @RequestParam Map meaTool, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(meaTool, MeaToolEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(MeaTool::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(MeaToolEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = meaToolService.exportMeaTool(queryWrapper); + ExcelUtil.export(response, "量具信息数据" + DateUtil.time(), "量具信息数据表", list, MeaToolExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java new file mode 100644 index 00000000..3a9af67b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java @@ -0,0 +1,135 @@ +package org.springblade.desk.device.controller; + +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import jakarta.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO; +import org.springblade.desk.device.wrapper.MeasuringUpkeepWrapper; +import org.springblade.desk.device.service.IMeasuringUpkeepService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; + +import java.util.Map; +import java.util.List; + +import jakarta.servlet.http.HttpServletResponse; + +/** + * 量具保养 控制器 + * + * @author qyl + * @since 2025-12-29 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/measuringUpkeep") +@Tag(name = "量具保养", description = "量具保养接口") +public class MeasuringUpkeepController extends BladeController { + + private final IMeasuringUpkeepService measuringUpkeepService; + + /** + * 量具保养 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入measuringUpkeep") + public R detail(MeasuringUpkeepEntity measuringUpkeep) { + MeasuringUpkeepEntity detail = measuringUpkeepService.getOne(Condition.getQueryWrapper(measuringUpkeep)); + return R.data(MeasuringUpkeepWrapper.build().entityVO(detail)); + } + + /** + * 量具保养 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "") + @Parameters({ + @Parameter(name = "mmCode", description = "保养单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "approvalStatus", description = "审批状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")), + }) + public R> page(@Parameter(hidden = true) MeasuringUpkeepEntity measuringUpkeep, Query query) { + IPage pages = measuringUpkeepService.selectMeasuringUpkeepPage(Condition.getPage(query), measuringUpkeep); + return R.data(MeasuringUpkeepWrapper.build().pageVO(pages)); + } + + /** + * 量具保养 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入measuringUpkeep") + public R save(@Valid @RequestBody MeasuringUpkeepEntity measuringUpkeep) { + return R.status(measuringUpkeepService.save(measuringUpkeep)); + } + + /** + * 量具保养 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入measuringUpkeep") + public R update(@Valid @RequestBody MeasuringUpkeepEntity measuringUpkeep) { + return R.status(measuringUpkeepService.updateById(measuringUpkeep)); + } + + /** + * 量具保养 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入measuringUpkeep") + public R submit(@Valid @RequestBody MeasuringUpkeepEntity measuringUpkeep) { + return R.status(measuringUpkeepService.saveOrUpdate(measuringUpkeep)); + } + + /** + * 量具保养 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(measuringUpkeepService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-measuringUpkeep") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入measuringUpkeep") + public void exportMeasuringUpkeep(@Parameter(hidden = true) @RequestParam Map measuringUpkeep, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(measuringUpkeep, MeasuringUpkeepEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(MeasuringUpkeep::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(MeasuringUpkeepEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = measuringUpkeepService.exportMeasuringUpkeep(queryWrapper); + ExcelUtil.export(response, "量具保养数据" + DateUtil.time(), "量具保养数据表", list, MeasuringUpkeepExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java index f78fe493..2dd9127c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java @@ -70,7 +70,7 @@ public class RecorderCompareController extends BladeController { @Parameter(name = "name", description = "参数名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), @Parameter(name = "showName", description = "参数显示名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), }) - public R> page(RecorderCompareEntity recorderCompare, Query query) { + public R> page(@Parameter(hidden = true) RecorderCompareEntity recorderCompare, Query query) { IPage pages = recorderCompareService.selectRecorderComparePage(Condition.getPage(query), recorderCompare); return R.data(RecorderCompareWrapper.build().pageVO(pages)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java index c7acba48..343d7026 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java @@ -69,7 +69,7 @@ public class RecorderTypeController extends BladeController { @Parameters({ @Parameter(name = "crtCode", description = "记录仪编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), }) - public R> page(RecorderTypeEntity recorderType, Query query) { + public R> page(@Parameter(hidden = true) RecorderTypeEntity recorderType, Query query) { IPage pages = recorderTypeService.selectRecorderTypePage(Condition.getPage(query), recorderType); return R.data(RecorderTypeWrapper.build().pageVO(pages)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/UpkeepRecordsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/UpkeepRecordsController.java new file mode 100644 index 00000000..4274d19a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/UpkeepRecordsController.java @@ -0,0 +1,135 @@ +package org.springblade.desk.device.controller; + +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import jakarta.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.device.pojo.excel.UpkeepRecordsExcel; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.device.pojo.entity.UpkeepRecordsEntity; +import org.springblade.desk.device.pojo.vo.UpkeepRecordsVO; +import org.springblade.desk.device.wrapper.UpkeepRecordsWrapper; +import org.springblade.desk.device.service.IUpkeepRecordsService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; + +import java.util.Map; +import java.util.List; + +import jakarta.servlet.http.HttpServletResponse; + +/** + * 设备维修记录 控制器 + * + * @author qyl + * @since 2025-12-29 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/upkeepRecords") +@Tag(name = "设备维修记录", description = "设备维修记录接口") +public class UpkeepRecordsController extends BladeController { + + private final IUpkeepRecordsService upkeepRecordsService; + + /** + * 设备维修记录 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入upkeepRecords") + public R detail(UpkeepRecordsEntity upkeepRecords) { + UpkeepRecordsEntity detail = upkeepRecordsService.getOne(Condition.getQueryWrapper(upkeepRecords)); + return R.data(UpkeepRecordsWrapper.build().entityVO(detail)); + } + + /** + * 设备维修记录 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "") + @Parameters({ + @Parameter(name = "deviceCode", description = "设备编号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "upkeepResult", description = "维修结果", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + }) + public R> page(@Parameter(hidden = true) UpkeepRecordsEntity upkeepRecords, Query query) { + IPage pages = upkeepRecordsService.selectUpkeepRecordsPage(Condition.getPage(query), upkeepRecords); + return R.data(UpkeepRecordsWrapper.build().pageVO(pages)); + } + + /** + * 设备维修记录 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入upkeepRecords") + public R save(@Valid @RequestBody UpkeepRecordsEntity upkeepRecords) { + return R.status(upkeepRecordsService.save(upkeepRecords)); + } + + /** + * 设备维修记录 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入upkeepRecords") + public R update(@Valid @RequestBody UpkeepRecordsEntity upkeepRecords) { + return R.status(upkeepRecordsService.updateById(upkeepRecords)); + } + + /** + * 设备维修记录 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入upkeepRecords") + public R submit(@Valid @RequestBody UpkeepRecordsEntity upkeepRecords) { + return R.status(upkeepRecordsService.saveOrUpdate(upkeepRecords)); + } + + /** + * 设备维修记录 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(upkeepRecordsService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-upkeepRecords") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入upkeepRecords") + public void exportUpkeepRecords(@Parameter(hidden = true) @RequestParam Map upkeepRecords, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(upkeepRecords, UpkeepRecordsEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(UpkeepRecords::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(UpkeepRecordsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = upkeepRecordsService.exportUpkeepRecords(queryWrapper); + ExcelUtil.export(response, "设备维修记录数据" + DateUtil.time(), "设备维修记录数据表", list, UpkeepRecordsExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.java new file mode 100644 index 00000000..e85a1c3d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.java @@ -0,0 +1,39 @@ +package org.springblade.desk.device.mapper; + +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import org.springblade.desk.device.pojo.excel.MeaToolExcel; +import org.springblade.desk.device.pojo.vo.MeaToolVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 量具信息 Mapper 接口 + * + * @author qyl + * @since 2025-12-29 + */ +public interface MeaToolMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param meaTool 查询参数 + * @return List + */ + List selectMeaToolPage(IPage page, MeaToolVO meaTool); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMeaTool(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.xml new file mode 100644 index 00000000..ea2673b6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java new file mode 100644 index 00000000..49c6c7a5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java @@ -0,0 +1,39 @@ +package org.springblade.desk.device.mapper; + +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel; +import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 量具保养 Mapper 接口 + * + * @author qyl + * @since 2025-12-29 + */ +public interface MeasuringUpkeepMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param measuringUpkeep 查询参数 + * @return List + */ + List selectMeasuringUpkeepPage(IPage page, MeasuringUpkeepVO measuringUpkeep); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMeasuringUpkeep(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml new file mode 100644 index 00000000..ba7f54f8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.java new file mode 100644 index 00000000..3c11925d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.java @@ -0,0 +1,39 @@ +package org.springblade.desk.device.mapper; + +import org.springblade.desk.device.pojo.entity.UpkeepRecordsEntity; +import org.springblade.desk.device.pojo.excel.UpkeepRecordsExcel; +import org.springblade.desk.device.pojo.vo.UpkeepRecordsVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 设备维修记录 Mapper 接口 + * + * @author qyl + * @since 2025-12-29 + */ +public interface UpkeepRecordsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param upkeepRecords 查询参数 + * @return List + */ + List selectUpkeepRecordsPage(IPage page, UpkeepRecordsVO upkeepRecords); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportUpkeepRecords(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.xml new file mode 100644 index 00000000..43b94dbf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeaToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeaToolService.java new file mode 100644 index 00000000..36052388 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeaToolService.java @@ -0,0 +1,37 @@ +package org.springblade.desk.device.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import org.springblade.desk.device.pojo.excel.MeaToolExcel; +import org.springblade.desk.device.pojo.vo.MeaToolVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * 量具信息 服务类 + * + * @author qyl + * @since 2025-12-29 + */ +public interface IMeaToolService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param meaTool 查询参数 + * @return IPage + */ + IPage selectMeaToolPage(IPage page, MeaToolEntity meaTool); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMeaTool(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeasuringUpkeepService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeasuringUpkeepService.java new file mode 100644 index 00000000..de4f5b1a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeasuringUpkeepService.java @@ -0,0 +1,37 @@ +package org.springblade.desk.device.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel; +import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * 量具保养 服务类 + * + * @author qyl + * @since 2025-12-29 + */ +public interface IMeasuringUpkeepService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param measuringUpkeep 查询参数 + * @return IPage + */ + IPage selectMeasuringUpkeepPage(IPage page, MeasuringUpkeepEntity measuringUpkeep); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMeasuringUpkeep(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IUpkeepRecordsService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IUpkeepRecordsService.java new file mode 100644 index 00000000..3a9056c0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IUpkeepRecordsService.java @@ -0,0 +1,37 @@ +package org.springblade.desk.device.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.device.pojo.entity.UpkeepRecordsEntity; +import org.springblade.desk.device.pojo.excel.UpkeepRecordsExcel; +import org.springblade.desk.device.pojo.vo.UpkeepRecordsVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; + +import java.util.List; + +/** + * 设备维修记录 服务类 + * + * @author qyl + * @since 2025-12-29 + */ +public interface IUpkeepRecordsService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param upkeepRecords 查询参数 + * @return IPage + */ + IPage selectUpkeepRecordsPage(IPage page, UpkeepRecordsEntity upkeepRecords); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportUpkeepRecords(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeaToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeaToolServiceImpl.java new file mode 100644 index 00000000..e50795c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeaToolServiceImpl.java @@ -0,0 +1,53 @@ +package org.springblade.desk.device.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import org.springblade.desk.device.pojo.excel.MeaToolExcel; +import org.springblade.desk.device.pojo.vo.MeaToolVO; +import org.springblade.desk.device.mapper.MeaToolMapper; +import org.springblade.desk.device.service.IMeaToolService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; + +import java.util.List; +import java.util.Objects; + +/** + * 量具信息 服务实现类 + * + * @author qyl + * @since 2025-12-29 + */ +@Service +public class MeaToolServiceImpl extends BaseServiceImpl implements IMeaToolService { + + @Override + public IPage selectMeaToolPage(IPage page, MeaToolEntity meaTool) { +// return page.setRecords(baseMapper.selectMeaToolPage(page, meaTool)); + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(meaTool.getMtName()), MeaToolEntity::getMtName, meaTool.getMtName()); + wrapper.like(Objects.nonNull(meaTool.getMtSize()), MeaToolEntity::getMtSize, meaTool.getMtSize()); + + // 3. 执行分页查询 + return baseMapper.selectPage(page, wrapper); + } + + + @Override + public List exportMeaTool(Wrapper queryWrapper) { + List meaToolList = baseMapper.exportMeaTool(queryWrapper); + //meaToolList.forEach(meaTool -> { + // meaTool.setTypeName(DictCache.getValue(DictEnum.YES_NO, MeaTool.getType())); + //}); + return meaToolList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeasuringUpkeepServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeasuringUpkeepServiceImpl.java new file mode 100644 index 00000000..f12b76fc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeasuringUpkeepServiceImpl.java @@ -0,0 +1,53 @@ +package org.springblade.desk.device.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel; +import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO; +import org.springblade.desk.device.mapper.MeasuringUpkeepMapper; +import org.springblade.desk.device.service.IMeasuringUpkeepService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; + +import java.util.List; +import java.util.Objects; + +/** + * 量具保养 服务实现类 + * + * @author qyl + * @since 2025-12-29 + */ +@Service +public class MeasuringUpkeepServiceImpl extends BaseServiceImpl implements IMeasuringUpkeepService { + + @Override + public IPage selectMeasuringUpkeepPage(IPage page, MeasuringUpkeepEntity measuringUpkeep) { +// return page.setRecords(baseMapper.selectMeasuringUpkeepPage(page, measuringUpkeep)); + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(measuringUpkeep.getMmCode()), MeasuringUpkeepEntity::getMmCode, measuringUpkeep.getMmCode()); + wrapper.eq(Objects.nonNull(measuringUpkeep.getApprovalStatus()), MeasuringUpkeepEntity::getApprovalStatus, measuringUpkeep.getApprovalStatus()); + + // 3. 执行分页查询 + return baseMapper.selectPage(page, wrapper); + } + + + @Override + public List exportMeasuringUpkeep(Wrapper queryWrapper) { + List measuringUpkeepList = baseMapper.exportMeasuringUpkeep(queryWrapper); + //measuringUpkeepList.forEach(measuringUpkeep -> { + // measuringUpkeep.setTypeName(DictCache.getValue(DictEnum.YES_NO, MeasuringUpkeep.getType())); + //}); + return measuringUpkeepList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/UpkeepRecordsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/UpkeepRecordsServiceImpl.java new file mode 100644 index 00000000..2be6fdd9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/UpkeepRecordsServiceImpl.java @@ -0,0 +1,53 @@ +package org.springblade.desk.device.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springblade.desk.device.pojo.entity.RecorderTypeEntity; +import org.springblade.desk.device.pojo.entity.UpkeepRecordsEntity; +import org.springblade.desk.device.pojo.excel.UpkeepRecordsExcel; +import org.springblade.desk.device.pojo.vo.UpkeepRecordsVO; +import org.springblade.desk.device.mapper.UpkeepRecordsMapper; +import org.springblade.desk.device.service.IUpkeepRecordsService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; + +import java.util.List; +import java.util.Objects; + +/** + * 设备维修记录 服务实现类 + * + * @author qyl + * @since 2025-12-29 + */ +@Service +public class UpkeepRecordsServiceImpl extends BaseServiceImpl implements IUpkeepRecordsService { + + @Override + public IPage selectUpkeepRecordsPage(IPage page, UpkeepRecordsEntity upkeepRecords) { +// return page.setRecords(baseMapper.selectUpkeepRecordsPage(page, upkeepRecords)); + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(upkeepRecords.getDeviceCode()), UpkeepRecordsEntity::getDeviceCode, upkeepRecords.getDeviceCode()); + wrapper.eq(Objects.nonNull(upkeepRecords.getUpkeepResult()), UpkeepRecordsEntity::getUpkeepResult, upkeepRecords.getUpkeepResult()); + + // 3. 执行分页查询 + return baseMapper.selectPage(page, wrapper); + } + + + @Override + public List exportUpkeepRecords(Wrapper queryWrapper) { + List upkeepRecordsList = baseMapper.exportUpkeepRecords(queryWrapper); + //upkeepRecordsList.forEach(upkeepRecords -> { + // upkeepRecords.setTypeName(DictCache.getValue(DictEnum.YES_NO, UpkeepRecords.getType())); + //}); + return upkeepRecordsList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeaToolWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeaToolWrapper.java new file mode 100644 index 00000000..7b6a3428 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeaToolWrapper.java @@ -0,0 +1,35 @@ +package org.springblade.desk.device.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.device.pojo.entity.MeaToolEntity; +import org.springblade.desk.device.pojo.vo.MeaToolVO; + +import java.util.Objects; + +/** + * 量具信息 包装类,返回视图层所需的字段 + * + * @author qyl + * @since 2025-12-29 + */ +public class MeaToolWrapper extends BaseEntityWrapper { + + public static MeaToolWrapper build() { + return new MeaToolWrapper(); + } + + @Override + public MeaToolVO entityVO(MeaToolEntity meaTool) { + MeaToolVO meaToolVO = Objects.requireNonNull(BeanUtil.copyProperties(meaTool, MeaToolVO.class)); + + //User createUser = UserCache.getUser(meaTool.getCreateUser()); + //User updateUser = UserCache.getUser(meaTool.getUpdateUser()); + //meaToolVO.setCreateUserName(createUser.getName()); + //meaToolVO.setUpdateUserName(updateUser.getName()); + + return meaToolVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeasuringUpkeepWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeasuringUpkeepWrapper.java new file mode 100644 index 00000000..6a217da5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeasuringUpkeepWrapper.java @@ -0,0 +1,35 @@ +package org.springblade.desk.device.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO; + +import java.util.Objects; + +/** + * 量具保养 包装类,返回视图层所需的字段 + * + * @author qyl + * @since 2025-12-29 + */ +public class MeasuringUpkeepWrapper extends BaseEntityWrapper { + + public static MeasuringUpkeepWrapper build() { + return new MeasuringUpkeepWrapper(); + } + + @Override + public MeasuringUpkeepVO entityVO(MeasuringUpkeepEntity measuringUpkeep) { + MeasuringUpkeepVO measuringUpkeepVO = Objects.requireNonNull(BeanUtil.copyProperties(measuringUpkeep, MeasuringUpkeepVO.class)); + + //User createUser = UserCache.getUser(measuringUpkeep.getCreateUser()); + //User updateUser = UserCache.getUser(measuringUpkeep.getUpdateUser()); + //measuringUpkeepVO.setCreateUserName(createUser.getName()); + //measuringUpkeepVO.setUpdateUserName(updateUser.getName()); + + return measuringUpkeepVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/UpkeepRecordsWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/UpkeepRecordsWrapper.java new file mode 100644 index 00000000..f753c7ea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/UpkeepRecordsWrapper.java @@ -0,0 +1,35 @@ +package org.springblade.desk.device.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.device.pojo.entity.UpkeepRecordsEntity; +import org.springblade.desk.device.pojo.vo.UpkeepRecordsVO; + +import java.util.Objects; + +/** + * 设备维修记录 包装类,返回视图层所需的字段 + * + * @author qyl + * @since 2025-12-29 + */ +public class UpkeepRecordsWrapper extends BaseEntityWrapper { + + public static UpkeepRecordsWrapper build() { + return new UpkeepRecordsWrapper(); + } + + @Override + public UpkeepRecordsVO entityVO(UpkeepRecordsEntity upkeepRecords) { + UpkeepRecordsVO upkeepRecordsVO = Objects.requireNonNull(BeanUtil.copyProperties(upkeepRecords, UpkeepRecordsVO.class)); + + //User createUser = UserCache.getUser(upkeepRecords.getCreateUser()); + //User updateUser = UserCache.getUser(upkeepRecords.getUpdateUser()); + //upkeepRecordsVO.setCreateUserName(createUser.getName()); + //upkeepRecordsVO.setUpdateUserName(updateUser.getName()); + + return upkeepRecordsVO; + } + + +}