From 831a2cbed345585131ffa9d4907feb4b1bcf927b Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Fri, 7 Nov 2025 10:09:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E8=B0=83=E6=95=B4=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9F=A5=E8=AF=86=E5=BA=93=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一为 DMS 相关控制器添加 "/dms" 路径前缀 - 优化 DmsKnowledgeRepairMapper.xml 中主键生成逻辑 - 移除 DmsKnowledgeRepairService 中未使用的附件信息处理代码 - 注释掉与附件存储相关的冗余业务逻辑- 清理无用的导入包和变量声明 --- .../DmsBaseAlarmRuleController.java | 2 +- .../DmsBaseDeviceBomController.java | 2 +- .../DmsBaseDeviceDebuggingController.java | 2 +- .../DmsBaseDeviceDepreciationController.java | 2 +- .../DmsBaseDeviceFilesController.java | 2 +- .../DmsBaseDeviceInstallController.java | 2 +- .../DmsBaseDevicePurchaseController.java | 2 +- .../DmsBaseDeviceSuplierController.java | 2 +- .../DmsBaseDeviceSuppliesController.java | 2 +- .../DmsBaseDeviceTypeController.java | 2 +- .../DmsBaseOutsrcInfoController.java | 2 +- .../DmsBaseSpecialdeviceParamController.java | 2 +- .../DmsBaseTransferInfoController.java | 2 +- .../DmsFlowCheckplanController.java | 2 +- .../DmsFlowCheckplanDetailController.java | 2 +- .../DmsKnowledgeLubeController.java | 2 +- .../DmsKnowledgeMaintController.java | 2 +- .../DmsKnowledgeRepairController.java | 2 +- .../impl/DmsKnowledgeRepairServiceImpl.java | 39 +++++++------------ .../mapper/dms/DmsKnowledgeRepairMapper.xml | 7 +++- 20 files changed, 37 insertions(+), 45 deletions(-) diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseAlarmRuleController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseAlarmRuleController.java index de5e61c..e043240 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseAlarmRuleController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseAlarmRuleController.java @@ -21,7 +21,7 @@ import java.util.List; * @date 2024-08-13 */ @RestController -@RequestMapping("/dmsBaseAlarmRule") +@RequestMapping("/dms/dmsBaseAlarmRule") public class DmsBaseAlarmRuleController extends BaseController { @Autowired private IDmsBaseAlarmRuleService dmsBaseAlarmRuleService; diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceBomController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceBomController.java index 1388279..68a3061 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceBomController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceBomController.java @@ -28,7 +28,7 @@ import java.util.List; * @date 2023-12-28 */ @RestController -@RequestMapping("/bom") +@RequestMapping("/dms/bom") public class DmsBaseDeviceBomController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDebuggingController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDebuggingController.java index f72f124..433a28a 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDebuggingController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDebuggingController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-01-02 */ @RestController -@RequestMapping("/debugging") +@RequestMapping("/dms/debugging") public class DmsBaseDeviceDebuggingController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDepreciationController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDepreciationController.java index 3fb6bba..4b3cd79 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDepreciationController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceDepreciationController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2023-12-27 */ @RestController -@RequestMapping("/devicedepreciation") +@RequestMapping("/dms/devicedepreciation") public class DmsBaseDeviceDepreciationController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceFilesController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceFilesController.java index f0726b9..d6a9bcc 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceFilesController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceFilesController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-01-09 */ @RestController -@RequestMapping("/dmsFiles") +@RequestMapping("/dms/dmsFiles") public class DmsBaseDeviceFilesController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceInstallController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceInstallController.java index 68adaaa..214d61e 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceInstallController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceInstallController.java @@ -34,7 +34,7 @@ import java.util.List; * @date 2024-01-02 */ @RestController -@RequestMapping("/install") +@RequestMapping("/dms/install") public class DmsBaseDeviceInstallController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDevicePurchaseController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDevicePurchaseController.java index 76fa326..64c7b4b 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDevicePurchaseController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDevicePurchaseController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-01-09 */ @RestController -@RequestMapping("/purchase") +@RequestMapping("/dms/purchase") public class DmsBaseDevicePurchaseController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuplierController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuplierController.java index 9e06ea3..751f374 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuplierController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuplierController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2023-12-28 */ @RestController -@RequestMapping("/suplier") +@RequestMapping("/dms/suplier") public class DmsBaseDeviceSuplierController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuppliesController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuppliesController.java index 1ff2deb..31189ff 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuppliesController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceSuppliesController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-09-19 */ @RestController -@RequestMapping("/dmsBaseDeviceSupplies") +@RequestMapping("/dms/dmsBaseDeviceSupplies") public class DmsBaseDeviceSuppliesController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceTypeController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceTypeController.java index 9798187..ed900ae 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceTypeController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseDeviceTypeController.java @@ -28,7 +28,7 @@ import java.util.List; * @date 2023-12-27 */ @RestController -@RequestMapping("/devicetype") +@RequestMapping("/dms/devicetype") public class DmsBaseDeviceTypeController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseOutsrcInfoController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseOutsrcInfoController.java index 9638150..eda4027 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseOutsrcInfoController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseOutsrcInfoController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-01-11 */ @RestController -@RequestMapping("/dmsInfo") +@RequestMapping("/dms/dmsInfo") public class DmsBaseOutsrcInfoController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseSpecialdeviceParamController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseSpecialdeviceParamController.java index 7641289..2553f93 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseSpecialdeviceParamController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseSpecialdeviceParamController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-01-09 */ @RestController -@RequestMapping("/specialDeviceParam") +@RequestMapping("/dms/specialDeviceParam") public class DmsBaseSpecialdeviceParamController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseTransferInfoController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseTransferInfoController.java index 6886930..a4e89dd 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseTransferInfoController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseTransferInfoController.java @@ -28,7 +28,7 @@ import java.util.List; * @date 2024-01-02 */ @RestController -@RequestMapping("/info") +@RequestMapping("/dms/info") public class DmsBaseTransferInfoController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanController.java index 8b26a76..0d10764 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2023-12-29 */ @RestController -@RequestMapping("/checkplan") +@RequestMapping("/dms/checkplan") public class DmsFlowCheckplanController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanDetailController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanDetailController.java index ffaa512..af3c493 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanDetailController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFlowCheckplanDetailController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-01-02 */ @RestController -@RequestMapping("/detail") +@RequestMapping("/dms/detail") public class DmsFlowCheckplanDetailController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeLubeController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeLubeController.java index f545246..ca55575 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeLubeController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeLubeController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-02-26 */ @RestController -@RequestMapping("/knowledgeLube") +@RequestMapping("/dms/knowledgeLube") public class DmsKnowledgeLubeController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeMaintController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeMaintController.java index 1f0b6a4..f6b9370 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeMaintController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeMaintController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-02-26 */ @RestController -@RequestMapping("/konwledgeMaint") +@RequestMapping("/dms/konwledgeMaint") public class DmsKnowledgeMaintController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeRepairController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeRepairController.java index 62a9179..528e5ca 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeRepairController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsKnowledgeRepairController.java @@ -30,7 +30,7 @@ import java.util.List; * @date 2024-02-26 */ @RestController -@RequestMapping("/knowledgeRepair") +@RequestMapping("/dms/knowledgeRepair") public class DmsKnowledgeRepairController extends BaseController { @Autowired diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeRepairServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeRepairServiceImpl.java index f6fdd46..84964f0 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeRepairServiceImpl.java +++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsKnowledgeRepairServiceImpl.java @@ -1,29 +1,14 @@ package com.aucma.dms.service.impl; -//import com.hw.common.core.constant.DmsConstants; -//import com.hw.common.core.exception.ServiceException; -//import com.hw.common.core.utils.DateUtils; -//import com.aucma.dms.domain.BaseAttachInfo; -//import com.aucma.dms.domain.DmsKnowledgeRepair; -//import com.aucma.dms.mapper.BaseAttachInfoMapper; -//import com.aucma.dms.mapper.DmsKnowledgeRepairMapper; -//import com.aucma.dms.service.IDmsKnowledgeRepairService; -//import com.hw.system.api.domain.SysFile; -import com.aucma.common.constant.DmsConstants; import com.aucma.common.exception.ServiceException; import com.aucma.common.utils.DateUtils; -import com.aucma.dms.domain.BaseAttachInfo; import com.aucma.dms.domain.DmsKnowledgeRepair; -import com.aucma.dms.mapper.BaseAttachInfoMapper; import com.aucma.dms.mapper.DmsKnowledgeRepairMapper; import com.aucma.dms.service.IDmsKnowledgeRepairService; -import com.aucma.framework.web.domain.server.SysFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -38,8 +23,8 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService @Autowired private DmsKnowledgeRepairMapper dmsKnowledgeRepairMapper; - @Autowired - private BaseAttachInfoMapper baseAttachInfoMapper; +/* @Autowired + private BaseAttachInfoMapper baseAttachInfoMapper;*/ /** * 查询维修知识库 @@ -51,7 +36,7 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService public DmsKnowledgeRepair selectDmsKnowledgeRepairByKnowledgeRepairId(Long knowledgeRepairId) { DmsKnowledgeRepair dmsKnowledgeRepair = dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId); - List baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId()); +/* List baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId()); List sysFiles = new ArrayList(); // for (String string:baseAttachInfos){ @@ -59,7 +44,7 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService // sysFile.setUrl(string); // sysFiles.add(sysFile); // } - dmsKnowledgeRepair.setSystemFiles(sysFiles); + dmsKnowledgeRepair.setSystemFiles(sysFiles);*/ return dmsKnowledgeRepair; } @@ -92,9 +77,10 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService dmsKnowledgeRepair.setCreateTime(DateUtils.getNowDate()); dmsKnowledgeRepair.setIsFlag("1"); int i = dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair); - //存储图片 + +/* //存储图片 List fileUrls = dmsKnowledgeRepair.getFileUrls(); - batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId()); + batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId());*/ return i; } @@ -118,13 +104,14 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService } dmsKnowledgeRepair.setUpdateTime(DateUtils.getNowDate()); int i = dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair); - baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId()); +// baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId()); //存储图片 - List fileUrls = dmsKnowledgeRepair.getFileUrls(); +/* List fileUrls = dmsKnowledgeRepair.getFileUrls(); if(fileUrls!=null) { batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId()); - } + }*/ + return i; } @@ -152,7 +139,7 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService return dmsKnowledgeRepairMapper.deleteDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId); } - public void batchInsertInstanceFiles(List fileUrls, Long knowledgeLubeId ) { +/* public void batchInsertInstanceFiles(List fileUrls, Long knowledgeLubeId ) { if (fileUrls != null && !fileUrls.isEmpty()) { List baseAttachInfos = new ArrayList<>(); @@ -167,5 +154,5 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService } baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos); } - } + }*/ } diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml index 51aa863..77beea0 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsKnowledgeRepairMapper.xml @@ -40,9 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where knowledge_repair_id = #{knowledgeRepairId} - + + + SELECT SEQ_DMS_KNOWLEDGE_REPAIR.NEXTVAL FROM DUAL + insert into dms_knowledge_repair + knowledge_repair_id, experience_code, device_type_id, fault_description, @@ -56,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, + #{knowledgeRepairId}, #{experienceCode}, #{deviceTypeId}, #{faultDescription},