refactor(dms): 调整控制器请求路径并优化知识库维修服务实现

- 统一为 DMS 相关控制器添加 "/dms" 路径前缀
- 优化 DmsKnowledgeRepairMapper.xml 中主键生成逻辑
- 移除 DmsKnowledgeRepairService 中未使用的附件信息处理代码
- 注释掉与附件存储相关的冗余业务逻辑- 清理无用的导入包和变量声明

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
+/*        List<String> baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId());
         List<SysFile> sysFiles = new ArrayList<SysFile>();
 
 //        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<String> 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<String> fileUrls = dmsKnowledgeRepair.getFileUrls();
+/*        List<String> 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<String> fileUrls, Long knowledgeLubeId ) {
+/*    public void batchInsertInstanceFiles(List<String> fileUrls, Long knowledgeLubeId ) {
         if (fileUrls != null && !fileUrls.isEmpty()) {
 
             List<BaseAttachInfo> baseAttachInfos = new ArrayList<>();
@@ -167,5 +154,5 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService
             }
             baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos);
         }
-    }
+    }*/
 }

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>
 
-    <insert id="insertDmsKnowledgeRepair" parameterType="DmsKnowledgeRepair" useGeneratedKeys="true" keyProperty="knowledgeRepairId">
+    <insert id="insertDmsKnowledgeRepair" parameterType="DmsKnowledgeRepair">
+        <selectKey keyProperty="knowledgeRepairId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_KNOWLEDGE_REPAIR.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_knowledge_repair
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="knowledgeRepairId != null">knowledge_repair_id,</if>
             <if test="experienceCode != null">experience_code,</if>
             <if test="deviceTypeId != null">device_type_id,</if>
             <if test="faultDescription != null">fault_description,</if>
@@ -56,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="knowledgeRepairId != null">#{knowledgeRepairId},</if>
             <if test="experienceCode != null">#{experienceCode},</if>
             <if test="deviceTypeId != null">#{deviceTypeId},</if>
             <if test="faultDescription != null">#{faultDescription},</if>