From 31a2b4acd1c9663d52378e24a90905369f102167 Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 20 Nov 2024 12:07:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E5=A2=9E=E5=8A=A0=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=92=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 AssetsRespVO 和 AssetsDO 中添加 typeName 和 type 字段 - 在 AssetsServiceImpl 中实现资产类型名称和类型的查询 - 在 FactoryForkliftRespVO 和 FactoryForkliftSaveReqVO 中添加设备代码和出厂编号字段 - 在 FactoryForkliftDO 中添加设备代码和出厂编号字段 --- .../controller/admin/assets/vo/AssetsRespVO.java | 6 +++++- .../module/system/dal/dataobject/assets/AssetsDO.java | 9 ++++++++- .../system/service/assets/AssetsServiceImpl.java | 7 +++++-- .../factoryforklift/vo/FactoryForkliftRespVO.java | 6 ++++++ .../factoryforklift/vo/FactoryForkliftSaveReqVO.java | 8 +++++++- .../dataobject/factoryforklift/FactoryForkliftDO.java | 11 ++++++++++- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/AssetsRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/AssetsRespVO.java index b4196b34..90417bb2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/AssetsRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/AssetsRespVO.java @@ -46,6 +46,10 @@ public class AssetsRespVO { @ExcelProperty("资产类型id") private Long typeId; + @Schema(description = "资产类型名称", example = "5169") + @ExcelProperty("资产类型名称") + private String typeName; + @Schema(description = "其余信息(json)") @ExcelProperty("其余信息(json)") private String itemJson; @@ -56,4 +60,4 @@ public class AssetsRespVO { @Schema(description = "资产类型 0按量 1按单件") private Integer type; -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/assets/AssetsDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/assets/AssetsDO.java index 1ff14bc9..d2fc5703 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/assets/AssetsDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/assets/AssetsDO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.system.dal.dataobject.assets; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -66,4 +68,9 @@ public class AssetsDO extends BaseDO { */ @TableField(exist = false) private Integer type; -} \ No newline at end of file + /** + * 资产类型名称 + */ + @TableField(exist = false) + private String typeName; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/assets/AssetsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/assets/AssetsServiceImpl.java index 02a338c3..272ff2d7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/assets/AssetsServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/assets/AssetsServiceImpl.java @@ -19,7 +19,6 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -70,7 +69,11 @@ public class AssetsServiceImpl implements AssetsService { @Override public AssetsDO getAssets(Long id) { - return assetsMapper.selectById(id); + AssetsDO assetsDO = assetsMapper.selectById(id); + AssetsTypeDO assetsTypeDO = assetsTypeMapper.selectById(assetsDO.getTypeId()); + assetsDO.setTypeName(assetsTypeDO.getName()); + assetsDO.setType(assetsTypeDO.getType()); + return assetsDO; } @Override diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftRespVO.java index d571f011..56f8d9a8 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftRespVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftRespVO.java @@ -50,6 +50,12 @@ public class FactoryForkliftRespVO { @ExcelProperty("厂商") private String manufacturer; + @Schema(description = "设备代码") + private String equipmentCode; + + @Schema(description = "出厂编号") + private String serialNo; + @Schema(description = "型号") @ExcelProperty("型号") private String modelNo; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftSaveReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftSaveReqVO.java index a80421b8..f98e433c 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftSaveReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryforklift/vo/FactoryForkliftSaveReqVO.java @@ -30,6 +30,12 @@ public class FactoryForkliftSaveReqVO { @Schema(description = "厂商") private String manufacturer; + @Schema(description = "设备代码") + private String equipmentCode; + + @Schema(description = "出厂编号") + private String serialNo; + @Schema(description = "型号") private String modelNo; @@ -42,4 +48,4 @@ public class FactoryForkliftSaveReqVO { @Schema(description = "用途类型 根据字典值来匹配", example = "1") private Integer useType; -} \ No newline at end of file +} diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryforklift/FactoryForkliftDO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryforklift/FactoryForkliftDO.java index 7a7036dc..cb354796 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryforklift/FactoryForkliftDO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryforklift/FactoryForkliftDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryforklift; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -47,6 +48,14 @@ public class FactoryForkliftDO extends BaseDO { * 厂商 */ private String manufacturer; + /** + * 设备代码 + */ + private String equipmentCode; + /** + * 出厂编号 + */ + private String serialNo; /** * 型号 */ @@ -64,4 +73,4 @@ public class FactoryForkliftDO extends BaseDO { */ private Integer useType; -} \ No newline at end of file +}