From 22f87b2bf7c743b7506b06ded0fd47cc1dd5bd35 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 30 Dec 2025 11:18:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BB=AA=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E8=A1=A8=E3=80=81=E8=AE=B0=E5=BD=95=E4=BB=AA=E6=9B=B2?= =?UTF-8?q?=E7=BA=BF=E8=AE=BE=E7=BD=AE=E8=A1=A8=E9=80=86=E5=90=91=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90+=E5=88=86=E9=A1=B5=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/entity/RecorderCompareEntity.java | 60 ++++++++ .../pojo/entity/RecorderTypeEntity.java | 42 ++++++ .../pojo/excel/RecorderCompareExcel.java | 88 ++++++++++++ .../device/pojo/excel/RecorderTypeExcel.java | 64 +++++++++ .../device/pojo/vo/RecorderCompareVO.java | 31 ++++ .../desk/device/pojo/vo/RecorderTypeVO.java | 31 ++++ .../controller/RecorderCompareController.java | 136 ++++++++++++++++++ .../controller/RecorderTypeController.java | 135 +++++++++++++++++ .../device/mapper/RecorderCompareMapper.java | 39 +++++ .../device/mapper/RecorderCompareMapper.xml | 37 +++++ .../device/mapper/RecorderTypeMapper.java | 39 +++++ .../desk/device/mapper/RecorderTypeMapper.xml | 33 +++++ .../service/IRecorderCompareService.java | 62 ++++++++ .../device/service/IRecorderTypeService.java | 37 +++++ .../impl/RecorderCompareServiceImpl.java | 54 +++++++ .../service/impl/RecorderTypeServiceImpl.java | 52 +++++++ .../wrapper/RecorderCompareWrapper.java | 35 +++++ .../device/wrapper/RecorderTypeWrapper.java | 35 +++++ 18 files changed, 1010 insertions(+) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderTypeEntity.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderCompareVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderTypeVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderTypeService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderTypeServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderCompareWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderTypeWrapper.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java new file mode 100644 index 00000000..205b7859 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderCompareEntity.java @@ -0,0 +1,60 @@ +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 lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * 记录仪曲线设置 实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@TableName("MES_RECORDER_COMPARE") +@Schema(description = "RecorderCompare对象") +@EqualsAndHashCode(callSuper = true) +public class RecorderCompareEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备编号 + */ + @Schema(description = "设备编号") + private String code; + /** + * 参数名称 + */ + @Schema(description = "参数名称") + private String name; + /** + * 参数显示名称 + */ + @Schema(description = "参数显示名称") + private String showName; + /** + * 是否显示曲线图 + */ + @Schema(description = "是否显示曲线图") + private String showGraph; + /** + * 曲线X间隔 + */ + @Schema(description = "曲线X间隔") + private BigDecimal crcX; + /** + * 曲线Y比例尺 + */ + @Schema(description = "曲线Y比例尺") + private BigDecimal crcY; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderTypeEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderTypeEntity.java new file mode 100644 index 00000000..58ff8075 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/RecorderTypeEntity.java @@ -0,0 +1,42 @@ +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_RECORDER_TYPE") +@Schema(description = "RecorderType对象") +@EqualsAndHashCode(callSuper = true) +public class RecorderTypeEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String crtCode; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.java new file mode 100644 index 00000000..0de7e035 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderCompareExcel.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 RecorderCompareExcel 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 code; + /** + * 参数名称 + */ + @ColumnWidth(20) + @ExcelProperty("参数名称") + private String name; + /** + * 参数显示名称 + */ + @ColumnWidth(20) + @ExcelProperty("参数显示名称") + private String showName; + /** + * 是否显示曲线图 + */ + @ColumnWidth(20) + @ExcelProperty("是否显示曲线图") + private String showGraph; + /** + * 曲线X间隔 + */ + @ColumnWidth(20) + @ExcelProperty("曲线X间隔") + private BigDecimal crcX; + /** + * 曲线Y比例尺 + */ + @ColumnWidth(20) + @ExcelProperty("曲线Y比例尺") + private BigDecimal crcY; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java new file mode 100644 index 00000000..5d068166 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/RecorderTypeExcel.java @@ -0,0 +1,64 @@ +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 RecorderTypeExcel 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 crtCode; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderCompareVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderCompareVO.java new file mode 100644 index 00000000..1a36d0e8 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderCompareVO.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.RecorderCompareEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 记录仪曲线设置 视图实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RecorderCompareVO extends RecorderCompareEntity { + @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/RecorderTypeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderTypeVO.java new file mode 100644 index 00000000..b4ec794a --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/RecorderTypeVO.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.RecorderTypeEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 记录仪分类 视图实体类 + * + * @author qyl + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RecorderTypeVO extends RecorderTypeEntity { + @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/RecorderCompareController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java new file mode 100644 index 00000000..f78fe493 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderCompareController.java @@ -0,0 +1,136 @@ +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.RecorderCompareExcel; +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.RecorderCompareEntity; +import org.springblade.desk.device.pojo.vo.RecorderCompareVO; +import org.springblade.desk.device.wrapper.RecorderCompareWrapper; +import org.springblade.desk.device.service.IRecorderCompareService; +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("/recorderCompare") +@Tag(name = "记录仪曲线设置", description = "记录仪曲线设置接口") +public class RecorderCompareController extends BladeController { + + private final IRecorderCompareService recorderCompareService; + + /** + * 记录仪曲线设置 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入recorderCompare") + public R detail(RecorderCompareEntity recorderCompare) { + RecorderCompareEntity detail = recorderCompareService.getOne(Condition.getQueryWrapper(recorderCompare)); + return R.data(RecorderCompareWrapper.build().entityVO(detail)); + } + + /** + * 记录仪曲线设置 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "") + @Parameters({ + @Parameter(name = "code", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @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) { + IPage pages = recorderCompareService.selectRecorderComparePage(Condition.getPage(query), recorderCompare); + return R.data(RecorderCompareWrapper.build().pageVO(pages)); + } + + /** + * 记录仪曲线设置 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入recorderCompare") + public R save(@Valid @RequestBody RecorderCompareEntity recorderCompare) { + return R.status(recorderCompareService.save(recorderCompare)); + } + + /** + * 记录仪曲线设置 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入recorderCompare") + public R update(@Valid @RequestBody RecorderCompareEntity recorderCompare) { + return R.status(recorderCompareService.updateById(recorderCompare)); + } + + /** + * 记录仪曲线设置 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入recorderCompare") + public R submit(@Valid @RequestBody RecorderCompareEntity recorderCompare) { + return R.status(recorderCompareService.saveOrUpdate(recorderCompare)); + } + + /** + * 记录仪曲线设置 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(recorderCompareService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-recorderCompare") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入recorderCompare") + public void exportRecorderCompare(@Parameter(hidden = true) @RequestParam Map recorderCompare, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(recorderCompare, RecorderCompareEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RecorderCompare::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RecorderCompareEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = recorderCompareService.exportRecorderCompare(queryWrapper); + ExcelUtil.export(response, "记录仪曲线设置数据" + DateUtil.time(), "记录仪曲线设置数据表", list, RecorderCompareExcel.class); + } + +} 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 new file mode 100644 index 00000000..c7acba48 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/RecorderTypeController.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.RecorderTypeExcel; +import org.springblade.desk.device.wrapper.RecorderCompareWrapper; +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.RecorderTypeEntity; +import org.springblade.desk.device.pojo.vo.RecorderTypeVO; +import org.springblade.desk.device.wrapper.RecorderTypeWrapper; +import org.springblade.desk.device.service.IRecorderTypeService; +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("/recorderType") +@Tag(name = "记录仪分类", description = "记录仪分类接口") +public class RecorderTypeController extends BladeController { + + private final IRecorderTypeService recorderTypeService; + + /** + * 记录仪分类 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入recorderType") + public R detail(RecorderTypeEntity recorderType) { + RecorderTypeEntity detail = recorderTypeService.getOne(Condition.getQueryWrapper(recorderType)); + return R.data(RecorderTypeWrapper.build().entityVO(detail)); + } + + /** + * 记录仪分类 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "") + @Parameters({ + @Parameter(name = "crtCode", description = "记录仪编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + }) + public R> page(RecorderTypeEntity recorderType, Query query) { + IPage pages = recorderTypeService.selectRecorderTypePage(Condition.getPage(query), recorderType); + return R.data(RecorderTypeWrapper.build().pageVO(pages)); + } + + /** + * 记录仪分类 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入recorderType") + public R save(@Valid @RequestBody RecorderTypeEntity recorderType) { + return R.status(recorderTypeService.save(recorderType)); + } + + /** + * 记录仪分类 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入recorderType") + public R update(@Valid @RequestBody RecorderTypeEntity recorderType) { + return R.status(recorderTypeService.updateById(recorderType)); + } + + /** + * 记录仪分类 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入recorderType") + public R submit(@Valid @RequestBody RecorderTypeEntity recorderType) { + return R.status(recorderTypeService.saveOrUpdate(recorderType)); + } + + /** + * 记录仪分类 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(recorderTypeService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-recorderType") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入recorderType") + public void exportRecorderType(@Parameter(hidden = true) @RequestParam Map recorderType, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(recorderType, RecorderTypeEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RecorderType::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RecorderTypeEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = recorderTypeService.exportRecorderType(queryWrapper); + ExcelUtil.export(response, "记录仪分类数据" + DateUtil.time(), "记录仪分类数据表", list, RecorderTypeExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.java new file mode 100644 index 00000000..98f90deb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.java @@ -0,0 +1,39 @@ +package org.springblade.desk.device.mapper; + +import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; +import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; +import org.springblade.desk.device.pojo.vo.RecorderCompareVO; +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 RecorderCompareMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param recorderCompare 查询参数 + * @return List + */ + List selectRecorderComparePage(IPage page, RecorderCompareVO recorderCompare); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRecorderCompare(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.xml new file mode 100644 index 00000000..7496b044 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderCompareMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.java new file mode 100644 index 00000000..fb41d720 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.java @@ -0,0 +1,39 @@ +package org.springblade.desk.device.mapper; + +import org.springblade.desk.device.pojo.entity.RecorderTypeEntity; +import org.springblade.desk.device.pojo.excel.RecorderTypeExcel; +import org.springblade.desk.device.pojo.vo.RecorderTypeVO; +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 RecorderTypeMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param recorderType 查询参数 + * @return List + */ + List selectRecorderTypePage(IPage page, RecorderTypeVO recorderType); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRecorderType(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.xml new file mode 100644 index 00000000..55bbc462 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/RecorderTypeMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java new file mode 100644 index 00000000..31189d82 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderCompareService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.device.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; +import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; +import org.springblade.desk.device.pojo.vo.RecorderCompareVO; +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 IRecorderCompareService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param recorderCompare 查询参数 + * @return IPage + */ + IPage selectRecorderComparePage(IPage page, RecorderCompareEntity recorderCompare); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRecorderCompare(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderTypeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderTypeService.java new file mode 100644 index 00000000..0eef2af8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRecorderTypeService.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.RecorderTypeEntity; +import org.springblade.desk.device.pojo.excel.RecorderTypeExcel; +import org.springblade.desk.device.pojo.vo.RecorderTypeVO; +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 IRecorderTypeService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param recorderType 查询参数 + * @return IPage + */ + IPage selectRecorderTypePage(IPage page, RecorderTypeEntity recorderType); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRecorderType(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java new file mode 100644 index 00000000..c79d2c98 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderCompareServiceImpl.java @@ -0,0 +1,54 @@ +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.RackSetEntity; +import org.springblade.desk.device.pojo.entity.RecorderCompareEntity; +import org.springblade.desk.device.pojo.excel.RecorderCompareExcel; +import org.springblade.desk.device.pojo.vo.RecorderCompareVO; +import org.springblade.desk.device.mapper.RecorderCompareMapper; +import org.springblade.desk.device.service.IRecorderCompareService; +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 RecorderCompareServiceImpl extends BaseServiceImpl implements IRecorderCompareService { + + @Override + public IPage selectRecorderComparePage(IPage page, RecorderCompareEntity recorderCompare) { +// return page.setRecords(baseMapper.selectRecorderComparePage(page, recorderCompare)); + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(recorderCompare.getCode()), RecorderCompareEntity::getCode, recorderCompare.getCode()) + .like(Objects.nonNull(recorderCompare.getName()), RecorderCompareEntity::getName, recorderCompare.getName()) + .like(Objects.nonNull(recorderCompare.getShowName()), RecorderCompareEntity::getShowName, recorderCompare.getShowName()); + + // 3. 执行分页查询 + return baseMapper.selectPage(page, wrapper); + } + + + @Override + public List exportRecorderCompare(Wrapper queryWrapper) { + List recorderCompareList = baseMapper.exportRecorderCompare(queryWrapper); + //recorderCompareList.forEach(recorderCompare -> { + // recorderCompare.setTypeName(DictCache.getValue(DictEnum.YES_NO, RecorderCompare.getType())); + //}); + return recorderCompareList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderTypeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderTypeServiceImpl.java new file mode 100644 index 00000000..bd606ce0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RecorderTypeServiceImpl.java @@ -0,0 +1,52 @@ +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.RackSetEntity; +import org.springblade.desk.device.pojo.entity.RecorderTypeEntity; +import org.springblade.desk.device.pojo.excel.RecorderTypeExcel; +import org.springblade.desk.device.pojo.vo.RecorderTypeVO; +import org.springblade.desk.device.mapper.RecorderTypeMapper; +import org.springblade.desk.device.service.IRecorderTypeService; +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 RecorderTypeServiceImpl extends BaseServiceImpl implements IRecorderTypeService { + + @Override + public IPage selectRecorderTypePage(IPage page, RecorderTypeEntity recorderType) { +// return page.setRecords(baseMapper.selectRecorderTypePage(page, recorderType)); + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(recorderType.getCrtCode()), RecorderTypeEntity::getCrtCode, recorderType.getCrtCode()); + + // 3. 执行分页查询 + return baseMapper.selectPage(page, wrapper); + } + + + @Override + public List exportRecorderType(Wrapper queryWrapper) { + List recorderTypeList = baseMapper.exportRecorderType(queryWrapper); + //recorderTypeList.forEach(recorderType -> { + // recorderType.setTypeName(DictCache.getValue(DictEnum.YES_NO, RecorderType.getType())); + //}); + return recorderTypeList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderCompareWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderCompareWrapper.java new file mode 100644 index 00000000..122614a2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderCompareWrapper.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.RecorderCompareEntity; +import org.springblade.desk.device.pojo.vo.RecorderCompareVO; + +import java.util.Objects; + +/** + * 记录仪曲线设置 包装类,返回视图层所需的字段 + * + * @author qyl + * @since 2025-12-29 + */ +public class RecorderCompareWrapper extends BaseEntityWrapper { + + public static RecorderCompareWrapper build() { + return new RecorderCompareWrapper(); + } + + @Override + public RecorderCompareVO entityVO(RecorderCompareEntity recorderCompare) { + RecorderCompareVO recorderCompareVO = Objects.requireNonNull(BeanUtil.copyProperties(recorderCompare, RecorderCompareVO.class)); + + //User createUser = UserCache.getUser(recorderCompare.getCreateUser()); + //User updateUser = UserCache.getUser(recorderCompare.getUpdateUser()); + //recorderCompareVO.setCreateUserName(createUser.getName()); + //recorderCompareVO.setUpdateUserName(updateUser.getName()); + + return recorderCompareVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderTypeWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderTypeWrapper.java new file mode 100644 index 00000000..98f361d4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/RecorderTypeWrapper.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.RecorderTypeEntity; +import org.springblade.desk.device.pojo.vo.RecorderTypeVO; + +import java.util.Objects; + +/** + * 记录仪分类 包装类,返回视图层所需的字段 + * + * @author qyl + * @since 2025-12-29 + */ +public class RecorderTypeWrapper extends BaseEntityWrapper { + + public static RecorderTypeWrapper build() { + return new RecorderTypeWrapper(); + } + + @Override + public RecorderTypeVO entityVO(RecorderTypeEntity recorderType) { + RecorderTypeVO recorderTypeVO = Objects.requireNonNull(BeanUtil.copyProperties(recorderType, RecorderTypeVO.class)); + + //User createUser = UserCache.getUser(recorderType.getCreateUser()); + //User updateUser = UserCache.getUser(recorderType.getUpdateUser()); + //recorderTypeVO.setCreateUserName(createUser.getName()); + //recorderTypeVO.setUpdateUserName(updateUser.getName()); + + return recorderTypeVO; + } + + +} From a9808c49e62df654468b865dd079b8414f0d7851 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Tue, 30 Dec 2025 14:46:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=BB=E5=8A=A8equipment=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=88=B0desk-api=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pojo/entity/EquipmentEntity.java | 4 +- .../controller/YieldOrderController.java | 11 ++ .../controller/EquipmentController.java | 30 +++-- .../scheduling/entity/EquipmentEntity.java | 119 ------------------ .../scheduling/mapper/EquipmentMapper.java | 3 +- .../scheduling/mapper/EquipmentMapper.xml | 2 +- .../scheduling/service/IEquipmentService.java | 3 +- .../service/impl/EquipmentServiceImpl.java | 2 +- .../scheduling/scheduling/vo/EquipmentVO.java | 2 +- .../scheduling/wrapper/EquipmentWrapper.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- 11 files changed, 34 insertions(+), 146 deletions(-) delete mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java index 90350af0..532ff79c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java @@ -37,8 +37,8 @@ import java.math.BigDecimal; /** * 设备信息表 实体类 * - * @author qyl - * @since 2025-12-26 + * @author BladeX + * @since 2025-12-22 */ @Data @TableName("MES_EQUIPMENT") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 7314e3a4..e4172046 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -19,6 +19,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.order.pojo.enums.YieldOrderEnum; import org.springblade.desk.order.pojo.vo.YieldOrderVo; import org.springblade.desk.order.service.IYieldOrderCraftService; import org.springblade.desk.order.service.IYieldOrderService; @@ -124,6 +125,16 @@ public class YieldOrderController extends BladeController { return R.status(result); } + /** + * 批量关闭 + */ + @PostMapping("/closeBatch") + @Operation(summary = "批量关闭", description = "传入ids") + public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + Boolean result = yieldOrderService.changeStatus(Func.toLongList(ids), YieldOrderEnum.STATUS_CLOSED.getCategory()); + return R.status(result); + } + /** * 工艺路线 */ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java index 3d21442e..4b538ade 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java @@ -25,35 +25,33 @@ */ package org.springblade.scheduling.scheduling.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; 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 io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.scheduling.scheduling.entity.CraftAbilityEntity; -import org.springblade.scheduling.scheduling.entity.EquipmentEntity; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.scheduling.scheduling.excel.EquipmentExcel; import org.springblade.scheduling.scheduling.service.IEquipmentService; import org.springblade.scheduling.scheduling.vo.EquipmentVO; import org.springblade.scheduling.scheduling.wrapper.EquipmentWrapper; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -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; +import java.util.Map; /** * 设备信息表 控制器 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java deleted file mode 100644 index 88e786e7..00000000 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipmentEntity.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package org.springblade.scheduling.scheduling.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 BladeX - * @since 2025-12-22 - */ -@Data -@TableName("MES_EQUIPMENT") -@Schema(description = "MesEquipment对象") -@EqualsAndHashCode(callSuper = true) -public class EquipmentEntity extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备编码 - */ - @Schema(description = "设备编码") - private String deviceCode; - /** - * 设备名称 - */ - @Schema(description = "设备名称") - private String deviceName; - /** - * 类别名称 - */ - @Schema(description = "类别名称") - private String typeName; - /** - * 规格型号 - */ - @Schema(description = "规格型号") - private String macSpec; - /** - * 服役状态;1、正常服役，2、暂停服役 - */ - @Schema(description = "服役状态;1、正常服役，2、暂停服役") - private BigDecimal used; - /** - * RFID - */ - @Schema(description = "RFID") - private String rfId; - /** - * 虚拟设备;1.是, 0.否 - */ - @Schema(description = "虚拟设备;1.是, 0.否") - private String virtualMac; - /** - * 是否对接;1.是, 0.否 - */ - @Schema(description = "是否对接;1.是, 0.否") - private String docking; - /** - * 类别说明 - */ - @Schema(description = "类别说明") - private String memo; - /** - * 绑定数量 - */ - @Schema(description = "绑定数量") - private BigDecimal bindQty; - /** - * 设备分类 - */ - @Schema(description = "设备分类") - private String category; - /** - * 设备ip - */ - @Schema(description = "设备ip") - private String deviceIp; - /** - * 设备分类 - */ - @Schema(description = "设备分类") - private String categorys; - -} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java index 46f2f71a..858d9d27 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.java @@ -29,7 +29,7 @@ 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 org.springblade.scheduling.scheduling.entity.EquipmentEntity; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.scheduling.scheduling.excel.EquipmentExcel; import org.springblade.scheduling.scheduling.vo.EquipmentVO; @@ -47,7 +47,6 @@ public interface EquipmentMapper extends BaseMapper { * 自定义分页 * * @param page 分页参数 - * @param Equipment 查询参数 * @return List */ List selectEquipmentPage(IPage page, EquipmentVO equipment); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml index 6cf118c4..4222149c 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipmentMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java index 8e8532e3..d020a75e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IEquipmentService.java @@ -28,7 +28,7 @@ package org.springblade.scheduling.scheduling.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.scheduling.scheduling.entity.EquipmentEntity; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.scheduling.scheduling.excel.EquipmentExcel; import org.springblade.scheduling.scheduling.vo.EquipmentVO; @@ -45,7 +45,6 @@ public interface IEquipmentService extends BaseService { * 自定义分页 * * @param page 分页参数 - * @param Equipment 查询参数 * @return IPage */ IPage selectEquipmentPage(IPage page, EquipmentVO equipment); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java index 8b2c0fdb..0a7efba4 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipmentServiceImpl.java @@ -25,7 +25,7 @@ */ package org.springblade.scheduling.scheduling.service.impl; -import org.springblade.scheduling.scheduling.entity.EquipmentEntity; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.scheduling.scheduling.excel.EquipmentExcel; import org.springblade.scheduling.scheduling.mapper.EquipmentMapper; import org.springblade.scheduling.scheduling.service.IEquipmentService; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java index 4d039c09..d298f3f6 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipmentVO.java @@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.vo; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.scheduling.scheduling.entity.EquipmentEntity; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import java.io.Serial; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java index fdc3c8ac..8e836ed2 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/EquipmentWrapper.java @@ -27,7 +27,7 @@ package org.springblade.scheduling.scheduling.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.scheduling.scheduling.entity.EquipmentEntity; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.scheduling.scheduling.vo.EquipmentVO; import java.util.Objects; diff --git a/blade-service/blade-scheduling/src/main/resources/application-dev.yml b/blade-service/blade-scheduling/src/main/resources/application-dev.yml index f9ffb828..9d3ffc88 100644 --- a/blade-service/blade-scheduling/src/main/resources/application-dev.yml +++ b/blade-service/blade-scheduling/src/main/resources/application-dev.yml @@ -13,4 +13,4 @@ business: oldMes: url: 192.168.169.172:9000 # url: 127.0.0.1:32111 - pushApsResult: /zhgd-rb/aiWebapi/pushApsResult + pushApsResult: /zhgd-rb/aiWebapi/receiveApsResult From 2924d20b3219cbaf5a83857aa826cb19cd228068 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Tue, 30 Dec 2025 15:41:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E3=80=81=E9=87=8F=E5=85=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A8=E3=80=81=E9=87=8F=E5=85=B7=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E8=A1=A8=E9=80=86=E5=90=91=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?+=E5=88=86=E9=A1=B5=E6=9D=A1=E4=BB=B6=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pojo/entity/MeaToolEntity.java | 47 ++++++ .../pojo/entity/MeasuringUpkeepEntity.java | 62 ++++++++ .../pojo/entity/UpkeepRecordsEntity.java | 71 +++++++++ .../desk/device/pojo/excel/MeaToolExcel.java | 70 +++++++++ .../pojo/excel/MeasuringUpkeepExcel.java | 88 ++++++++++++ .../device/pojo/excel/UpkeepRecordsExcel.java | 100 +++++++++++++ .../desk/device/pojo/vo/MeaToolVO.java | 31 ++++ .../device/pojo/vo/MeasuringUpkeepVO.java | 31 ++++ .../desk/device/pojo/vo/UpkeepRecordsVO.java | 31 ++++ .../device/controller/MeaToolController.java | 135 ++++++++++++++++++ .../controller/MeasuringUpkeepController.java | 135 ++++++++++++++++++ .../controller/RecorderCompareController.java | 2 +- .../controller/RecorderTypeController.java | 2 +- .../controller/UpkeepRecordsController.java | 135 ++++++++++++++++++ .../desk/device/mapper/MeaToolMapper.java | 39 +++++ .../desk/device/mapper/MeaToolMapper.xml | 34 +++++ .../device/mapper/MeasuringUpkeepMapper.java | 39 +++++ .../device/mapper/MeasuringUpkeepMapper.xml | 37 +++++ .../device/mapper/UpkeepRecordsMapper.java | 39 +++++ .../device/mapper/UpkeepRecordsMapper.xml | 39 +++++ .../desk/device/service/IMeaToolService.java | 37 +++++ .../service/IMeasuringUpkeepService.java | 37 +++++ .../device/service/IUpkeepRecordsService.java | 37 +++++ .../service/impl/MeaToolServiceImpl.java | 53 +++++++ .../impl/MeasuringUpkeepServiceImpl.java | 53 +++++++ .../impl/UpkeepRecordsServiceImpl.java | 53 +++++++ .../desk/device/wrapper/MeaToolWrapper.java | 35 +++++ .../wrapper/MeasuringUpkeepWrapper.java | 35 +++++ .../device/wrapper/UpkeepRecordsWrapper.java | 35 +++++ 29 files changed, 1540 insertions(+), 2 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeaToolEntity.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/MeasuringUpkeepEntity.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/UpkeepRecordsEntity.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeaToolExcel.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeasuringUpkeepExcel.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/UpkeepRecordsExcel.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeaToolVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/MeasuringUpkeepVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/UpkeepRecordsVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeaToolController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/UpkeepRecordsController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeaToolMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/UpkeepRecordsMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeaToolService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeasuringUpkeepService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IUpkeepRecordsService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeaToolServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeasuringUpkeepServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/UpkeepRecordsServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeaToolWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/MeasuringUpkeepWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/device/wrapper/UpkeepRecordsWrapper.java 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; + } + + +}