From cccbfadcb6e96c23a33c40c0687a27c2f6efa1db Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 13:16:42 +0800
Subject: [PATCH] feat(seal): 添加印章详情及图片预览功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
index 2325b04..b234c88 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
@@ -4,8 +4,10 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.operatelog.core.util.OperateLogUtils;
import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.MesDvMachineryImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.MesDvMachineryImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.machinery.vo.MesDvMachineryPageReqVO;
@@ -21,6 +23,7 @@
import cn.iocoder.yudao.module.mes.service.dv.repair.MesDvRepairService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkshopService;
import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService;
+import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -34,11 +37,12 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.mes.enums.LogRecordConstants.*;
/**
* MES 璁惧鍙拌处 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -144,7 +148,8 @@
return;
}
if (ObjUtil.notEqual(machinery.getId(), id)) {
- throw exception(DV_MACHINERY_CODE_DUPLICATE);
+ throw new ServiceException(DV_MACHINERY_CODE_DUPLICATE.getCode(),
+ "璁惧缂栧彿[" + code + "]宸茶璁惧[" + machinery.getName() + "]浣跨敤锛岃鏇存崲缂栧彿锛屾垨鐐瑰嚮鈥滆嚜鍔ㄧ敓鎴愨�濋噸鏂扮敓鎴�");
}
}
@@ -197,6 +202,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @LogRecord(type = MES_DV_MACHINERY_TYPE, subType = MES_DV_MACHINERY_IMPORT_SUB_TYPE, bizNo = "0",
+ success = MES_DV_MACHINERY_IMPORT_SUCCESS)
public MesDvMachineryImportRespVO importMachineryList(List<MesDvMachineryImportExcelVO> importMachineryList,
boolean updateSupport) {
// 1. 鍙傛暟鏍￠獙
@@ -231,7 +238,7 @@
// 3.1 鏍￠獙蹇呭～瀛楁
String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
if (StrUtil.isBlank(importItem.getCode())) {
- respVO.getFailureCodes().put(key, "璁惧缂栫爜涓嶈兘涓虹┖");
+ respVO.getFailureCodes().put(key, "璁惧缂栧彿涓嶈兘涓虹┖");
return;
}
if (StrUtil.isBlank(importItem.getName())) {
@@ -295,9 +302,11 @@
respVO.getUpdateCodes().add(importItem.getCode());
} else {
// 涓嶆敮鎸佹洿鏂�
- respVO.getFailureCodes().put(key, "璁惧缂栫爜宸插瓨鍦�");
+ respVO.getFailureCodes().put(key, "璁惧缂栧彿宸插瓨鍦紝濡傞渶瑕嗙洊璇峰嬀閫夆�滄槸鍚﹁鐩栤�濆悗閲嶆柊瀵煎叆");
}
});
+ // 璁板綍瀵煎叆缁撴灉姹囨�伙紝渚� @LogRecord 鐨� success 鏂囨寮曠敤
+ OperateLogUtils.putImportSummary(respVO.getCreateCodes(), respVO.getUpdateCodes(), respVO.getFailureCodes());
return respVO;
}
--
Gitblit v1.9.3