From 883f5e73fbe7458fd760dbe8560dd5d8757e04cd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 13:56:29 +0800
Subject: [PATCH] refactor: 按需求表收敛范围,撤销非需求模块,补齐售后回访闭环

---
 /dev/null                                                                                                                             |  460 --------------------------------------
 .gitignore                                                                                                                            |    2 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java                 |   11 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java                        |    4 
 yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml                                                  |  176 ++++++++++++++
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java                                |    8 
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java |   12 +
 7 files changed, 190 insertions(+), 483 deletions(-)

diff --git a/.gitignore b/.gitignore
index 08656fb..4c35ec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,5 @@
 .claude/scheduled_tasks.json
 
 /.export_tmp
+# 鏈湴楠岃瘉涓撶敤锛堟湰鍦板簱蹇収涓庤鐩栭厤缃級锛岀粷涓嶅叆搴�
+.local-test/
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java
deleted file mode 100644
index af999db..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/AfterSaleProblemController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.controller.admin.problem;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemPageReqVO;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemRespVO;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemSaveReqVO;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
-import cn.iocoder.yudao.module.aftersales.service.problem.AfterSaleProblemService;
-import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
-import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
-import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "绠$悊鍚庡彴 - 鍞悗闂搴�")
-@RestController
-@RequestMapping("/aftersales/problem")
-@Validated
-public class AfterSaleProblemController {
-
-    @Resource
-    private AfterSaleProblemService problemService;
-
-    @Resource
-    private CrmCustomerApi customerApi;
-    @Resource
-    private AdminUserApi adminUserApi;
-    @Resource
-    private StorageAttachmentApi storageAttachmentApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "鍒涘缓鍞悗闂")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:create')")
-    public CommonResult<Long> createProblem(@Valid @RequestBody AfterSaleProblemSaveReqVO createReqVO) {
-        return success(problemService.createProblem(createReqVO, getLoginUserId()));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "鏇存柊鍞悗闂")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:update')")
-    public CommonResult<Boolean> updateProblem(@Valid @RequestBody AfterSaleProblemSaveReqVO updateReqVO) {
-        problemService.updateProblem(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "鍒犻櫎鍞悗闂")
-    @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:delete')")
-    public CommonResult<Boolean> deleteProblem(@RequestParam("id") Long id) {
-        problemService.deleteProblem(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "鑾峰緱鍞悗闂")
-    @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:query')")
-    public CommonResult<AfterSaleProblemRespVO> getProblem(@RequestParam("id") Long id) {
-        AfterSaleProblemDO problemDO = problemService.getProblem(id);
-        AfterSaleProblemRespVO respVO = buildProblemDetailList(List.of(problemDO)).get(0);
-        respVO.setAttachmentList(storageAttachmentApi.listAttachments("aftersales_after_sale_problem", id));
-        return success(respVO);
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "鑾峰緱鍞悗闂鍒嗛〉")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:query')")
-    public CommonResult<PageResult<AfterSaleProblemRespVO>> getProblemPage(@Valid AfterSaleProblemPageReqVO pageReqVO) {
-        PageResult<AfterSaleProblemDO> pageResult = problemService.getProblemPage(pageReqVO);
-        return success(new PageResult<>(buildProblemDetailList(pageResult.getList()), pageResult.getTotal()));
-    }
-
-    @PutMapping("/publish")
-    @Operation(summary = "鍙戝竷鍞悗闂")
-    @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:publish')")
-    public CommonResult<Boolean> publishProblem(@RequestParam("id") Long id) {
-        problemService.publishProblem(id);
-        return success(true);
-    }
-
-    @PutMapping("/disable")
-    @Operation(summary = "鍋滅敤鍞悗闂")
-    @Parameter(name = "id", description = "闂缂栧彿", required = true, example = "1")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:disable')")
-    public CommonResult<Boolean> disableProblem(@RequestParam("id") Long id) {
-        problemService.disableProblem(id);
-        return success(true);
-    }
-
-    @GetMapping("/reference")
-    @Operation(summary = "鏂板伐鍗曞彈鐞嗗弬鑰冩绱�(宸插彂甯冮棶棰�)")
-    @PreAuthorize("@ss.hasPermission('aftersales:problem:query')")
-    public CommonResult<List<AfterSaleProblemRespVO>> getReferenceList(@Valid AfterSaleProblemPageReqVO pageReqVO) {
-        return success(buildProblemDetailList(problemService.getReferenceList(pageReqVO)));
-    }
-
-    // ========== 鍐呴儴鏂规硶锛氭壒閲忔嫾瑁呭叧鑱斿悕绉� ==========
-
-    private List<AfterSaleProblemRespVO> buildProblemDetailList(List<AfterSaleProblemDO> problemList) {
-        if (CollUtil.isEmpty(problemList)) {
-            return Collections.emptyList();
-        }
-        // 1. 鎵归噺鍔犺浇瀹㈡埛鍚嶇О
-        Set<Long> customerIds = convertSet(problemList, AfterSaleProblemDO::getCustomerId);
-        Map<Long, CrmCustomerRespDTO> customerMap = customerApi.getCustomerMap(customerIds);
-        // 2. 鎵归噺鍔犺浇娌夋穩浜哄悕绉�
-        Set<Long> userIds = convertSet(problemList, AfterSaleProblemDO::getOwnerUserId);
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
-        // 3. 鎷艰鍚嶇О瀛楁
-        return BeanUtils.toBean(problemList, AfterSaleProblemRespVO.class, vo -> {
-            CrmCustomerRespDTO customer = customerMap.get(vo.getCustomerId());
-            if (customer != null) {
-                vo.setCustomerName(customer.getName());
-            }
-            AdminUserRespDTO ownerUser = userMap.get(vo.getOwnerUserId());
-            if (ownerUser != null) {
-                vo.setOwnerUserName(ownerUser.getNickname());
-            }
-        });
-    }
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java
deleted file mode 100644
index 55fc93a..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemPageReqVO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 鍞悗闂搴� - 鍒嗛〉鏌ヨ Request VO
- */
-@Schema(description = "鍞悗闂搴� - 鍒嗛〉鏌ヨ Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class AfterSaleProblemPageReqVO extends PageParam {
-
-    @Schema(description = "闂鍗曞彿", example = "AP20260813000001")
-    private String no;
-
-    @Schema(description = "鍏抽敭瀛�(鍗曞彿/鏍囬/鎻忚堪/瑙e喅鏂规)", example = "浼犳劅鍣�")
-    private String keyword;
-
-    @Schema(description = "鏉ユ簮宸ュ崟缂栧彿", example = "1")
-    private Long sourceTicketId;
-
-    @Schema(description = "鐗╂枡缂栧彿", example = "1")
-    private Long itemId;
-
-    @Schema(description = "鐗╂枡缂栫爜(妯$硦)", example = "MAT-001")
-    private String itemCode;
-
-    @Schema(description = "闂鍒嗙被", example = "鍔熻兘鏁呴殰")
-    private String issueCategory;
-
-    @Schema(description = "闂绫诲瀷", example = "1")
-    private Integer issueType;
-
-    @Schema(description = "鏍瑰洜鍒嗙被", example = "3")
-    private Integer rootCauseCategory;
-
-    @Schema(description = "鐘舵��: 0-鑽夌 1-宸插彂甯� 2-宸插仠鐢�", example = "1")
-    private Integer status;
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java
deleted file mode 100644
index 2d10593..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemRespVO.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo;
-
-import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 鍞悗闂搴� - 鍝嶅簲 VO
- */
-@Schema(description = "鍞悗闂搴� - 鍝嶅簲 VO")
-@Data
-public class AfterSaleProblemRespVO {
-
-    @Schema(description = "闂缂栧彿", example = "1")
-    private Long id;
-
-    @Schema(description = "闂鍗曞彿", example = "AP20260813000001")
-    private String no;
-
-    @Schema(description = "闂鏍囬", example = "鎷夊姏鏈轰紶鎰熷櫒鏃犺緭鍑�")
-    private String title;
-
-    @Schema(description = "鏉ユ簮宸ュ崟缂栧彿", example = "1")
-    private Long sourceTicketId;
-
-    @Schema(description = "鏉ユ簮宸ュ崟鍗曞彿(鍐椾綑)", example = "AS20260813000001")
-    private String sourceTicketNo;
-
-    @Schema(description = "瀹㈡埛缂栧彿", example = "1")
-    private Long customerId;
-
-    @Schema(description = "瀹㈡埛鍚嶇О")
-    private String customerName;
-
-    @Schema(description = "鐗╂枡缂栧彿", example = "1")
-    private Long itemId;
-
-    @Schema(description = "鐗╂枡缂栫爜", example = "MAT-001")
-    private String itemCode;
-
-    @Schema(description = "鐗╂枡鍚嶇О", example = "鐢靛瓙鍏冨櫒浠�")
-    private String itemName;
-
-    @Schema(description = "鐢熶骇鎵规缂栧彿", example = "1")
-    private Long batchId;
-
-    @Schema(description = "鐢熶骇鎵规鍙�", example = "BATCH-2024-001")
-    private String batchCode;
-
-    @Schema(description = "闂绫诲瀷", example = "1")
-    private Integer issueType;
-
-    @Schema(description = "闂鍒嗙被", example = "鍔熻兘鏁呴殰")
-    private String issueCategory;
-
-    @Schema(description = "涓ラ噸绋嬪害", example = "2")
-    private Integer severityLevel;
-
-    @Schema(description = "闂鎻忚堪")
-    private String description;
-
-    @Schema(description = "鏍瑰洜鍒嗙被", example = "3")
-    private Integer rootCauseCategory;
-
-    @Schema(description = "鏍瑰洜鍒嗘瀽")
-    private String rootCause;
-
-    @Schema(description = "瑙e喅鏂规")
-    private String solution;
-
-    @Schema(description = "鐘舵��: 0-鑽夌 1-宸插彂甯� 2-宸插仠鐢�", example = "1")
-    private Integer status;
-
-    @Schema(description = "娌夋穩浜虹敤鎴风紪鍙�", example = "1")
-    private Long ownerUserId;
-
-    @Schema(description = "娌夋穩浜哄悕绉�")
-    private String ownerUserName;
-
-    @Schema(description = "鍙戝竷鏃堕棿")
-    private LocalDateTime publishTime;
-
-    @Schema(description = "澶囨敞")
-    private String remark;
-
-    @Schema(description = "鍒涘缓鑰�")
-    private String creator;
-
-    @Schema(description = "鍒涘缓鏃堕棿")
-    private LocalDateTime createTime;
-
-    @Schema(description = "鏇存柊鑰�")
-    private String updater;
-
-    @Schema(description = "鏇存柊鏃堕棿")
-    private LocalDateTime updateTime;
-
-    @Schema(description = "闄勪欢鍒楄〃")
-    private List<StorageBlobRespDTO> attachmentList;
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java
deleted file mode 100644
index 46ea45b..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/problem/vo/AfterSaleProblemSaveReqVO.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 鍞悗闂搴� - 淇濆瓨 Request VO
- */
-@Schema(description = "鍞悗闂搴� - 淇濆瓨 Request VO")
-@Data
-public class AfterSaleProblemSaveReqVO {
-
-    @Schema(description = "闂缂栧彿", example = "1")
-    private Long id;
-
-    @Schema(description = "闂鏍囬", requiredMode = Schema.RequiredMode.REQUIRED, example = "鎷夊姏鏈轰紶鎰熷櫒鏃犺緭鍑�")
-    @NotEmpty(message = "闂鏍囬涓嶈兘涓虹┖")
-    private String title;
-
-    @Schema(description = "鏉ユ簮宸ュ崟缂栧彿(鍙�夛紝渚夸簬杩芥函)", example = "1")
-    private Long sourceTicketId;
-
-    @Schema(description = "瀹㈡埛缂栧彿", example = "1")
-    private Long customerId;
-
-    @Schema(description = "鐗╂枡缂栧彿", example = "1")
-    private Long itemId;
-
-    @Schema(description = "鐗╂枡缂栫爜", example = "MAT-001")
-    private String itemCode;
-
-    @Schema(description = "鐗╂枡鍚嶇О", example = "鐢靛瓙鍏冨櫒浠�")
-    private String itemName;
-
-    @Schema(description = "鐢熶骇鎵规缂栧彿", example = "1")
-    private Long batchId;
-
-    @Schema(description = "鐢熶骇鎵规鍙�", example = "BATCH-2024-001")
-    private String batchCode;
-
-    @Schema(description = "闂绫诲瀷: 0-鏈垽瀹� 1-涓�鑸棶棰� 2-缁翠慨闂 3-閫�璐ч棶棰�", example = "1")
-    private Integer issueType;
-
-    @Schema(description = "闂鍒嗙被", example = "鍔熻兘鏁呴殰")
-    private String issueCategory;
-
-    @Schema(description = "涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡", example = "2")
-    private Integer severityLevel;
-
-    @Schema(description = "闂鎻忚堪")
-    private String description;
-
-    @Schema(description = "鏍瑰洜鍒嗙被: 1-璁捐 2-鐗╂枡 3-宸ヨ壓 4-瑁呴厤 5-杩愯緭 6-鍖呰 7-浣跨敤 8-杞欢 9-鍏朵粬", example = "3")
-    private Integer rootCauseCategory;
-
-    @Schema(description = "鏍瑰洜鍒嗘瀽")
-    private String rootCause;
-
-    @Schema(description = "瑙e喅鏂规")
-    private String solution;
-
-    @Schema(description = "澶囨敞")
-    private String remark;
-
-    @Schema(description = "闄勪欢 blobId 鍒楄〃")
-    private List<Long> blobIds;
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
index f8031a1..990dddf 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/ticket/vo/ticket/AfterSaleTicketRespVO.java
@@ -87,6 +87,18 @@
     @Schema(description = "鍏抽棴鏃堕棿")
     private LocalDateTime closedTime;
 
+    @Schema(description = "鍥炶鐘舵�侊細0-寰呭洖璁� 1-宸插洖璁块�氳繃", example = "0")
+    private Integer visitStatus;
+
+    @Schema(description = "鏈�鍚庡洖璁挎椂闂�")
+    private LocalDateTime lastVisitTime;
+
+    @Schema(description = "鏈�鍚庡洖璁挎槸鍚︽弧鎰�")
+    private Boolean lastVisitSatisfied;
+
+    @Schema(description = "鏈�鍚庡洖璁挎槸鍚﹀鍙�")
+    private Boolean lastVisitRecurred;
+
     @Schema(description = "澶囨敞")
     private String remark;
 
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java
deleted file mode 100644
index dfd6b07..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/problem/AfterSaleProblemDO.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.dal.dataobject.problem;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.aftersales.enums.AfterSaleProblemStatusEnum;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-/**
- * 鍞悗闂搴� DO
- * <p>
- * 鐙珛鐨勭煡璇嗘矇娣�瀹炰綋锛氬伐鍗曞綊妗f椂鎸夊伐鍗曞揩鐓ц嚜鍔ㄧ敓鎴愯崏绋匡紝浜哄伐琛ュ厖鏍瑰洜/鏂规鍚庡彂甯冿紱
- * 鏂板伐鍗曞彈鐞嗘椂鍙寜鐗╂枡/鍒嗙被/鍏抽敭瀛楀懡涓凡鍙戝竷闂浣滃弬鑰冦��
- */
-@TableName("after_sale_problem")
-@KeySequence("after_sale_problem_seq")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class AfterSaleProblemDO extends BaseDO {
-
-    /**
-     * 闂缂栧彿
-     */
-    @TableId
-    private Long id;
-    /**
-     * 闂鍗曞彿锛屾牸寮� AP+yyyyMMdd+6浣�
-     */
-    private String no;
-    /**
-     * 闂鏍囬
-     */
-    private String title;
-    /**
-     * 鏉ユ簮宸ュ崟缂栧彿锛屽叧鑱� after_sale_ticket.id
-     */
-    private Long sourceTicketId;
-    /**
-     * 鏉ユ簮宸ュ崟鍗曞彿(鍐椾綑)
-     */
-    private String sourceTicketNo;
-    /**
-     * 瀹㈡埛缂栧彿(鏉ユ簮宸ュ崟甯﹀叆)
-     */
-    private Long customerId;
-    /**
-     * 鐗╂枡缂栧彿(榛樿鍙栨潵婧愬伐鍗曢鏉℃槑缁�)
-     */
-    private Long itemId;
-    /**
-     * 鐗╂枡缂栫爜(鍐椾綑)
-     */
-    private String itemCode;
-    /**
-     * 鐗╂枡鍚嶇О(鍐椾綑)
-     */
-    private String itemName;
-    /**
-     * 鐢熶骇鎵规缂栧彿(鍙��)
-     */
-    private Long batchId;
-    /**
-     * 鐢熶骇鎵规鍙�(鍙��)
-     */
-    private String batchCode;
-    /**
-     * 闂绫诲瀷锛屾灇涓� {@link cn.iocoder.yudao.module.aftersales.enums.AfterSaleIssueTypeEnum}
-     */
-    private Integer issueType;
-    /**
-     * 闂鍒嗙被
-     */
-    private String issueCategory;
-    /**
-     * 涓ラ噸绋嬪害: 0-杞诲井 1-涓�鑸� 2-涓ラ噸 3-鑷村懡
-     */
-    private Integer severityLevel;
-    /**
-     * 闂鎻忚堪
-     */
-    private String description;
-    /**
-     * 鏍瑰洜鍒嗙被锛屾灇涓� {@link cn.iocoder.yudao.module.aftersales.enums.AfterSaleRootCauseCategoryEnum}
-     */
-    private Integer rootCauseCategory;
-    /**
-     * 鏍瑰洜鍒嗘瀽
-     */
-    private String rootCause;
-    /**
-     * 瑙e喅鏂规
-     */
-    private String solution;
-    /**
-     * 鐘舵�侊紝鏋氫妇 {@link AfterSaleProblemStatusEnum}
-     */
-    private Integer status;
-    /**
-     * 娌夋穩浜虹敤鎴风紪鍙�
-     */
-    private Long ownerUserId;
-    /**
-     * 鍙戝竷鏃堕棿
-     */
-    private LocalDateTime publishTime;
-    /**
-     * 澶囨敞
-     */
-    private String remark;
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
index c546553..ac6a29c 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/ticket/AfterSaleTicketDO.java
@@ -130,15 +130,4 @@
      * 鏈�鍚庡洖璁挎槸鍚﹀鍙�
      */
     private Boolean lastVisitRecurred;
-    /**
-     * 鍏宠仈闂璁板綍缂栧彿
-     *
-     * 鍏宠仈 {@link cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO#getId()}
-     */
-    private Long problemId;
-    /**
-     * 鍏宠仈闂鍗曞彿
-     */
-    private String problemNo;
-
 }
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java
deleted file mode 100644
index db9efec..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/problem/AfterSaleProblemMapper.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.dal.mysql.problem;
-
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
-import cn.iocoder.yudao.module.aftersales.enums.AfterSaleProblemStatusEnum;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 鍞悗闂搴� Mapper
- */
-@Mapper
-public interface AfterSaleProblemMapper extends BaseMapperX<AfterSaleProblemDO> {
-
-    default AfterSaleProblemDO selectByNo(String no) {
-        return selectOne(AfterSaleProblemDO::getNo, no);
-    }
-
-    default AfterSaleProblemDO selectBySourceTicketId(Long sourceTicketId) {
-        return selectOne(AfterSaleProblemDO::getSourceTicketId, sourceTicketId);
-    }
-
-    default PageResult<AfterSaleProblemDO> selectPage(PageParam pageParam, String no, String keyword,
-                                                      Long sourceTicketId, Long itemId, String itemCode,
-                                                      String issueCategory,
-                                                      Integer issueType, Integer rootCauseCategory, Integer status) {
-        LambdaQueryWrapperX<AfterSaleProblemDO> query = new LambdaQueryWrapperX<AfterSaleProblemDO>()
-                .eqIfPresent(AfterSaleProblemDO::getNo, no)
-                .eqIfPresent(AfterSaleProblemDO::getSourceTicketId, sourceTicketId)
-                .eqIfPresent(AfterSaleProblemDO::getItemId, itemId)
-                .likeIfPresent(AfterSaleProblemDO::getItemCode, itemCode)
-                .eqIfPresent(AfterSaleProblemDO::getIssueCategory, issueCategory)
-                .eqIfPresent(AfterSaleProblemDO::getIssueType, issueType)
-                .eqIfPresent(AfterSaleProblemDO::getRootCauseCategory, rootCauseCategory)
-                .eqIfPresent(AfterSaleProblemDO::getStatus, status);
-        // 鍏抽敭瀛楁绱細鍗曞彿/鏍囬/鎻忚堪/瑙e喅鏂规
-        if (StrUtil.isNotBlank(keyword)) {
-            query.and(w -> w.like(AfterSaleProblemDO::getNo, keyword)
-                    .or().like(AfterSaleProblemDO::getTitle, keyword)
-                    .or().like(AfterSaleProblemDO::getDescription, keyword)
-                    .or().like(AfterSaleProblemDO::getSolution, keyword));
-        }
-        query.orderByDesc(AfterSaleProblemDO::getUpdateTime);
-        return selectPage(pageParam, query);
-    }
-
-    /**
-     * 鏂板伐鍗曞彈鐞嗗弬鑰冩绱細鍙繑鍥炲凡鍙戝竷锛屾寜鐗╂枡/鍒嗙被/鍏抽敭瀛楀懡涓紝鍙栨渶杩戞洿鏂� 10 鏉�
-     */
-    default List<AfterSaleProblemDO> selectReferenceList(Long itemId, String issueCategory, Integer issueType,
-                                                         Integer rootCauseCategory, String keyword) {
-        LambdaQueryWrapperX<AfterSaleProblemDO> query = new LambdaQueryWrapperX<AfterSaleProblemDO>()
-                .eq(AfterSaleProblemDO::getStatus, AfterSaleProblemStatusEnum.PUBLISHED.getStatus());
-        query.and(w -> {
-                    boolean hasCond = false;
-                    if (itemId != null) {
-                        w.eq(AfterSaleProblemDO::getItemId, itemId);
-                        hasCond = true;
-                    }
-                    if (StrUtil.isNotBlank(issueCategory)) {
-                        if (hasCond) {
-                            w.or();
-                        }
-                        w.eq(AfterSaleProblemDO::getIssueCategory, issueCategory);
-                        hasCond = true;
-                    }
-                    if (issueType != null) {
-                        if (hasCond) {
-                            w.or();
-                        }
-                        w.eq(AfterSaleProblemDO::getIssueType, issueType);
-                        hasCond = true;
-                    }
-                    if (rootCauseCategory != null) {
-                        if (hasCond) {
-                            w.or();
-                        }
-                        w.eq(AfterSaleProblemDO::getRootCauseCategory, rootCauseCategory);
-                        hasCond = true;
-                    }
-                    if (StrUtil.isNotBlank(keyword)) {
-                        if (hasCond) {
-                            w.or();
-                        }
-                        w.like(AfterSaleProblemDO::getTitle, keyword);
-                        hasCond = true;
-                    }
-                    if (!hasCond) {
-                        w.eq(AfterSaleProblemDO::getId, -1L); // 鏃犳潯浠舵椂杩斿洖绌猴紝閬垮厤鍏ㄨ〃鎷夊彇
-                    }
-                });
-        query.orderByDesc(AfterSaleProblemDO::getUpdateTime).last("LIMIT 10");
-        return selectList(query);
-    }
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
index 85cf24a..28f23bc 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/redis/no/AfterSaleNoRedisDAO.java
@@ -26,10 +26,6 @@
      */
     public static final String RETURN_NO_PREFIX = "RT";
 
-    /**
-     * 闂璁板綍缂栧彿鍓嶇紑
-     */
-    public static final String PROBLEM_NO_PREFIX = "AP";
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java
deleted file mode 100644
index c90eb7e..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/AfterSaleProblemStatusEnum.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.enums;
-
-import cn.iocoder.yudao.framework.common.core.ArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 鍞悗闂搴撶姸鎬佹灇涓�
- */
-@Getter
-@AllArgsConstructor
-public enum AfterSaleProblemStatusEnum implements ArrayValuable<Integer> {
-
-    DRAFT(0, "鑽夌"),
-    PUBLISHED(1, "宸插彂甯�"),
-    DISABLED(2, "宸插仠鐢�");
-
-    public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleProblemStatusEnum::getStatus).toArray(Integer[]::new);
-
-    /**
-     * 闂鐘舵��
-     */
-    private final Integer status;
-    /**
-     * 闂鐘舵�佸悕绉�
-     */
-    private final String name;
-
-    @Override
-    public Integer[] array() {
-        return ARRAYS;
-    }
-
-    public static String getNameByStatus(Integer status) {
-        return Arrays.stream(values())
-                .filter(item -> item.getStatus().equals(status))
-                .map(AfterSaleProblemStatusEnum::getName)
-                .findFirst().orElse(null);
-    }
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index 48fe34b..e775312 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -52,14 +52,6 @@
     ErrorCode COMPENSATION_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_022_004_006, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲~鍐欎笉閫氳繃鍘熷洜");
     ErrorCode COMPENSATION_UPDATE_FAIL_NOT_EDITABLE = new ErrorCode(1_022_004_007, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑璧斾粯鍗曟墠鑳戒慨鏀�");
 
-    // ========== 鍞悗鏈嶅姟-闂璁板綍锛�1-022-005-000锛� ==========
-    ErrorCode PROBLEM_NOT_EXISTS = new ErrorCode(1_022_005_000, "闂璁板綍涓嶅瓨鍦�");
-    ErrorCode PROBLEM_NO_EXISTS = new ErrorCode(1_022_005_001, "闂鍗曞彿閲嶅锛岃閲嶈瘯");
-    ErrorCode PROBLEM_UPDATE_FAIL_STATUS = new ErrorCode(1_022_005_002, "闂淇敼澶辫触锛屽師鍥狅細浠呰崏绋跨姸鎬佸彲缂栬緫");
-    ErrorCode PROBLEM_DELETE_FAIL_STATUS = new ErrorCode(1_022_005_003, "闂鍒犻櫎澶辫触锛屽師鍥狅細浠呰崏绋跨姸鎬佸彲鍒犻櫎");
-    ErrorCode PROBLEM_PUBLISH_FAIL_STATUS = new ErrorCode(1_022_005_004, "闂鍙戝竷澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷笉鍙彂甯�");
-    ErrorCode PROBLEM_DISABLE_FAIL_STATUS = new ErrorCode(1_022_005_005, "闂鍋滅敤澶辫触锛屽師鍥狅細褰撳墠鐘舵�佷笉鍙仠鐢�");
-
     // ========== 鍞悗鏈嶅姟-鍥炶锛�1-022-006-000锛� ==========
     ErrorCode VISIT_NOT_EXISTS = new ErrorCode(1_022_006_000, "鍥炶璁板綍涓嶅瓨鍦�");
     ErrorCode VISIT_CREATE_FAIL_STATUS = new ErrorCode(1_022_006_001, "鐧昏鍥炶澶辫触锛屽師鍥狅細宸ュ崟涓嶆槸宸插畬缁�(寰呭洖璁�)鐘舵��");
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java
deleted file mode 100644
index 3decdb2..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.service.problem;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemPageReqVO;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemSaveReqVO;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
-import jakarta.validation.Valid;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 鍞悗闂搴� Service 鎺ュ彛
- */
-public interface AfterSaleProblemService {
-
-    /**
-     * 鍒涘缓闂(浜哄伐寤烘。)锛屽垵濮嬬姸鎬佽崏绋�
-     *
-     * @param createReqVO 鍒涘缓淇℃伅
-     * @param userId      褰撳墠鐢ㄦ埛缂栧彿(娌夋穩浜�)
-     * @return 闂缂栧彿
-     */
-    Long createProblem(@Valid AfterSaleProblemSaveReqVO createReqVO, Long userId);
-
-    /**
-     * 鏇存柊闂
-     *
-     * @param updateReqVO 鏇存柊淇℃伅
-     */
-    void updateProblem(@Valid AfterSaleProblemSaveReqVO updateReqVO);
-
-    /**
-     * 鍒犻櫎闂(浠呰崏绋�)
-     *
-     * @param id 闂缂栧彿
-     */
-    void deleteProblem(Long id);
-
-    /**
-     * 鑾峰緱闂
-     *
-     * @param id 闂缂栧彿
-     * @return 闂
-     */
-    AfterSaleProblemDO getProblem(Long id);
-
-    /**
-     * 鑾峰緱闂鍒楄〃
-     *
-     * @param ids 缂栧彿鍒楄〃
-     * @return 闂鍒楄〃
-     */
-    List<AfterSaleProblemDO> getProblemList(Collection<Long> ids);
-
-    /**
-     * 鑾峰緱闂鍒嗛〉
-     *
-     * @param pageReqVO 鍒嗛〉鏌ヨ
-     * @return 闂鍒嗛〉
-     */
-    PageResult<AfterSaleProblemDO> getProblemPage(AfterSaleProblemPageReqVO pageReqVO);
-
-    /**
-     * 鍙戝竷闂
-     *
-     * @param id 闂缂栧彿
-     */
-    void publishProblem(Long id);
-
-    /**
-     * 鍋滅敤闂
-     *
-     * @param id 闂缂栧彿
-     */
-    void disableProblem(Long id);
-
-    /**
-     * 鏂板伐鍗曞彈鐞嗗弬鑰冩绱細鍛戒腑宸插彂甯冨巻鍙查棶棰�
-     *
-     * @param pageReqVO 鍙傝�冩绱㈡潯浠�(鍙� itemId/issueCategory/issueType/rootCauseCategory/keyword)
-     * @return 宸插彂甯冮棶棰樺垪琛�(鑷冲10鏉�)
-     */
-    List<AfterSaleProblemDO> getReferenceList(AfterSaleProblemPageReqVO pageReqVO);
-
-    /**
-     * 宸ュ崟褰掓。鏃惰嚜鍔ㄦ矇娣�闂(鑽夌鎬�)锛涘悓涓�宸ュ崟浠呮矇娣�涓�娆�(骞傜瓑)
-     *
-     * @param ticket 鍞悗宸ュ崟
-     * @return 娌夋穩鍑虹殑闂
-     */
-    AfterSaleProblemDO createProblemFromTicket(AfterSaleTicketDO ticket);
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java
deleted file mode 100644
index 022162b..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/problem/AfterSaleProblemServiceImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.service.problem;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemPageReqVO;
-import cn.iocoder.yudao.module.aftersales.controller.admin.problem.vo.AfterSaleProblemSaveReqVO;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.problem.AfterSaleProblemDO;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
-import cn.iocoder.yudao.module.aftersales.dal.mysql.problem.AfterSaleProblemMapper;
-import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketItemMapper;
-import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
-import cn.iocoder.yudao.module.aftersales.dal.redis.no.AfterSaleNoRedisDAO;
-import cn.iocoder.yudao.module.aftersales.enums.AfterSaleProblemStatusEnum;
-import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants.*;
-
-/**
- * 鍞悗闂搴� Service 瀹炵幇绫�
- */
-@Service
-@Validated
-@Slf4j
-public class AfterSaleProblemServiceImpl implements AfterSaleProblemService {
-
-    @Resource
-    private AfterSaleProblemMapper problemMapper;
-    @Resource
-    private AfterSaleTicketMapper ticketMapper;
-    @Resource
-    private AfterSaleTicketItemMapper ticketItemMapper;
-    @Resource
-    private AfterSaleNoRedisDAO noRedisDAO;
-    @Resource
-    private StorageAttachmentApi storageAttachmentApi;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Long createProblem(AfterSaleProblemSaveReqVO createReqVO, Long userId) {
-        AfterSaleProblemDO problem = BeanUtils.toBean(createReqVO, AfterSaleProblemDO.class);
-        // 鏉ユ簮宸ュ崟瀛樺湪鏃惰ˉ鍏ㄥ啑浣欏崟鍙蜂笌榛樿瀹㈡埛
-        if (createReqVO.getSourceTicketId() != null) {
-            AfterSaleTicketDO ticket = ticketMapper.selectById(createReqVO.getSourceTicketId());
-            if (ticket == null) {
-                throw exception(TICKET_NOT_EXISTS);
-            }
-            problem.setSourceTicketNo(ticket.getNo());
-            if (problem.getCustomerId() == null) {
-                problem.setCustomerId(ticket.getCustomerId());
-            }
-        }
-        problem.setNo(generateNo())
-                .setStatus(AfterSaleProblemStatusEnum.DRAFT.getStatus())
-                .setOwnerUserId(userId);
-        problemMapper.insert(problem);
-        // 缁戝畾闄勪欢
-        if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
-            storageAttachmentApi.bindAttachments("file", "aftersales_after_sale_problem",
-                    problem.getId(), createReqVO.getBlobIds());
-        }
-        return problem.getId();
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateProblem(AfterSaleProblemSaveReqVO updateReqVO) {
-        AfterSaleProblemDO problem = validateProblemExists(updateReqVO.getId());
-        if (!AfterSaleProblemStatusEnum.DRAFT.getStatus().equals(problem.getStatus())) {
-            throw exception(PROBLEM_UPDATE_FAIL_STATUS);
-        }
-        AfterSaleProblemDO update = BeanUtils.toBean(updateReqVO, AfterSaleProblemDO.class);
-        problemMapper.updateById(update);
-        if (CollUtil.isNotEmpty(updateReqVO.getBlobIds())) {
-            storageAttachmentApi.updateAttachments("file", "aftersales_after_sale_problem",
-                    updateReqVO.getId(), updateReqVO.getBlobIds());
-        }
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteProblem(Long id) {
-        AfterSaleProblemDO problem = validateProblemExists(id);
-        if (!AfterSaleProblemStatusEnum.DRAFT.getStatus().equals(problem.getStatus())) {
-            throw exception(PROBLEM_DELETE_FAIL_STATUS);
-        }
-        problemMapper.deleteById(id);
-        storageAttachmentApi.deleteAttachmentsByRecord("aftersales_after_sale_problem", id);
-        // 瑙i櫎宸ュ崟瀵归棶棰樼殑鍏宠仈
-        ticketMapper.update(null, new LambdaUpdateWrapper<AfterSaleTicketDO>()
-                .eq(AfterSaleTicketDO::getProblemId, id)
-                .set(AfterSaleTicketDO::getProblemId, null)
-                .set(AfterSaleTicketDO::getProblemNo, null));
-    }
-
-    @Override
-    public AfterSaleProblemDO getProblem(Long id) {
-        return validateProblemExists(id);
-    }
-
-    @Override
-    public List<AfterSaleProblemDO> getProblemList(Collection<Long> ids) {
-        if (CollUtil.isEmpty(ids)) {
-            return List.of();
-        }
-        return problemMapper.selectBatchIds(ids);
-    }
-
-    @Override
-    public PageResult<AfterSaleProblemDO> getProblemPage(AfterSaleProblemPageReqVO pageReqVO) {
-        return problemMapper.selectPage(pageReqVO, pageReqVO.getNo(), pageReqVO.getKeyword(),
-                pageReqVO.getSourceTicketId(), pageReqVO.getItemId(), pageReqVO.getItemCode(),
-                pageReqVO.getIssueCategory(),
-                pageReqVO.getIssueType(), pageReqVO.getRootCauseCategory(), pageReqVO.getStatus());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void publishProblem(Long id) {
-        AfterSaleProblemDO problem = validateProblemExists(id);
-        if (!(AfterSaleProblemStatusEnum.DRAFT.getStatus().equals(problem.getStatus())
-                || AfterSaleProblemStatusEnum.DISABLED.getStatus().equals(problem.getStatus()))) {
-            throw exception(PROBLEM_PUBLISH_FAIL_STATUS);
-        }
-        problemMapper.updateById(new AfterSaleProblemDO().setId(id)
-                .setStatus(AfterSaleProblemStatusEnum.PUBLISHED.getStatus())
-                .setPublishTime(LocalDateTime.now()));
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void disableProblem(Long id) {
-        AfterSaleProblemDO problem = validateProblemExists(id);
-        if (!AfterSaleProblemStatusEnum.PUBLISHED.getStatus().equals(problem.getStatus())) {
-            throw exception(PROBLEM_DISABLE_FAIL_STATUS);
-        }
-        problemMapper.updateById(new AfterSaleProblemDO().setId(id)
-                .setStatus(AfterSaleProblemStatusEnum.DISABLED.getStatus()));
-    }
-
-    @Override
-    public List<AfterSaleProblemDO> getReferenceList(AfterSaleProblemPageReqVO pageReqVO) {
-        return problemMapper.selectReferenceList(pageReqVO.getItemId(), pageReqVO.getIssueCategory(),
-                pageReqVO.getIssueType(), pageReqVO.getRootCauseCategory(), pageReqVO.getKeyword());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AfterSaleProblemDO createProblemFromTicket(AfterSaleTicketDO ticket) {
-        // 骞傜瓑锛氬悓涓�宸ュ崟宸叉矇娣�杩囧垯鐩存帴澶嶇敤
-        AfterSaleProblemDO exist = problemMapper.selectBySourceTicketId(ticket.getId());
-        if (exist != null) {
-            return exist;
-        }
-        AfterSaleProblemDO problem = new AfterSaleProblemDO()
-                .setNo(generateNo())
-                .setTitle(ticket.getName())
-                .setSourceTicketId(ticket.getId())
-                .setSourceTicketNo(ticket.getNo())
-                .setCustomerId(ticket.getCustomerId())
-                .setIssueType(ticket.getIssueType())
-                .setIssueCategory(ticket.getIssueCategory())
-                .setSeverityLevel(ticket.getSeverityLevel())
-                .setDescription(ticket.getIssueDescription())
-                .setStatus(AfterSaleProblemStatusEnum.DRAFT.getStatus())
-                .setOwnerUserId(getLoginUserId());
-        // 鍙栧伐鍗曢鏉℃槑缁嗕綔涓虹墿鏂欏揩鐓�(鍏佽鏃犳槑缁嗚)
-        AfterSaleTicketItemDO firstItem = CollUtil.getFirst(ticketItemMapper.selectListByTicketId(ticket.getId()));
-        if (firstItem != null) {
-            problem.setItemId(firstItem.getItemId())
-                    .setItemCode(firstItem.getItemCode())
-                    .setItemName(firstItem.getItemName())
-                    .setBatchId(firstItem.getBatchId())
-                    .setBatchCode(firstItem.getBatchCode());
-        }
-        problemMapper.insert(problem);
-        return problem;
-    }
-
-    // ========== 鍐呴儴鏂规硶 ==========
-
-    private AfterSaleProblemDO validateProblemExists(Long id) {
-        AfterSaleProblemDO problem = problemMapper.selectById(id);
-        if (problem == null) {
-            throw exception(PROBLEM_NOT_EXISTS);
-        }
-        return problem;
-    }
-
-    private String generateNo() {
-        String no = noRedisDAO.generate(AfterSaleNoRedisDAO.PROBLEM_NO_PREFIX);
-        if (problemMapper.selectByNo(no) != null) {
-            throw exception(PROBLEM_NO_EXISTS);
-        }
-        return no;
-    }
-
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java
deleted file mode 100644
index 501def9..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/MesDvSpareController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.dv.spare;
-import cn.iocoder.yudao.framework.common.pojo.*;
-import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.*;
-import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSparePartDO;
-import cn.iocoder.yudao.module.mes.service.dv.spare.MesDvSpareService;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-@Tag(name="绠$悊鍚庡彴 - 璁惧澶囦欢绠$悊")
-@RestController @RequestMapping("/mes/dv/spare") @Validated
-public class MesDvSpareController {
-    @Resource private MesDvSpareService service;
-    @GetMapping("/page") @PreAuthorize("@ss.hasPermission('mes:dv-spare:query')")
-    public CommonResult<PageResult<MesDvSparePartDO>> page(@Valid MesDvSparePageReqVO req) { return success(service.page(req)); }
-    @GetMapping("/get") @PreAuthorize("@ss.hasPermission('mes:dv-spare:query')")
-    public CommonResult<MesDvSparePartDO> get(@RequestParam Long id) { return success(service.get(id)); }
-    @PostMapping("/create") @PreAuthorize("@ss.hasPermission('mes:dv-spare:create')")
-    public CommonResult<Long> create(@Valid @RequestBody MesDvSparePartSaveReqVO req) {
-        req.setId(null); return success(service.create(req,getLoginUserId()));
-    }
-    @PutMapping("/update") @PreAuthorize("@ss.hasPermission('mes:dv-spare:update')")
-    public CommonResult<Boolean> update(@Valid @RequestBody MesDvSparePartSaveReqVO req) { service.update(req); return success(true); }
-    @DeleteMapping("/delete") @PreAuthorize("@ss.hasPermission('mes:dv-spare:delete')")
-    public CommonResult<Boolean> delete(@RequestParam Long id) { service.delete(id); return success(true); }
-    @GetMapping("/movement-page") @PreAuthorize("@ss.hasPermission('mes:dv-spare:record')")
-    public CommonResult<PageResult<MesDvSpareMovementRespVO>> movements(@Valid MesDvSparePageReqVO req) { return success(service.movements(req)); }
-    @PostMapping("/receive") @PreAuthorize("@ss.hasPermission('mes:dv-spare:receive')")
-    public CommonResult<Long> receive(@Valid @RequestBody MesDvSpareActionReqVO req) { return success(service.receive(req,getLoginUserId())); }
-    @PostMapping("/issue") @PreAuthorize("@ss.hasPermission('mes:dv-spare:issue')")
-    public CommonResult<Long> issue(@Valid @RequestBody MesDvSpareActionReqVO req) { return success(service.issue(req,getLoginUserId())); }
-    @PostMapping("/return") @PreAuthorize("@ss.hasPermission('mes:dv-spare:return')")
-    public CommonResult<Long> returnPart(@Valid @RequestBody MesDvSpareActionReqVO req) { return success(service.returnPart(req,getLoginUserId())); }
-}
-
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java
deleted file mode 100644
index 0f3be0a..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareActionReqVO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
-import jakarta.validation.constraints.*;
-import lombok.Data;
-import java.math.BigDecimal;
-@Data
-public class MesDvSpareActionReqVO {
-    @NotBlank @Pattern(regexp="[a-zA-Z0-9-]{16,64}") private String requestKey;
-    @Positive private Long sparePartId;
-    @Positive private Long repairId;
-    @Positive private Long originalId;
-    @Positive private Long receiverUserId;
-    @NotNull @DecimalMin(value="0",inclusive=false) @Digits(integer=15,fraction=3) private BigDecimal quantity;
-    @NotBlank @Size(max=500) private String remark;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java
deleted file mode 100644
index 3fd107d..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSpareMovementRespVO.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
-import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSpareMovementDO;
-import java.math.BigDecimal;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-@Data @EqualsAndHashCode(callSuper=true)
-public class MesDvSpareMovementRespVO extends MesDvSpareMovementDO {
-    private BigDecimal returnedQuantity;
-    private BigDecimal returnableQuantity;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java
deleted file mode 100644
index 304e89a..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePageReqVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-@Data @EqualsAndHashCode(callSuper=true)
-public class MesDvSparePageReqVO extends PageParam {
-    private String code;
-    private String name;
-    private Integer status;
-    private Boolean shortageOnly;
-    private Long sparePartId;
-    private Long repairId;
-    private String repairCode;
-    @Min(1) @Max(4) private Integer type;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java
deleted file mode 100644
index ed8b996..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/spare/vo/MesDvSparePartSaveReqVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo;
-import jakarta.validation.constraints.*;
-import lombok.Data;
-import java.math.BigDecimal;
-@Data
-public class MesDvSparePartSaveReqVO {
-    private Long id;
-    @NotBlank @Size(max=64) private String code;
-    @NotBlank @Size(max=128) private String name;
-    @Size(max=255) private String specification;
-    @NotBlank @Size(max=32) private String unit;
-    @Size(max=128) private String location;
-    @NotNull @DecimalMin("0") @Digits(integer=15,fraction=3) private BigDecimal initialQuantity;
-    @NotNull @DecimalMin("0") @Digits(integer=15,fraction=3) private BigDecimal safetyQuantity;
-    @NotNull @Min(0) @Max(1) private Integer status;
-    @Size(max=500) private String remark;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java
deleted file mode 100644
index f47b8cf..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSpareMovementDO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.*;
-import java.math.BigDecimal;
-@TableName("mes_dv_spare_movement")
-@KeySequence("mes_dv_spare_movement_seq")
-@Data @EqualsAndHashCode(callSuper = true)
-public class MesDvSpareMovementDO extends BaseDO {
-    @TableId private Long id;
-    private String requestKey;
-    private Long sparePartId;
-    private String sparePartCode;
-    private String sparePartName;
-    private String specification;
-    private String unit;
-    /** 1 鍒濆搴撳瓨锛�2 鍏ュ簱锛�3 缁翠慨棰嗙敤锛�4 閫�鍥� */
-    private Integer type;
-    private BigDecimal quantity;
-    private BigDecimal beforeQuantity;
-    private BigDecimal afterQuantity;
-    private Long repairId;
-    private String repairCode;
-    private Long machineryId;
-    private String machineryName;
-    private Long originalId;
-    private Long receiverUserId;
-    private String receiverName;
-    private Long operatorUserId;
-    private String remark;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java
deleted file mode 100644
index 916d841..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dv/spare/MesDvSparePartDO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.*;
-import java.math.BigDecimal;
-@TableName("mes_dv_spare_part")
-@KeySequence("mes_dv_spare_part_seq")
-@Data @EqualsAndHashCode(callSuper = true)
-public class MesDvSparePartDO extends BaseDO {
-    @TableId private Long id;
-    private String code;
-    private String name;
-    private String specification;
-    private String unit;
-    private String location;
-    private BigDecimal stockQuantity;
-    private BigDecimal safetyQuantity;
-    private Integer status;
-    private String remark;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java
deleted file mode 100644
index e8d3981..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSpareMovementMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.dv.spare;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSpareMovementDO;
-import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.MesDvSparePageReqVO;
-import org.apache.ibatis.annotations.Mapper;
-import java.util.*;
-@Mapper
-public interface MesDvSpareMovementMapper extends BaseMapperX<MesDvSpareMovementDO> {
-    default MesDvSpareMovementDO byKey(String key) {
-        return selectOne(MesDvSpareMovementDO::getRequestKey,key);
-    }
-    default MesDvSpareMovementDO lock(Long id) {
-        return selectOne(new LambdaQueryWrapperX<MesDvSpareMovementDO>().eq(MesDvSpareMovementDO::getId,id).last("FOR UPDATE"));
-    }
-    default List<MesDvSpareMovementDO> returns(Collection<Long> ids) {
-        if (ids.isEmpty()) return List.of();
-        return selectList(new LambdaQueryWrapperX<MesDvSpareMovementDO>()
-                .eq(MesDvSpareMovementDO::getType,4).in(MesDvSpareMovementDO::getOriginalId,ids));
-    }
-    default PageResult<MesDvSpareMovementDO> page(MesDvSparePageReqVO req) {
-        return selectPage(req,new LambdaQueryWrapperX<MesDvSpareMovementDO>()
-                .eqIfPresent(MesDvSpareMovementDO::getSparePartId,req.getSparePartId())
-                .eqIfPresent(MesDvSpareMovementDO::getRepairId,req.getRepairId())
-                .eqIfPresent(MesDvSpareMovementDO::getRepairCode,req.getRepairCode())
-                .eqIfPresent(MesDvSpareMovementDO::getType,req.getType())
-                .orderByDesc(MesDvSpareMovementDO::getId));
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSparePartMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSparePartMapper.java
deleted file mode 100644
index cdb07e7..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dv/spare/MesDvSparePartMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.dv.spare;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.MesDvSparePartDO;
-import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.MesDvSparePageReqVO;
-import org.apache.ibatis.annotations.Mapper;
-@Mapper
-public interface MesDvSparePartMapper extends BaseMapperX<MesDvSparePartDO> {
-    default MesDvSparePartDO lock(Long id) {
-        return selectOne(new LambdaQueryWrapperX<MesDvSparePartDO>().eq(MesDvSparePartDO::getId,id).last("FOR UPDATE"));
-    }
-    default PageResult<MesDvSparePartDO> page(MesDvSparePageReqVO req) {
-        return selectPage(req,new LambdaQueryWrapperX<MesDvSparePartDO>()
-                .eqIfPresent(MesDvSparePartDO::getCode,req.getCode())
-                .likeIfPresent(MesDvSparePartDO::getName,req.getName())
-                .eqIfPresent(MesDvSparePartDO::getStatus,req.getStatus())
-                .apply(Boolean.TRUE.equals(req.getShortageOnly()),"stock_quantity < safety_quantity")
-                .orderByDesc(MesDvSparePartDO::getId));
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java
deleted file mode 100644
index 8896de2..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/spare/MesDvSpareService.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.dv.spare;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.dv.spare.vo.*;
-import cn.iocoder.yudao.module.mes.dal.dataobject.dv.spare.*;
-import cn.iocoder.yudao.module.mes.dal.dataobject.dv.repair.MesDvRepairDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.dv.spare.*;
-import cn.iocoder.yudao.module.mes.dal.mysql.dv.repair.MesDvRepairMapper;
-import cn.iocoder.yudao.module.mes.dal.mysql.dv.machinery.MesDvMachineryMapper;
-import cn.iocoder.yudao.module.mes.enums.dv.MesDvRepairStatusEnum;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.*;
-import java.math.BigDecimal;
-import java.util.*;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-
-/** 澶囦欢搴撳瓨鍙�氳繃鐣欑棔鐨勬祦姘村彉鏇达紝鍏冩暟鎹紪杈戜笉鍏佽瑕嗙洊搴撳瓨銆� */
-@Service
-public class MesDvSpareService {
-    private static final ErrorCode INVALID = new ErrorCode(1_040_807_001, "澶囦欢鎿嶄綔澶辫触锛歿}");
-    private static final BigDecimal MAX_QUANTITY = new BigDecimal("999999999999999.999");
-    @Resource private MesDvSparePartMapper partMapper;
-    @Resource private MesDvSpareMovementMapper movementMapper;
-    @Resource private MesDvRepairMapper repairMapper;
-    @Resource private MesDvMachineryMapper machineryMapper;
-    @Resource private AdminUserApi adminUserApi;
-
-    @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
-    public Long create(MesDvSparePartSaveReqVO req, Long operator) {
-        validateMetadata(req);
-        MesDvSparePartDO part = BeanUtils.toBean(req,MesDvSparePartDO.class);
-        part.setStockQuantity(req.getInitialQuantity());
-        partMapper.insert(part);
-        if (req.getInitialQuantity().signum()>0) {
-            writeMovement(part,1,req.getInitialQuantity(),BigDecimal.ZERO,null,null,null,operator,
-                    "opening-"+UUID.randomUUID(),"鐧昏鍒濆搴撳瓨");
-        }
-        return part.getId();
-    }
-    @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
-    public void update(MesDvSparePartSaveReqVO req) {
-        MesDvSparePartDO part = requirePart(req.getId());
-        validateMetadata(req);
-        MesDvSparePartDO changes = BeanUtils.toBean(req,MesDvSparePartDO.class);
-        changes.setStockQuantity(part.getStockQuantity());
-        partMapper.updateById(changes);
-    }
-    private void validateMetadata(MesDvSparePartSaveReqVO req) {
-        req.setCode(req.getCode().trim());
-        req.setName(req.getName().trim());
-        req.setUnit(req.getUnit().trim());
-        if (req.getCode().isEmpty() || req.getName().isEmpty() || req.getUnit().isEmpty()) fail("缂栫爜銆佸悕绉板拰鍗曚綅涓嶈兘涓虹┖");
-        var old=partMapper.selectOne(MesDvSparePartDO::getCode,req.getCode());
-        if(old!=null&&!Objects.equals(old.getId(),req.getId())) fail("澶囦欢缂栫爜宸插瓨鍦�");
-        if(req.getId()!=null && movementMapper.selectCount(MesDvSpareMovementDO::getSparePartId,req.getId())>0) {
-            var saved=partMapper.selectById(req.getId());
-            if(!Objects.equals(saved.getUnit(),req.getUnit())) fail("宸叉湁搴撳瓨娴佹按鐨勫浠朵笉鑳戒慨鏀硅閲忓崟浣�");
-        }
-    }
-    @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
-    public void delete(Long id) {
-        var part=requirePart(id);
-        if(part.getStockQuantity().signum()!=0 || movementMapper.selectCount(MesDvSpareMovementDO::getSparePartId,id)>0)
-            fail("鏈夊簱瀛樻垨宸叉湁娴佹按鐨勫浠朵笉鑳藉垹闄わ紝璇峰仠鐢�");
-        partMapper.deleteById(id);
-    }
-    public MesDvSparePartDO get(Long id) { return partMapper.selectById(id); }
-    public PageResult<MesDvSparePartDO> page(MesDvSparePageReqVO req) { return partMapper.page(req); }
-    public PageResult<MesDvSpareMovementRespVO> movements(MesDvSparePageReqVO req) {
-        var page=movementMapper.page(req);
-        var ids=page.getList().stream().filter(m->m.getType()==3).map(MesDvSpareMovementDO::getId).toList();
-        Map<Long,BigDecimal> totals=new HashMap<>();
-        movementMapper.returns(ids).forEach(m->totals.merge(m.getOriginalId(),m.getQuantity(),BigDecimal::add));
-        return new PageResult<>(page.getList().stream().map(m-> {
-            var vo=BeanUtils.toBean(m,MesDvSpareMovementRespVO.class);
-            vo.setReturnedQuantity(totals.getOrDefault(m.getId(),BigDecimal.ZERO));
-            vo.setReturnableQuantity(m.getType()==3?m.getQuantity().subtract(vo.getReturnedQuantity()):BigDecimal.ZERO);
-            return vo;
-        }).toList(),page.getTotal());
-    }
-    @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
-    public Long receive(MesDvSpareActionReqVO req,Long operator) {
-        validateAction(req);
-        var part=requirePart(req.getSparePartId());
-        Long prior=duplicate(req,2,operator,part.getId(),null,null,null);
-        if(prior!=null)return prior;
-        requireEnabled(part);
-        var before=part.getStockQuantity();
-        changeStock(part,req.getQuantity());
-        return writeMovement(part,2,req.getQuantity(),before,null,null,null,operator,req.getRequestKey(),req.getRemark());
-    }
-    @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
-    public Long issue(MesDvSpareActionReqVO req,Long operator) {
-        validateAction(req);
-        if(req.getRepairId()==null || req.getSparePartId()==null || req.getReceiverUserId()==null) fail("璇烽�夋嫨缁翠慨鍗曘�佸浠跺拰棰嗙敤浜�");
-        // 涓庣淮淇姸鎬佹祦杞娇鐢ㄥ悓涓�琛岄攣锛涘厛缁翠慨鍗曞啀澶囦欢锛屼繚鎸佷竴鑷撮攣搴忋��
-        var repair=repairMapper.lockForSpare(req.getRepairId());
-        if(repair==null)fail("缁翠慨鍗曚笉瀛樺湪");
-        var part=requirePart(req.getSparePartId());
-        Long prior=duplicate(req,3,operator,part.getId(),repair.getId(),null,req.getReceiverUserId());
-        if(prior!=null)return prior;
-        if(!Objects.equals(repair.getStatus(),MesDvRepairStatusEnum.PREPARE.getStatus()) &&
-                !Objects.equals(repair.getStatus(),MesDvRepairStatusEnum.CONFIRMED.getStatus()))
-            fail("浠呰崏绋挎垨缁翠慨涓殑缁翠慨鍗曞彲浠ラ鐢ㄥ浠�");
-        requireEnabled(part);
-        var receiver=adminUserApi.getUser(req.getReceiverUserId());
-        if(receiver==null || !Objects.equals(receiver.getStatus(),0))fail("棰嗙敤浜轰笉瀛樺湪鎴栧凡鍋滅敤");
-        var before=part.getStockQuantity();
-        changeStock(part,req.getQuantity().negate());
-        return writeMovement(part,3,req.getQuantity(),before,repair,null,req.getReceiverUserId(),
-                operator,req.getRequestKey(),req.getRemark());
-    }
-    @Transactional(rollbackFor=Exception.class, isolation=Isolation.READ_COMMITTED)
-    public Long returnPart(MesDvSpareActionReqVO req,Long operator) {
-        validateAction(req);
-        if(req.getOriginalId()==null)fail("璇烽�夋嫨鍘熼鐢ㄨ褰�");
-        var original=movementMapper.lock(req.getOriginalId());
-        if(original==null || original.getType()!=3)fail("鍘熼鐢ㄨ褰曚笉瀛樺湪");
-        var part=requirePart(original.getSparePartId());
-        Long prior=duplicate(req,4,operator,part.getId(),original.getRepairId(),original.getId(),original.getReceiverUserId());
-        if(prior!=null)return prior;
-        BigDecimal returned=movementMapper.returns(List.of(original.getId())).stream()
-                .map(MesDvSpareMovementDO::getQuantity).reduce(BigDecimal.ZERO,BigDecimal::add);
-        if(returned.add(req.getQuantity()).compareTo(original.getQuantity())>0)fail("閫�鍥炴暟閲忚秴杩囧皻鏈��鍥炵殑棰嗙敤鏁伴噺");
-        var before=part.getStockQuantity();
-        changeStock(part,req.getQuantity()); // 宸插仠鐢ㄥ浠朵粛鍏佽閫�鍥炪��
-        var record=snapshot(part,4,req.getQuantity(),before,operator,req.getRequestKey(),req.getRemark());
-        record.setOriginalId(original.getId());
-        record.setRepairId(original.getRepairId()); record.setRepairCode(original.getRepairCode());
-        record.setMachineryId(original.getMachineryId()); record.setMachineryName(original.getMachineryName());
-        record.setReceiverUserId(original.getReceiverUserId()); record.setReceiverName(original.getReceiverName());
-        movementMapper.insert(record);
-        return record.getId();
-    }
-    private Long duplicate(MesDvSpareActionReqVO req,int type,Long operator,Long partId,Long repairId,Long originalId,Long receiverId) {
-        var old=movementMapper.byKey(req.getRequestKey());
-        if(old==null)return null;
-        if(old.getType()!=type || !Objects.equals(old.getOperatorUserId(),operator)
-                || !Objects.equals(old.getSparePartId(),partId) || !Objects.equals(old.getRepairId(),repairId)
-                || !Objects.equals(old.getOriginalId(),originalId) || !Objects.equals(old.getReceiverUserId(),receiverId)
-                || old.getQuantity().compareTo(req.getQuantity())!=0 || !Objects.equals(old.getRemark(),req.getRemark()))
-            fail("璇锋眰鏍囪瘑宸茬敤浜庡叾浠栨搷浣滐紝璇峰埛鏂板悗閲嶈瘯");
-        return old.getId();
-    }
-    private void validateAction(MesDvSpareActionReqVO req) {
-        if(req.getQuantity()==null || req.getQuantity().signum()<=0 || req.getQuantity().scale()>3
-                || req.getQuantity().compareTo(MAX_QUANTITY)>0)fail("鏁伴噺蹇呴』澶т簬0锛屾渶澶氫笁浣嶅皬鏁�");
-        if(req.getRemark()==null || req.getRemark().trim().isEmpty())fail("璇峰~鍐欐搷浣滆鏄�");
-    }
-    private MesDvSparePartDO requirePart(Long id) {
-        if(id==null)fail("璇烽�夋嫨澶囦欢");
-        var part=partMapper.lock(id);
-        if(part==null)fail("澶囦欢涓嶅瓨鍦�");
-        return part;
-    }
-    private void requireEnabled(MesDvSparePartDO part) { if(!Objects.equals(part.getStatus(),0))fail("澶囦欢宸插仠鐢�"); }
-    private void changeStock(MesDvSparePartDO part,BigDecimal delta) {
-        var after=part.getStockQuantity().add(delta);
-        if(after.signum()<0)fail("搴撳瓨涓嶈冻锛屽綋鍓嶅彲鐢細"+part.getStockQuantity()+part.getUnit());
-        if(after.compareTo(MAX_QUANTITY)>0)fail("搴撳瓨鏁伴噺瓒呭嚭绯荤粺鍏佽鑼冨洿");
-        part.setStockQuantity(after);
-        partMapper.updateById(new MesDvSparePartDO().setId(part.getId()).setStockQuantity(after));
-    }
-    private MesDvSpareMovementDO snapshot(MesDvSparePartDO part,int type,BigDecimal qty,BigDecimal before,
-                                         Long operator,String key,String remark) {
-        return new MesDvSpareMovementDO().setRequestKey(key).setSparePartId(part.getId())
-                .setSparePartCode(part.getCode()).setSparePartName(part.getName()).setSpecification(part.getSpecification())
-                .setUnit(part.getUnit()).setType(type).setQuantity(qty).setBeforeQuantity(before)
-                .setAfterQuantity(part.getStockQuantity()).setOperatorUserId(operator).setRemark(remark);
-    }
-    private Long writeMovement(MesDvSparePartDO part,int type,BigDecimal qty,BigDecimal before,MesDvRepairDO repair,
-                               Long original,Long receiver,Long operator,String key,String remark) {
-        var record=snapshot(part,type,qty,before,operator,key,remark).setOriginalId(original).setReceiverUserId(receiver);
-        if(receiver!=null)record.setReceiverName(adminUserApi.getUser(receiver).getNickname());
-        if(repair!=null) {
-            var machine=machineryMapper.selectById(repair.getMachineryId());
-            if(machine==null)fail("缁翠慨璁惧涓嶅瓨鍦�");
-            record.setRepairId(repair.getId()).setRepairCode(repair.getCode()).setMachineryId(machine.getId()).setMachineryName(machine.getName());
-        }
-        movementMapper.insert(record);
-        return record.getId();
-    }
-    private static void fail(String reason) { throw exception(INVALID,reason); }
-}
-
diff --git a/yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml b/yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml
new file mode 100644
index 0000000..0637be5
--- /dev/null
+++ b/yudao-module-mes/src/main/resources/mapper/qc/ledger/MesQcInspectionLedgerMapper.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.mes.dal.mysql.qc.ledger.MesQcInspectionLedgerMapper">
+
+    <!--
+        妫�娴嬬粨鏋滃彴璐︽煡璇紙鍥涚被妫�楠屽崟 UNION ALL锛�
+        涓�琛� = 涓�涓娴嬮」缁撴灉锛涙楠屽崟鏈綍鍏ユ楠岀粨鏋滄椂璇ュ崟鍗犱竴琛岋紝妫�娴嬮」鐩稿叧鍒椾负绌猴紙LEFT JOIN 淇濊瘉涓嶄涪鍗曪級銆�
+        璇存槑锛氭楠岀粨鏋滅殑鍏宠仈閿负 (qc_id, qc_type)锛宷c_id 涓哄悇妫�楠屽崟鑷韩鐨� id锛岄渶鎸夌被鍨嬭繃婊� qc_type锛屽惁鍒欎笉鍚岀被鍨嬬殑 id 浼氫覆鍗曘��
+        璇存槑锛氭娴嬮」鍚嶇О涓嶅仛閫昏緫鍒犻櫎杩囨护锛屽凡鍋滅敤/鍒犻櫎鐨勬娴嬮」浠嶅睍绀哄巻鍙插彴璐﹀悕绉般��
+    -->
+    <select id="selectInspectionLedgerPage" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.ledger.vo.MesQcInspectionLedgerRespVO">
+        SELECT * FROM (
+            <!-- 1. 鏉ユ枡妫�楠岋紙IQC锛夛紝鎵规鍙栦緵搴斿晢鎵规鍙� -->
+            SELECT
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type} AS qcType,
+                q.id AS qcId,
+                q.code AS code,
+                q.name AS name,
+                q.status AS status,
+                q.item_id AS itemId,
+                q.vendor_batch AS batchNo,
+                q.check_quantity AS checkQuantity,
+                q.qualified_quantity AS qualifiedQuantity,
+                q.unqualified_quantity AS unqualifiedQuantity,
+                q.check_result AS checkResult,
+                q.inspect_date AS inspectDate,
+                q.inspector_user_id AS inspectorUserId,
+                q.remark AS remark,
+                d.indicator_id AS indicatorId,
+                i.name AS indicatorName,
+                d.value AS indicatorValue,
+                d.remark AS indicatorRemark,
+                l.standard_value AS standardValue,
+                l.min_threshold AS minThreshold,
+                l.max_threshold AS maxThreshold
+            FROM mes_qc_iqc q
+                LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+                    AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IQC.type}
+                    AND r.deleted = 0
+                LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+                LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+                LEFT JOIN mes_qc_iqc_line l ON l.iqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+            WHERE q.deleted = 0
+
+            UNION ALL
+
+            <!-- 2. 杩囩▼妫�楠岋紙IPQC锛夛紝鏃犳壒娆″彿 -->
+            SELECT
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type} AS qcType,
+                q.id AS qcId,
+                q.code AS code,
+                q.name AS name,
+                q.status AS status,
+                q.item_id AS itemId,
+                NULL AS batchNo,
+                q.check_quantity AS checkQuantity,
+                q.qualified_quantity AS qualifiedQuantity,
+                q.unqualified_quantity AS unqualifiedQuantity,
+                q.check_result AS checkResult,
+                q.inspect_date AS inspectDate,
+                q.inspector_user_id AS inspectorUserId,
+                q.remark AS remark,
+                d.indicator_id AS indicatorId,
+                i.name AS indicatorName,
+                d.value AS indicatorValue,
+                d.remark AS indicatorRemark,
+                l.standard_value AS standardValue,
+                l.min_threshold AS minThreshold,
+                l.max_threshold AS maxThreshold
+            FROM mes_qc_ipqc q
+                LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+                    AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type}
+                    AND r.deleted = 0
+                LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+                LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+                LEFT JOIN mes_qc_ipqc_line l ON l.ipqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+            WHERE q.deleted = 0
+
+            UNION ALL
+
+            <!-- 3. 鍑鸿揣妫�楠岋紙OQC锛夛紝鎵规鍙栨壒娆″彿 -->
+            SELECT
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type} AS qcType,
+                q.id AS qcId,
+                q.code AS code,
+                q.name AS name,
+                q.status AS status,
+                q.item_id AS itemId,
+                q.batch_code AS batchNo,
+                q.check_quantity AS checkQuantity,
+                q.qualified_quantity AS qualifiedQuantity,
+                q.unqualified_quantity AS unqualifiedQuantity,
+                q.check_result AS checkResult,
+                q.inspect_date AS inspectDate,
+                q.inspector_user_id AS inspectorUserId,
+                q.remark AS remark,
+                d.indicator_id AS indicatorId,
+                i.name AS indicatorName,
+                d.value AS indicatorValue,
+                d.remark AS indicatorRemark,
+                l.standard_value AS standardValue,
+                l.min_threshold AS minThreshold,
+                l.max_threshold AS maxThreshold
+            FROM mes_qc_oqc q
+                LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+                    AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type}
+                    AND r.deleted = 0
+                LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+                LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+                LEFT JOIN mes_qc_oqc_line l ON l.oqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+            WHERE q.deleted = 0
+
+            UNION ALL
+
+            <!-- 4. 閫�璐ф楠岋紙RQC锛夛紝鎵规鍙栨壒娆″彿 -->
+            SELECT
+                ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
+                q.id AS qcId,
+                q.code AS code,
+                q.name AS name,
+                q.status AS status,
+                q.item_id AS itemId,
+                q.batch_code AS batchNo,
+                q.check_quantity AS checkQuantity,
+                q.qualified_quantity AS qualifiedQuantity,
+                q.unqualified_quantity AS unqualifiedQuantity,
+                q.check_result AS checkResult,
+                q.inspect_date AS inspectDate,
+                q.inspector_user_id AS inspectorUserId,
+                q.remark AS remark,
+                d.indicator_id AS indicatorId,
+                i.name AS indicatorName,
+                d.value AS indicatorValue,
+                d.remark AS indicatorRemark,
+                l.standard_value AS standardValue,
+                l.min_threshold AS minThreshold,
+                l.max_threshold AS maxThreshold
+            FROM mes_qc_rqc q
+                LEFT JOIN mes_qc_indicator_result r ON r.qc_id = q.id
+                    AND r.qc_type = ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type}
+                    AND r.deleted = 0
+                LEFT JOIN mes_qc_indicator_result_detail d ON d.result_id = r.id AND d.deleted = 0
+                LEFT JOIN mes_qc_indicator i ON i.id = d.indicator_id
+                LEFT JOIN mes_qc_rqc_line l ON l.rqc_id = q.id AND l.indicator_id = d.indicator_id AND l.deleted = 0
+            WHERE q.deleted = 0
+        ) t
+        <where>
+            <if test="reqVO.qcType != null">
+                AND t.qcType = #{reqVO.qcType}
+            </if>
+            <if test="reqVO.inspectDate != null and reqVO.inspectDate.length > 0 and reqVO.inspectDate[0] != null">
+                AND t.inspectDate &gt;= #{reqVO.inspectDate[0]}
+            </if>
+            <if test="reqVO.inspectDate != null and reqVO.inspectDate.length > 1 and reqVO.inspectDate[1] != null">
+                AND t.inspectDate &lt;= #{reqVO.inspectDate[1]}
+            </if>
+            <if test="reqVO.code != null and reqVO.code != ''">
+                AND t.code LIKE CONCAT('%', #{reqVO.code}, '%')
+            </if>
+            <if test="reqVO.itemId != null">
+                AND t.itemId = #{reqVO.itemId}
+            </if>
+            <if test="reqVO.batchNo != null and reqVO.batchNo != ''">
+                AND t.batchNo LIKE CONCAT('%', #{reqVO.batchNo}, '%')
+            </if>
+            <if test="reqVO.checkResult != null">
+                AND t.checkResult = #{reqVO.checkResult}
+            </if>
+            <if test="reqVO.inspectorUserId != null">
+                AND t.inspectorUserId = #{reqVO.inspectorUserId}
+            </if>
+        </where>
+        ORDER BY t.inspectDate DESC, t.qcId DESC, t.qcType ASC
+    </select>
+
+</mapper>
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java
deleted file mode 100644
index 5222170..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/SystemCompanyConfigController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.companyconfig;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigSaveReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
-import cn.iocoder.yudao.module.system.service.companyconfig.SystemCompanyConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - 鍏徃鍝佺墝淇℃伅")
-@RestController
-@RequestMapping("/system/company-config")
-@Validated
-public class SystemCompanyConfigController {
-
-    @Resource
-    private SystemCompanyConfigService companyConfigService;
-
-    /**
-     * 鑾峰緱鍏徃鍝佺墝淇℃伅
-     *
-     * 鍏嶇櫥褰曞叕寮�鎺ュ彛锛屼緵鍓嶇鐧诲綍椤� / 搴旂敤鍚姩鏃惰鍙栧叕鍙稿悕绉般�乴ogo銆佺櫥褰曢〉鏍囬銆�
-     */
-    @GetMapping("/get")
-    @Operation(summary = "鑾峰緱鍏徃鍝佺墝淇℃伅锛堝厤鐧诲綍鍏紑锛�")
-    @PermitAll
-    public CommonResult<SystemCompanyConfigRespVO> getCompanyConfig() {
-        SystemCompanyConfigDO config = companyConfigService.getCompanyConfig();
-        return success(BeanUtils.toBean(config, SystemCompanyConfigRespVO.class));
-    }
-
-    /**
-     * 淇濆瓨鍏徃鍝佺墝淇℃伅
-     *
-     * 鍗曡 upsert锛岄渶鐧诲綍涓旀嫢鏈� system:company-config:update 鏉冮檺銆�
-     * 鏉冮檺閫氳繃鑿滃崟銆屽叕鍙镐俊鎭厤缃� - 淇敼銆嶆巿鏉冿紙瑙� sql/mysql/system_company_config_menu.sql锛夈��
-     */
-    @PostMapping("/save")
-    @Operation(summary = "淇濆瓨鍏徃鍝佺墝淇℃伅")
-    @PreAuthorize("@ss.hasPermission('system:company-config:update')")
-    public CommonResult<Long> saveCompanyConfig(@Valid @RequestBody SystemCompanyConfigSaveReqVO reqVO) {
-        return success(companyConfigService.saveCompanyConfig(reqVO));
-    }
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java
deleted file mode 100644
index 7faff1b..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigRespVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "绠$悊鍚庡彴 - 鍏徃鍝佺墝淇℃伅 Response VO")
-@Data
-public class SystemCompanyConfigRespVO {
-
-    @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Long id;
-
-    @Schema(description = "鍏徃鍚嶇О", example = "瀹佸涔濇硴鍖栧伐")
-    private String companyName;
-
-    @Schema(description = "logo 姘镐箙鍏紑閾炬帴锛坧reviewURL锛�", example = "http://domain/admin-api/system/storage-blob/preview/xxx?publicKey=xxx")
-    private String logoUrl;
-
-    @Schema(description = "logo 瀵瑰簲鐨� blob 璁板綍 ID", example = "86")
-    private Long logoBlobId;
-
-    @Schema(description = "鐧诲綍椤垫爣棰�", example = "鍒堕�犺繍钀ョ鐞嗗钩鍙�")
-    private String loginTitle;
-
-    @Schema(description = "鐧诲綍椤垫弿杩�", example = "宸ョ▼鍖栥�侀珮鎬ц兘銆佽法缁勪欢搴撶殑鍓嶇妯$増")
-    private String loginDescription;
-
-    @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java
deleted file mode 100644
index 76193e6..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/companyconfig/vo/SystemCompanyConfigSaveReqVO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-@Schema(description = "绠$悊鍚庡彴 - 鍏徃鍝佺墝淇℃伅淇濆瓨 Request VO")
-@Data
-public class SystemCompanyConfigSaveReqVO {
-
-    @Schema(description = "涓婚敭锛堝崟琛岄厤缃紝鍙笉浼狅級", example = "1")
-    private Long id;
-
-    @Schema(description = "鍏徃鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "瀹佸涔濇硴鍖栧伐")
-    @NotBlank(message = "鍏徃鍚嶇О涓嶈兘涓虹┖")
-    @Size(max = 128, message = "鍏徃鍚嶇О涓嶈兘瓒呰繃128涓瓧绗�")
-    private String companyName;
-
-    @Schema(description = "logo 姘镐箙鍏紑閾炬帴锛坧reviewURL锛�", example = "http://domain/admin-api/system/storage-blob/preview/xxx?publicKey=xxx")
-    @Size(max = 512, message = "logo 鍦板潃涓嶈兘瓒呰繃512涓瓧绗�")
-    private String logoUrl;
-
-    @Schema(description = "logo 瀵瑰簲鐨� blob 璁板綍 ID", example = "86")
-    private Long logoBlobId;
-
-    @Schema(description = "鐧诲綍椤垫爣棰�", example = "鍒堕�犺繍钀ョ鐞嗗钩鍙�")
-    @Size(max = 128, message = "鐧诲綍椤垫爣棰樹笉鑳借秴杩�128涓瓧绗�")
-    private String loginTitle;
-
-    @Schema(description = "鐧诲綍椤垫弿杩�", example = "宸ョ▼鍖栥�侀珮鎬ц兘銆佽法缁勪欢搴撶殑鍓嶇妯$増")
-    @Size(max = 128, message = "鐧诲綍椤垫弿杩颁笉鑳借秴杩�128涓瓧绗�")
-    private String loginDescription;
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java
deleted file mode 100644
index 51ed463..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/database/DatabaseBackupController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.database;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.system.service.database.DatabaseBackupService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-
-@Tag(name = "绠$悊鍚庡彴 - 鏁版嵁搴撳浠�")
-@RestController
-@RequestMapping("/system/database")
-public class DatabaseBackupController {
-
-    @Resource
-    private DatabaseBackupService databaseBackupService;
-
-    @GetMapping("/backup")
-    @Operation(summary = "涓嬭浇鏁版嵁搴撳浠�")
-    @PreAuthorize("@ss.hasPermission('system:database:backup')")
-    public void backupDatabase(HttpServletResponse response) throws Exception {
-        databaseBackupService.backupDatabase(response);
-    }
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java
deleted file mode 100644
index 0f877f4..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/companyconfig/SystemCompanyConfigDO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.dataobject.companyconfig;
-
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 鍏徃鍝佺墝淇℃伅閰嶇疆 DO
- *
- * 鍗曡閰嶇疆锛氫繚瀛樺叕鍙稿悕绉�/logo/鐧诲綍椤垫爣棰橈紝鍓嶇鍚姩鏃惰鍙栧苟鑱斿姩鐧诲綍椤点�佽彍鍗曟爮銆佺綉椤垫爣棰樸��
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@TableName("system_company_config")
-@KeySequence("system_company_config_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SystemCompanyConfigDO extends BaseDO {
-
-    /**
-     * 涓婚敭
-     */
-    private Long id;
-    /**
-     * 鍏徃鍚嶇О
-     */
-    private String companyName;
-    /**
-     * logo 姘镐箙鍏紑閾炬帴锛坧ublic-upload 杩斿洖鐨� previewURL锛�
-     */
-    private String logoUrl;
-    /**
-     * logo 瀵瑰簲鐨� blob 璁板綍 ID
-     */
-    private Long logoBlobId;
-    /**
-     * 鐧诲綍椤垫爣棰�
-     */
-    private String loginTitle;
-    /**
-     * 鐧诲綍椤垫弿杩�
-     */
-    private String loginDescription;
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java
deleted file mode 100644
index c098410..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/companyconfig/SystemCompanyConfigMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.system.dal.mysql.companyconfig;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 鍏徃鍝佺墝淇℃伅閰嶇疆 Mapper
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Mapper
-public interface SystemCompanyConfigMapper extends BaseMapperX<SystemCompanyConfigDO> {
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java
deleted file mode 100644
index e2483da..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.system.service.companyconfig;
-
-import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigSaveReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
-
-/**
- * 鍏徃鍝佺墝淇℃伅閰嶇疆 Service 鎺ュ彛
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-public interface SystemCompanyConfigService {
-
-    /**
-     * 鑾峰緱鍏徃鍝佺墝淇℃伅锛堝崟琛岄厤缃級
-     *
-     * @return 鍏徃鍝佺墝淇℃伅锛屾湭閰嶇疆鏃惰繑鍥� null
-     */
-    SystemCompanyConfigDO getCompanyConfig();
-
-    /**
-     * 淇濆瓨鍏徃鍝佺墝淇℃伅锛堝崟琛� upsert锛�
-     *
-     * @param reqVO 淇濆瓨璇锋眰
-     * @return 涓婚敭
-     */
-    Long saveCompanyConfig(SystemCompanyConfigSaveReqVO reqVO);
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java
deleted file mode 100644
index c862d36..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/companyconfig/SystemCompanyConfigServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.system.service.companyconfig;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.system.controller.admin.companyconfig.vo.SystemCompanyConfigSaveReqVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.companyconfig.SystemCompanyConfigDO;
-import cn.iocoder.yudao.module.system.dal.mysql.companyconfig.SystemCompanyConfigMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 鍏徃鍝佺墝淇℃伅閰嶇疆 Service 瀹炵幇绫�
- *
- * @author 瓒呯骇绠$悊鍛�
- */
-@Service
-public class SystemCompanyConfigServiceImpl implements SystemCompanyConfigService {
-
-    @Resource
-    private SystemCompanyConfigMapper companyConfigMapper;
-
-    @Override
-    public SystemCompanyConfigDO getCompanyConfig() {
-        // 鍗曡閰嶇疆锛氭寜涓婚敭鍗囧簭鍙栫涓�鏉�
-        List<SystemCompanyConfigDO> list = companyConfigMapper.selectList(new LambdaQueryWrapperX<SystemCompanyConfigDO>()
-                .orderByAsc(SystemCompanyConfigDO::getId)
-                .last("LIMIT 1"));
-        return CollUtil.getFirst(list);
-    }
-
-    @Override
-    public Long saveCompanyConfig(SystemCompanyConfigSaveReqVO reqVO) {
-        SystemCompanyConfigDO config = getCompanyConfig();
-        if (config == null) {
-            // 棣栨淇濆瓨锛氭彃鍏�
-            SystemCompanyConfigDO insertObj = BeanUtils.toBean(reqVO, SystemCompanyConfigDO.class);
-            companyConfigMapper.insert(insertObj);
-            return insertObj.getId();
-        }
-        // 宸插瓨鍦細鏇存柊鍗曡
-        SystemCompanyConfigDO updateObj = BeanUtils.toBean(reqVO, SystemCompanyConfigDO.class);
-        updateObj.setId(config.getId());
-        companyConfigMapper.updateById(updateObj);
-        return config.getId();
-    }
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java
deleted file mode 100644
index b48ac79..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.system.service.database;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-public interface DatabaseBackupService {
-
-    /**
-     * 澶囦唤鏁版嵁搴擄紝骞跺皢 SQL 鏂囦欢鍐欏叆鍒� HTTP 鍝嶅簲涓�
-     *
-     * @param response HTTP 鍝嶅簲
-     */
-    void backupDatabase(HttpServletResponse response) throws Exception;
-
-}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java
deleted file mode 100644
index 0ff72a9..0000000
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/database/DatabaseBackupServiceImpl.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package cn.iocoder.yudao.module.system.service.database;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.HexUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.sql.DataSource;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@Service
-@Slf4j
-public class DatabaseBackupServiceImpl implements DatabaseBackupService {
-
-    /** 澶囦唤瓒呮椂鏃堕棿锛堝垎閽燂級 */
-    private static final long BACKUP_TIMEOUT_MINUTES = 10;
-    /** MySQL 瀹瑰櫒鍐呴儴绔彛 */
-    private static final String DOCKER_MYSQL_PORT = "3306";
-
-    @Value("${spring.datasource.dynamic.datasource.master.url:}")
-    private String dbUrl;
-
-    @Value("${spring.datasource.dynamic.datasource.master.username:root}")
-    private String dbUsername;
-
-    @Value("${spring.datasource.dynamic.datasource.master.password:}")
-    private String dbPassword;
-
-    /** 澶囦唤鍛戒护锛屽彲鏄惧紡鎸囧畾锛堝 docker exec mysql8 mysqldump锛夛紱鐣欑┖鍒欒嚜鍔ㄦ娴嬫湰鍦� mysqldump 鎴� Docker MySQL 瀹瑰櫒 */
-    @Value("${yudao.database-backup.command:}")
-    private String backupCommand;
-
-    /** 澶囦唤鐩爣鏁版嵁搴� host锛岀暀绌哄垯浠庢暟鎹簮 JDBC URL 瑙f瀽 */
-    @Value("${yudao.database-backup.host:}")
-    private String backupHost;
-
-    /** 澶囦唤鐩爣鏁版嵁搴� port锛岀暀绌哄垯浠庢暟鎹簮 JDBC URL 瑙f瀽 */
-    @Value("${yudao.database-backup.port:}")
-    private String backupPort;
-
-    /** 澶囦唤鐩爣鏁版嵁搴撳悕锛岀暀绌哄垯浠庢暟鎹簮 JDBC URL 瑙f瀽 */
-    @Value("${yudao.database-backup.database:}")
-    private String backupDatabase;
-
-    /** 澶囦唤璐﹀彿锛岀暀绌哄垯浣跨敤鏁版嵁婧愯处鍙� */
-    @Value("${yudao.database-backup.username:}")
-    private String backupUsername;
-
-    /** 澶囦唤瀵嗙爜锛岀暀绌哄垯浣跨敤鏁版嵁婧愬瘑鐮� */
-    @Value("${yudao.database-backup.password:}")
-    private String backupPassword;
-
-    /** 涓绘暟鎹簮锛岀敤浜� JDBC 瀵煎嚭鍏滃簳 */
-    @Resource
-    private DataSource dataSource;
-
-    @Override
-    public void backupDatabase(HttpServletResponse response) throws Exception {
-        if (StrUtil.isEmpty(dbUrl)) {
-            throw new ServiceException(500, "鏈壘鍒版暟鎹簱杩炴帴閰嶇疆");
-        }
-
-        // 澶囦唤杩炴帴鐨勬暟鎹簱淇℃伅锛氫紭鍏堜娇鐢� yudao.database-backup 閰嶇疆锛屾湭閰嶇疆鐨勯儴鍒嗕粠鏁版嵁婧� JDBC URL 瑙f瀽鍏滃簳
-        String dbHost = backupHost;
-        String dbPort = backupPort;
-        String dbName = backupDatabase;
-        if (StrUtil.isEmpty(dbHost) || StrUtil.isEmpty(dbPort) || StrUtil.isEmpty(dbName)) {
-            Matcher matcher = Pattern.compile("jdbc:mysql://([^:]+):(\\d+)/([^?]+)").matcher(dbUrl);
-            if (matcher.find()) {
-                if (StrUtil.isEmpty(dbHost)) {
-                    dbHost = matcher.group(1);
-                }
-                if (StrUtil.isEmpty(dbPort)) {
-                    dbPort = matcher.group(2);
-                }
-                if (StrUtil.isEmpty(dbName)) {
-                    dbName = matcher.group(3);
-                }
-            }
-        }
-        if (StrUtil.isEmpty(dbHost) || StrUtil.isEmpty(dbPort) || StrUtil.isEmpty(dbName)) {
-            log.warn("鏃犳硶浠庨厤缃垨 JDBC URL 瑙f瀽瀹屾暣鐨勬暟鎹簱淇℃伅: host={}, port={}, db={}", dbHost, dbPort, dbName);
-            throw new ServiceException(500, "鏃犳硶瑙f瀽鏁版嵁搴撳浠借繛鎺ヤ俊鎭紝璇峰湪 yudao.database-backup 涓厤缃� host/port/database");
-        }
-        // localhost 缁熶竴璧� TCP 127.0.0.1锛歮ysqldump 瀵� localhost 鍙兘璧� socket/loopback锛�
-        // 鑰屼笉鍚岀幆澧� root@localhost 鐨勮璇佽姹傚樊寮傚ぇ锛屽己鍒� TCP 鏇寸ǔ瀹�
-        if ("localhost".equalsIgnoreCase(dbHost)) {
-            dbHost = "127.0.0.1";
-        }
-        String username = StrUtil.isEmpty(backupUsername) ? dbUsername : backupUsername;
-        String password = StrUtil.isEmpty(backupPassword) ? dbPassword : backupPassword;
-
-        // 缁勮鍊欓�夊浠藉懡浠わ紝鎸変紭鍏堢骇渚濇灏濊瘯锛氭墜鍔ㄩ厤缃� > 鏈満 mysqldump > Docker 瀹瑰櫒 mysqldump
-        List<List<String>> candidates = new ArrayList<>();
-        List<String> labels = new ArrayList<>();
-        if (StrUtil.isNotEmpty(backupCommand)) {
-            candidates.add(splitCommand(backupCommand));
-            labels.add("鎵嬪姩閰嶇疆鍛戒护[" + backupCommand + "]");
-        }
-        if (isLocalMysqldumpAvailable()) {
-            candidates.add(buildLocalMysqldumpCommand(dbHost, dbPort, username, password, dbName));
-            labels.add("鏈満 mysqldump");
-        }
-        String container = findMysqlDockerContainer(dbPort);
-        if (StrUtil.isNotEmpty(container)) {
-            candidates.add(buildDockerExecCommand(container, username, password, dbName));
-            labels.add("Docker 瀹瑰櫒[" + container + "] mysqldump");
-        }
-        log.info("鏁版嵁搴撳浠藉�欓�夋柟寮忥細{}", labels);
-
-        // 渚濇灏濊瘯鎵�鏈夊閮ㄥ懡浠ゆ柟寮�
-        List<String> failures = new ArrayList<>();
-        String timestamp = DateUtil.format(new Date(), "yyyyMMdd_HHmmss");
-        String fileName = "backup_" + timestamp + ".sql";
-        for (int i = 0; i < candidates.size(); i++) {
-            File tempFile = File.createTempFile("backup_", ".sql");
-            try {
-                String error = runMysqldump(candidates.get(i), password, tempFile);
-                if (error == null) {
-                    log.info("鏁版嵁搴撳浠芥垚鍔燂紝浣跨敤鏂瑰紡锛歿}", labels.get(i));
-                    downloadAttachment(response, tempFile, fileName);
-                    return;
-                }
-                log.warn("澶囦唤鏂瑰紡 [{}] 澶辫触锛歿}", labels.get(i), error);
-                failures.add(labels.get(i) + "锛�" + error);
-            } finally {
-                FileUtil.del(tempFile);
-            }
-        }
-
-        // 澶栭儴鍛戒护鍏ㄩ儴澶辫触鎴栦笉鍙敤鏃讹紝浣跨敤 JDBC 瀵煎嚭鍏滃簳锛屼繚璇佷换浣曢儴缃茬幆澧冿紙濡傚簲鐢ㄥ鍣ㄥ唴鏃� mysqldump/docker锛夐兘鑳藉浠�
-        File tempFile = File.createTempFile("backup_", ".sql");
-        try {
-            String error = exportByJdbc(tempFile);
-            if (error == null) {
-                log.info("鏁版嵁搴撳浠芥垚鍔燂紝浣跨敤鏂瑰紡锛欽DBC 瀵煎嚭鍏滃簳");
-                downloadAttachment(response, tempFile, fileName);
-                return;
-            }
-            log.warn("JDBC 瀵煎嚭鍏滃簳澶辫触锛歿}", error);
-            failures.add("JDBC 瀵煎嚭鍏滃簳锛�" + error);
-        } finally {
-            FileUtil.del(tempFile);
-        }
-        throw new ServiceException(500, "鏁版嵁搴撳浠藉け璐ワ細" + String.join(" 锝� ", failures));
-    }
-
-    /**
-     * 閫氳繃 JDBC 鐩磋繛鏁版嵁搴撳鍑哄缓琛ㄨ鍙ヤ笌鍏ㄩ噺鏁版嵁锛屼綔涓哄閮ㄥ懡浠や笉鍙敤鏃剁殑鍏滃簳澶囦唤鏂瑰紡
-     *
-     * @return 鎵ц鎴愬姛杩斿洖 null锛涘け璐ヨ繑鍥為敊璇弿杩�
-     */
-    private String exportByJdbc(File outputFile) {
-        try (Connection conn = dataSource.getConnection();
-             BufferedWriter writer = new BufferedWriter(
-                     new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8))) {
-            writer.write("/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n");
-            writer.write("/*!40101 SET NAMES utf8mb4 */;\n");
-            writer.write("SET TIME_ZONE='+00:00';\n");
-            writer.write("SET FOREIGN_KEY_CHECKS=0;\n");
-            writer.write("SET UNIQUE_CHECKS=0;\n");
-            writer.write("SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';\n\n");
-            try (Statement st = conn.createStatement();
-                 ResultSet rs = st.executeQuery("SHOW TABLES")) {
-                List<String> tables = new ArrayList<>();
-                while (rs.next()) {
-                    tables.add(rs.getString(1));
-                }
-                for (String table : tables) {
-                    exportTable(conn, writer, table);
-                }
-            }
-            writer.write("\nSET FOREIGN_KEY_CHECKS=1;\n");
-            writer.write("SET UNIQUE_CHECKS=1;\n");
-            writer.write("/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n");
-            return null;
-        } catch (Exception e) {
-            log.error("JDBC 瀵煎嚭鍏滃簳澶辫触", e);
-            return "JDBC 瀵煎嚭寮傚父: " + e.getMessage();
-        }
-    }
-
-    /**
-     * 瀵煎嚭鍗曞紶琛ㄧ殑寤鸿〃璇彞涓庡叏閮ㄦ暟鎹�
-     */
-    private void exportTable(Connection conn, BufferedWriter writer, String table) throws Exception {
-        String quoted = "`" + table.replace("`", "``") + "`";
-        // 寤鸿〃璇彞
-        try (Statement st = conn.createStatement();
-             ResultSet rs = st.executeQuery("SHOW CREATE TABLE " + quoted)) {
-            if (rs.next()) {
-                writer.write(rs.getString(2));
-                writer.write(";\n\n");
-            }
-        }
-        // 鍏ㄩ噺鏁版嵁锛屾祦寮忚鍙栭伩鍏嶅ぇ琛ㄥ崰鐢ㄨ繃澶氬唴瀛�
-        try (Statement st = conn.createStatement()) {
-            st.setFetchSize(Integer.MIN_VALUE);
-            try (ResultSet rs = st.executeQuery("SELECT * FROM " + quoted)) {
-                ResultSetMetaData meta = rs.getMetaData();
-                int columnCount = meta.getColumnCount();
-                int[] types = new int[columnCount];
-                for (int i = 0; i < columnCount; i++) {
-                    types[i] = meta.getColumnType(i + 1);
-                }
-                while (rs.next()) {
-                    StringBuilder sb = new StringBuilder("INSERT INTO ").append(quoted).append(" VALUES (");
-                    for (int i = 0; i < columnCount; i++) {
-                        if (i > 0) {
-                            sb.append(',');
-                        }
-                        if (rs.getObject(i + 1) == null) {
-                            sb.append("NULL");
-                            continue;
-                        }
-                        int type = types[i];
-                        if (type == Types.BIT) {
-                            sb.append(rs.getBoolean(i + 1) ? '1' : '0');
-                        } else if (isBinaryType(type)) {
-                            sb.append("X'").append(HexUtil.encodeHexStr(rs.getBytes(i + 1))).append("'");
-                        } else {
-                            sb.append('\'').append(escapeSql(rs.getString(i + 1))).append('\'');
-                        }
-                    }
-                    sb.append(");\n");
-                    writer.write(sb.toString());
-                }
-            }
-        }
-        writer.write('\n');
-    }
-
-    /**
-     * 鏄惁浜岃繘鍒跺垪绫诲瀷锛屼簩杩涘埗鏁版嵁浠ュ崄鍏繘鍒跺瓧闈㈤噺瀵煎嚭閬垮厤涔辩爜
-     */
-    private boolean isBinaryType(int type) {
-        return type == Types.BINARY || type == Types.VARBINARY
-                || type == Types.LONGVARBINARY || type == Types.BLOB;
-    }
-
-    /**
-     * SQL 瀛楃涓插瓧闈㈤噺杞箟
-     */
-    private String escapeSql(String value) {
-        return value.replace("\\", "\\\\").replace("'", "''").replace("\0", "\\0");
-    }
-
-    /**
-     * 鏋勫缓鏈満 mysqldump 澶囦唤鍛戒护
-     */
-    private List<String> buildLocalMysqldumpCommand(String host, String port, String username, String password, String dbName) {
-        List<String> command = new ArrayList<>();
-        command.add("mysqldump");
-        // MySQL 8 caching_sha2_password 璁よ瘉榛樿涓嶈姹傛湇鍔$鍏挜锛屼細鎶� Access denied (using password: YES)
-        command.add("--get-server-public-key");
-        command.add("-h" + host);
-        command.add("-P" + port);
-        command.add("-u" + username);
-        if (StrUtil.isEmpty(password)) {
-            command.add("--skip-password");
-        }
-        command.add(dbName);
-        return command;
-    }
-
-    /**
-     * 鏋勫缓閫氳繃 docker exec 璋冪敤瀹瑰櫒鍐� mysqldump 鐨勫浠藉懡浠�
-     */
-    private List<String> buildDockerExecCommand(String container, String username, String password, String dbName) {
-        List<String> command = new ArrayList<>();
-        command.add("docker");
-        command.add("exec");
-        // docker exec 涓嶄細杞彂瀹夸富鏈虹幆澧冨彉閲忥紝瀵嗙爜闇�閫氳繃 -e 鏄惧紡浼犲叆瀹瑰櫒
-        if (StrUtil.isNotEmpty(password)) {
-            command.add("-e");
-            command.add("MYSQL_PWD=" + password);
-        }
-        command.add(container);
-        command.add("mysqldump");
-        command.add("--get-server-public-key");
-        // 瀹瑰櫒鍐呭浐瀹氳蛋 127.0.0.1:3306 鐨� TCP 杩炴帴鑷韩锛岀粫寮� socket/loopback 璁よ瘉宸紓
-        command.add("-h127.0.0.1");
-        command.add("-P" + DOCKER_MYSQL_PORT);
-        command.add("-u" + username);
-        if (StrUtil.isEmpty(password)) {
-            command.add("--skip-password");
-        }
-        command.add(dbName);
-        return command;
-    }
-
-    /**
-     * 鎵ц mysqldump 鍛戒护锛屽皢 stdout 鍐欏叆涓存椂鏂囦欢
-     *
-     * @return 鎵ц鎴愬姛杩斿洖 null锛涘け璐ヨ繑鍥為敊璇弿杩�
-     */
-    private String runMysqldump(List<String> command, String password, File outputFile) {
-        try {
-            ProcessBuilder pb = new ProcessBuilder(command);
-            // 瀵嗙爜閫氳繃鐜鍙橀噺浼犻�掞紝閬垮厤鍑虹幇鍦ㄥ懡浠よ鍙婅繘绋嬪垪琛�
-            if (StrUtil.isNotEmpty(password)) {
-                pb.environment().put("MYSQL_PWD", password);
-            }
-            Process process = pb.start();
-
-            // 鍚庡彴璇诲彇 stderr锛岄槻姝㈢閬撶紦鍐插尯鍐欐弧瀵艰嚧杩涚▼闃诲
-            StringBuilder stderr = new StringBuilder();
-            Thread stderrThread = new Thread(() -> {
-                try (BufferedReader reader = new BufferedReader(
-                        new InputStreamReader(process.getErrorStream(), StandardCharsets.UTF_8))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        stderr.append(line).append(System.lineSeparator());
-                    }
-                } catch (IOException ignored) {
-                }
-            });
-            stderrThread.start();
-
-            // mysqldump 杈撳嚭鍐欏叆鏈湴涓存椂鏂囦欢锛坉ocker exec 鍦烘櫙杈撳嚭涓嶄細钀藉湪瀹瑰櫒鍐呮枃浠剁郴缁燂級
-            try (InputStream in = process.getInputStream();
-                 OutputStream out = new FileOutputStream(outputFile)) {
-                IoUtil.copy(in, out);
-            }
-
-            boolean finished = process.waitFor(BACKUP_TIMEOUT_MINUTES, TimeUnit.MINUTES);
-            stderrThread.join();
-            if (!finished) {
-                process.destroyForcibly();
-                return "鎵ц瓒呮椂锛堣秴杩� " + BACKUP_TIMEOUT_MINUTES + " 鍒嗛挓锛�";
-            }
-            if (process.exitValue() != 0) {
-                return "exitCode=" + process.exitValue() + "锛�" + stderr.toString().trim();
-            }
-            return null;
-        } catch (IOException e) {
-            return "鍚姩鍛戒护澶辫触: " + e.getMessage();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return "鎵ц琚腑鏂�: " + e.getMessage();
-        }
-    }
-
-    /**
-     * 灏嗗浠芥枃浠朵綔涓洪檮浠惰緭鍑哄埌鍝嶅簲
-     */
-    private void downloadAttachment(HttpServletResponse response, File file, String fileName) throws IOException {
-        response.setContentType("application/octet-stream; charset=UTF-8");
-        response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
-        response.setContentLengthLong(file.length());
-        try (FileInputStream fis = new FileInputStream(file);
-             OutputStream os = response.getOutputStream()) {
-            IoUtil.copy(fis, os);
-        }
-    }
-
-    /**
-     * 灏嗛厤缃殑鍛戒护瀛楃涓叉寜绌虹櫧鍒囧垎涓哄弬鏁板垪琛�
-     */
-    private List<String> splitCommand(String command) {
-        List<String> parts = new ArrayList<>();
-        for (String token : command.trim().split("\\s+")) {
-            parts.add(token);
-        }
-        return parts;
-    }
-
-    /**
-     * 妫�娴嬫湰鏈� mysqldump 鏄惁鍙敤
-     */
-    private boolean isLocalMysqldumpAvailable() {
-        try {
-            Process process = new ProcessBuilder("mysqldump", "--version").redirectErrorStream(true).start();
-            boolean finished = process.waitFor(5, TimeUnit.SECONDS);
-            if (!finished) {
-                process.destroyForcibly();
-                return false;
-            }
-            return process.exitValue() == 0;
-        } catch (IOException e) {
-            return false;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
-    }
-
-    /**
-     * 鏌ユ壘杩愯涓殑 MySQL Docker 瀹瑰櫒锛屼紭鍏堥�夋嫨绔彛鏄犲皠涓庢暟鎹簮绔彛涓�鑷寸殑瀹瑰櫒
-     *
-     * @return 瀹瑰櫒鍚嶏紱鏈壘鍒拌繑鍥� null
-     */
-    private String findMysqlDockerContainer(String dbPort) {
-        try {
-            Process ps = new ProcessBuilder("docker", "ps", "--format", "{{.ID}}|{{.Names}}|{{.Image}}")
-                    .redirectErrorStream(true).start();
-            String output = IoUtil.read(ps.getInputStream(), StandardCharsets.UTF_8);
-            if (!ps.waitFor(10, TimeUnit.SECONDS) || ps.exitValue() != 0) {
-                return null;
-            }
-            List<String[]> containers = new ArrayList<>();
-            for (String line : output.split("\n")) {
-                String[] parts = line.trim().split("\\|");
-                if (parts.length == 3 && parts[2].startsWith("mysql")) {
-                    containers.add(parts);
-                }
-            }
-            if (containers.isEmpty()) {
-                return null;
-            }
-            // 浼樺厛閫夋嫨绔彛鏄犲皠涓庢暟鎹簮绔彛涓�鑷寸殑瀹瑰櫒
-            for (String[] container : containers) {
-                Process portProcess = new ProcessBuilder("docker", "port", container[0], "3306/tcp")
-                        .redirectErrorStream(true).start();
-                String portOutput = IoUtil.read(portProcess.getInputStream(), StandardCharsets.UTF_8);
-                if (portProcess.waitFor(10, TimeUnit.SECONDS) && portProcess.exitValue() == 0
-                        && portOutput.contains(dbPort)) {
-                    return container[1];
-                }
-            }
-            log.warn("鏈尮閰嶅埌绔彛鏄犲皠鐨� MySQL 瀹瑰櫒锛屼娇鐢ㄧ涓�涓�: {}", containers.get(0)[1]);
-            return containers.get(0)[1];
-        } catch (IOException e) {
-            log.warn("妫�娴� Docker 鐜澶辫触: {}", e.getMessage());
-            return null;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return null;
-        }
-    }
-}
\ No newline at end of file

--
Gitblit v1.9.3