From 8f69ef0d2003deccbd46c61b8087799dc2a75517 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 29 Nov 2024 16:30:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=E9=87=8D=E6=9E=84):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E5=93=81=E4=B8=AD=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=9C=80=E6=B1=82=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对用户需求的创建和编辑操作进行记录 Signed-off-by: OTTO <731554297@qq.com> --- .../enums/ProductContentModifyOperation.java | 21 +++++++++++++++++++ .../domain/vo/ProductUserReqInputVo.java | 13 ++++++++++++ .../domain/vo/ProductUserReqUpdateVo.java | 13 ++++++++++++ ...sProductReqOperationRecordServiceImpl.java | 3 +++ .../PmsProductRequirementServiceImpl.java | 8 +++++-- 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductContentModifyOperation.java diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductContentModifyOperation.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductContentModifyOperation.java new file mode 100644 index 000000000..a8eb787eb --- /dev/null +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductContentModifyOperation.java @@ -0,0 +1,21 @@ +package com.microservices.pms.product.domain.enums; + +import lombok.Getter; + +/** + * 产品需求状态 + * + * @author OTTO + */ +@Getter +public enum ProductContentModifyOperation { + CREATE("create", "创建"), + EDIT("edit", "编辑"); + private final String key; + private final String name; + + ProductContentModifyOperation(String key, String name) { + this.key = key; + this.name = name; + } +} diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java index 279649e73..199874638 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqInputVo.java @@ -1,7 +1,10 @@ package com.microservices.pms.product.domain.vo; import com.microservices.common.core.utils.bean.BeanUtils; +import com.microservices.pms.product.domain.PmsProductReqOperationRecord; import com.microservices.pms.product.domain.PmsProductRequirement; +import com.microservices.pms.product.domain.enums.ProductContentModifyOperation; +import com.microservices.pms.product.domain.enums.ProductReqOperationType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -70,4 +73,14 @@ public class ProductUserReqInputVo { BeanUtils.copyProperties(this, target); return target; } + + public PmsProductReqOperationRecord toPmsProductReqOperationRecord(PmsProductRequirement pmsProductRequirement) { + PmsProductReqOperationRecord record = new PmsProductReqOperationRecord(); + record.setProductRequirementId(pmsProductRequirement.getId()); + record.setType(ProductReqOperationType.CONTENT_MODIFY.getKey()); + record.setOperation(ProductContentModifyOperation.CREATE.getKey()); + record.setOperator(pmsProductRequirement.getCreateBy()); + record.setOperatingTime(pmsProductRequirement.getCreateTime()); + return record; + } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java index de16b85d4..a4bb4dce0 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqUpdateVo.java @@ -1,7 +1,10 @@ package com.microservices.pms.product.domain.vo; import com.microservices.common.core.utils.bean.BeanUtils; +import com.microservices.pms.product.domain.PmsProductReqOperationRecord; import com.microservices.pms.product.domain.PmsProductRequirement; +import com.microservices.pms.product.domain.enums.ProductContentModifyOperation; +import com.microservices.pms.product.domain.enums.ProductReqOperationType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -57,4 +60,14 @@ public class ProductUserReqUpdateVo { BeanUtils.copyProperties(this, target); return target; } + + public PmsProductReqOperationRecord toPmsProductReqOperationRecord(PmsProductRequirement pmsProductRequirement) { + PmsProductReqOperationRecord record = new PmsProductReqOperationRecord(); + record.setProductRequirementId(pmsProductRequirement.getId()); + record.setType(ProductReqOperationType.CONTENT_MODIFY.getKey()); + record.setOperation(ProductContentModifyOperation.EDIT.getKey()); + record.setOperator(pmsProductRequirement.getUpdateBy()); + record.setOperatingTime(pmsProductRequirement.getUpdateTime()); + return record; + } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java index 031bc07af..e2f5fbe58 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductReqOperationRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.microservices.pms.product.service.impl; import com.microservices.common.core.utils.DateUtils; +import com.microservices.common.security.utils.SecurityUtils; import com.microservices.pms.product.domain.PmsProductReqOperationRecord; import com.microservices.pms.product.mapper.PmsProductReqOperationRecordMapper; import com.microservices.pms.product.service.IPmsProductReqOperationRecordService; @@ -50,6 +51,7 @@ public class PmsProductReqOperationRecordServiceImpl implements IPmsProductReqOp */ @Override public int insertPmsProductReqOperationRecord(PmsProductReqOperationRecord pmsProductReqOperationRecord) { + pmsProductReqOperationRecord.setCreateBy(SecurityUtils.getUsername()); pmsProductReqOperationRecord.setCreateTime(DateUtils.getNowDate()); return pmsProductReqOperationRecordMapper.insertPmsProductReqOperationRecord(pmsProductReqOperationRecord); } @@ -62,6 +64,7 @@ public class PmsProductReqOperationRecordServiceImpl implements IPmsProductReqOp */ @Override public int updatePmsProductReqOperationRecord(PmsProductReqOperationRecord pmsProductReqOperationRecord) { + pmsProductReqOperationRecord.setUpdateBy(SecurityUtils.getUsername()); pmsProductReqOperationRecord.setUpdateTime(DateUtils.getNowDate()); return pmsProductReqOperationRecordMapper.updatePmsProductReqOperationRecord(pmsProductReqOperationRecord); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java index 62e0f5df5..48c999a6b 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java @@ -218,6 +218,8 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS pmsProductService.updatePmsProductChange(pmsProductRequirement.getPmsProductIdentifier()); pmsProductRequirementMapper.insertPmsProductRequirement(pmsProductRequirement); + pmsProductReqOperationRecordService.insertPmsProductReqOperationRecord( + productUserReqInputVo.toPmsProductReqOperationRecord(pmsProductRequirement)); return pmsProductRequirement.getId(); } @@ -237,8 +239,10 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS } // 检查附件列表是否有异常数据 pmsCommonService.getAllFileByFileIdentifiers(pmsProductRequirement.getFileIdentifiers()); - - return updateRequirement(pmsProductRequirement, oldPmsProductRequirement.getPmsProductIdentifier()); + int success = updateRequirement(pmsProductRequirement, oldPmsProductRequirement.getPmsProductIdentifier()); + pmsProductReqOperationRecordService.insertPmsProductReqOperationRecord( + productUserReqUpdateVo.toPmsProductReqOperationRecord(pmsProductRequirement)); + return success; } private int updateRequirement(PmsProductRequirement pmsProductRequirement, String productIdentifier) {