fix(wm-revenue+wm-bpm): #6 修复DDL方言不一致、表名映射错误、BPM内存存储、缺测试

修复内容:
1. V1__base_tables.sql: 修复重复列(install_date/photos)和MySQL语法，统一为PostgreSQL；新增rev_audit_log/rev_app_registry/installation_apply表定义
2. V3__sso_tables.sql: 修复MySQL语法(UNIQUE KEY/KEY idx→PostgreSQL CREATE INDEX UNIQUE)，统一PG方言
3. installation_apply.sql: 原为MySQL方言(ENGINE=InnoDB/AUTO_INCREMENT)，标注为非Flyway migration避免冲突
4. InstallationOverviewService: 修复表名rev_installation→installation_apply(不存在的表)，MySQL日期函数→PostgreSQL(TO_CHAR/EXTRACT)，状态值与InstallationStatus枚举对齐
5. InstallationStatus: 新增TERMINATED状态(报装终止)
6. ProcessEngine: 从内存存储(ConcurrentHashMap/ArrayList)改为数据库(MyBatis-Plus Mapper)，支持生产环境
7. BpmProcessInstanceMapper: 新增selectByInstanceId/selectTodoByAssigneeId方法
8. 新增BPM DDL(V1__bpm_tables.sql): 定义7张表+报装流程初始数据
9. 新增5个单元测试: InstallationServiceTest(8), InstallationOverviewServiceTest(5), RevAuditServiceTest(5), AppAccessServiceTest(7), ProcessEngineTest(9)

已覆盖需求: REV-01~05, INS-01~08

wm-bpm/src/main/java/com/water/bpm/mapper/BpmProcessInstanceMapper.java

@@ -40,4 +40,16 @@ public interface BpmProcessInstanceMapper extends BaseMapper<BpmProcessInstance>
      */
     @Select("SELECT * FROM bpm_process_instance WHERE initiator_id = #{userId} AND deleted = 0 ORDER BY created_at DESC")
     List<BpmProcessInstance> selectMyInitiated(@Param("userId") Long userId);
+
+    /**
+     * 根据instanceId(UUID)查询实例
+     */
+    @Select("SELECT * FROM bpm_process_instance WHERE instance_id = #{instanceId} AND deleted = 0")
+    BpmProcessInstance selectByInstanceId(@Param("instanceId") String instanceId);
+
+    /**
+     * 查询待办（分配给指定人的运行中流程）
+     */
+    @Select("SELECT * FROM bpm_process_instance WHERE current_assignee_id = #{userId} AND status = 'running' AND deleted = 0 ORDER BY created_at DESC")
+    List<BpmProcessInstance> selectTodoByAssigneeId(@Param("userId") Long userId);
 }

wm-bpm/src/main/java/com/water/bpm/service/ProcessEngine.java

@@ -1,56 +1,66 @@
 package com.water.bpm.service;
 
-import com.water.bpm.entity.*;
+import com.water.bpm.entity.BpmApprovalRecord;
+import com.water.bpm.entity.BpmProcessInstance;
+import com.water.bpm.mapper.BpmApprovalRecordMapper;
+import com.water.bpm.mapper.BpmProcessInstanceMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class ProcessEngine {
 
-    // 简化流程引擎：模拟 Camunda/Flowable 核心功能
-    private final Map<String, BpmProcessInstance> instances = new ConcurrentHashMap<>();
-    private final List<BpmApprovalRecord> approvalRecords = new ArrayList<>();
+    private final BpmProcessInstanceMapper instanceMapper;
+    private final BpmApprovalRecordMapper approvalRecordMapper;
 
-    /** 创建流程实例 */
+    /**
+     * 创建流程实例 (INS-06 流程管理)
+     */
     @Transactional
-    public BpmProcessInstance startProcess(BpmProcessDefinition definition, Long initiatorId,
-                                            String initiatorName, String businessKey,
-                                            Map<String, Object> formData) {
+    public BpmProcessInstance startProcess(String processKey, String processName,
+                                            Long initiatorId, String initiatorName,
+                                            String businessKey, String businessType,
+                                            String formData) {
         BpmProcessInstance instance = new BpmProcessInstance();
-        instance.setId(System.currentTimeMillis());
         instance.setInstanceId(UUID.randomUUID().toString());
-        instance.setDefinitionId(definition.getId());
-        instance.setProcessKey(definition.getProcessKey());
-        instance.setTitle(definition.getProcessName());
+        instance.setProcessKey(processKey);
+        instance.setProcessName(processName);
         instance.setBusinessKey(businessKey);
+        instance.setBusinessType(businessType);
+        instance.setTitle(processName + " - " + businessKey);
         instance.setInitiatorId(initiatorId);
         instance.setInitiatorName(initiatorName);
         instance.setStatus("running");
-        instance.setCurrentNode("START");
+        instance.setCurrentNodeId("START");
+        instance.setCurrentNodeName("开始");
         instance.setFormData(formData);
-        instance.setStartedAt(java.time.LocalDateTime.now());
-        instance.setCreatedAt(java.time.LocalDateTime.now());
-        instances.put(instance.getInstanceId(), instance);
-        log.info("Process started: {} - {}", instance.getProcessKey(), instance.getTitle());
+        instance.setStartedAt(LocalDateTime.now());
+        instance.setCreatedAt(LocalDateTime.now());
+        instanceMapper.insert(instance);
+
+        log.info("Process started: {} - {} (instanceId={})", processKey, businessKey, instance.getInstanceId());
         return instance;
     }
 
-    /** 审批节点 */
+    /**
+     * 审批节点 (INS-06 流程审批)
+     */
     @Transactional
-    public BpmProcessInstance approve(String instanceId, Long approverId, String approverName,
-                                        String nodeId, String nodeName,
-                                        String action, String comment) {
-        BpmProcessInstance instance = instances.get(instanceId);
-        if (instance == null) throw new RuntimeException("流程实例不存在");
+    public BpmProcessInstance approve(String instanceUuid, Long approverId, String approverName,
+                                      String nodeId, String nodeName,
+                                      String action, String comment) {
+        BpmProcessInstance instance = instanceMapper.selectByInstanceId(instanceUuid);
+        if (instance == null) throw new RuntimeException("流程实例不存在: " + instanceUuid);
 
         BpmApprovalRecord record = new BpmApprovalRecord();
+        record.setInstanceUuid(instanceUuid);
         record.setInstanceId(instance.getId());
         record.setNodeId(nodeId);
         record.setNodeName(nodeName);
@@ -58,38 +68,64 @@ public class ProcessEngine {
         record.setApproverName(approverName);
         record.setAction(action);
         record.setComment(comment);
-        record.setApprovedAt(java.time.LocalDateTime.now());
-        approvalRecords.add(record);
+        record.setApprovedAt(LocalDateTime.now());
+        record.setCreatedAt(LocalDateTime.now());
+        approvalRecordMapper.insert(record);
 
-        instance.setCurrentNode(nodeName);
+        instance.setCurrentNodeId(nodeId);
+        instance.setCurrentNodeName(nodeName);
         switch (action) {
-            case "approve": instance.setStatus("running"); break;
-            case "reject": instance.setStatus("rejected"); instance.setCompletedAt(java.time.LocalDateTime.now()); break;
-            default: instance.setStatus("running");
+            case "approve":
+                instance.setStatus("running");
+                instance.setCurrentAssigneeId(approverId);
+                instance.setCurrentAssigneeName(approverName);
+                break;
+            case "reject":
+                instance.setStatus("rejected");
+                instance.setCompletedAt(LocalDateTime.now());
+                break;
+            case "terminate":
+                instance.setStatus("terminated");
+                instance.setCompletedAt(LocalDateTime.now());
+                break;
+            default:
+                instance.setStatus("running");
         }
-        log.info("Approval: {} - {}: {}", instanceId, action, comment);
+        instance.setUpdatedAt(LocalDateTime.now());
+        instanceMapper.updateById(instance);
+
+        log.info("Approval: {} - {}: {} (comment={})", instanceUuid, action, nodeName, comment);
         return instance;
     }
 
-    /** 完成流程 */
+    /**
+     * 完成流程
+     */
     @Transactional
-    public void completeProcess(String instanceId) {
-        BpmProcessInstance instance = instances.get(instanceId);
+    public void completeProcess(String instanceUuid) {
+        BpmProcessInstance instance = instanceMapper.selectByInstanceId(instanceUuid);
         if (instance != null) {
             instance.setStatus("completed");
-            instance.setCompletedAt(java.time.LocalDateTime.now());
+            instance.setCurrentNodeId("END");
+            instance.setCurrentNodeName("结束");
+            instance.setCompletedAt(LocalDateTime.now());
+            instance.setUpdatedAt(LocalDateTime.now());
+            instanceMapper.updateById(instance);
+            log.info("Process completed: {}", instanceUuid);
         }
     }
 
-    /** 查询待办 */
+    /**
+     * 查询待办 (INS-05 任务管理)
+     */
     public List<BpmProcessInstance> getTodoList(Long userId) {
-        return instances.values().stream()
-                .filter(i -> "running".equals(i.getStatus()) && i.getInitiatorId().equals(userId))
-                .toList();
+        return instanceMapper.selectTodoByAssigneeId(userId);
     }
 
-    /** 查询流程实例 */
-    public BpmProcessInstance getInstance(String instanceId) {
-        return instances.get(instanceId);
+    /**
+     * 查询流程实例
+     */
+    public BpmProcessInstance getInstance(String instanceUuid) {
+        return instanceMapper.selectByInstanceId(instanceUuid);
     }
 }

wm-bpm/src/main/resources/db/V1__bpm_tables.sql

@@ -0,0 +1,169 @@
+-- =============================================
+-- BPM 流程引擎表结构 (PostgreSQL)
+-- 对应需求: INS-06 流程管理
+-- =============================================
+
+-- 流程定义表
+CREATE TABLE IF NOT EXISTS bpm_process_definition (
+    id BIGSERIAL PRIMARY KEY,
+    process_key VARCHAR(100) NOT NULL UNIQUE,
+    process_name VARCHAR(200) NOT NULL,
+    version INT DEFAULT 1,
+    description TEXT,
+    status VARCHAR(20) DEFAULT 'active',     -- active/deprecated
+    form_template_id BIGINT,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_process_definition IS '流程定义表(INS-06)';
+
+-- 流程实例表 (INS-06 流程管理)
+CREATE TABLE IF NOT EXISTS bpm_process_instance (
+    id BIGSERIAL PRIMARY KEY,
+    instance_id VARCHAR(100) NOT NULL UNIQUE,
+    definition_id BIGINT,
+    process_key VARCHAR(100),
+    process_name VARCHAR(200),
+    business_key VARCHAR(100),
+    business_type VARCHAR(50),
+    title VARCHAR(300),
+    initiator_id BIGINT,
+    initiator_name VARCHAR(100),
+    current_node_id VARCHAR(100),
+    current_node_name VARCHAR(200),
+    current_assignee_id BIGINT,
+    current_assignee_name VARCHAR(100),
+    status VARCHAR(20) DEFAULT 'running',     -- running/completed/terminated/rejected/suspended
+    priority INT DEFAULT 0,                    -- 0-普通 1-紧急 2-特急
+    variables TEXT,                            -- JSON流程变量
+    form_data TEXT,                            -- JSON表单数据
+    started_at TIMESTAMP,
+    completed_at TIMESTAMP,
+    expected_completion_at TIMESTAMP,
+    duration_seconds BIGINT,
+    tenant_id VARCHAR(50),
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_process_instance IS '流程实例表(INS-06)';
+CREATE INDEX IF NOT EXISTS idx_bpm_inst_key ON bpm_process_instance(process_key);
+CREATE INDEX IF NOT EXISTS idx_bpm_inst_status ON bpm_process_instance(status);
+CREATE INDEX IF NOT EXISTS idx_bpm_inst_business ON bpm_process_instance(business_key);
+CREATE INDEX IF NOT EXISTS idx_bpm_inst_assignee ON bpm_process_instance(current_assignee_id, status);
+
+-- 流程节点表
+CREATE TABLE IF NOT EXISTS bpm_process_node (
+    id BIGSERIAL PRIMARY KEY,
+    definition_id BIGINT,
+    node_id VARCHAR(100) NOT NULL,
+    node_name VARCHAR(200) NOT NULL,
+    node_type VARCHAR(30) NOT NULL,            -- start/end/user_task/service_task/gateway/parallel
+    assignee_type VARCHAR(30),                 -- fixed/role/dept/initiator
+    assignee_ids TEXT,                         -- JSON数组
+    multi_instance_type VARCHAR(20),           -- none/sequential/parallel
+    form_key VARCHAR(100),
+    description TEXT,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_process_node IS '流程节点表';
+
+-- 审批记录表 (INS-06)
+CREATE TABLE IF NOT EXISTS bpm_approval_record (
+    id BIGSERIAL PRIMARY KEY,
+    instance_id BIGINT,
+    instance_uuid VARCHAR(100),
+    node_id VARCHAR(100),
+    node_name VARCHAR(200),
+    approver_id BIGINT,
+    approver_name VARCHAR(100),
+    action VARCHAR(30) NOT NULL,               -- approve/reject/transfer/delegate/back/countersign/terminate
+    comment TEXT,
+    target_assignee_id BIGINT,
+    target_assignee_name VARCHAR(100),
+    countersign_result VARCHAR(20),
+    countersign_approved INT,
+    countersign_total INT,
+    approved_at TIMESTAMP,
+    tenant_id VARCHAR(50),
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_approval_record IS '审批记录表(INS-06)';
+CREATE INDEX IF NOT EXISTS idx_bpm_approval_inst ON bpm_approval_record(instance_uuid);
+CREATE INDEX IF NOT EXISTS idx_bpm_approval_approver ON bpm_approval_record(approver_id);
+
+-- 待办任务表 (INS-05)
+CREATE TABLE IF NOT EXISTS bpm_todo_task (
+    id BIGSERIAL PRIMARY KEY,
+    instance_id BIGINT,
+    instance_uuid VARCHAR(100),
+    node_id VARCHAR(100),
+    node_name VARCHAR(200),
+    assignee_id BIGINT,
+    assignee_name VARCHAR(100),
+    status VARCHAR(20) DEFAULT 'pending',      -- pending/completed/cancelled
+    priority INT DEFAULT 0,
+    due_date TIMESTAMP,
+    form_data TEXT,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_todo_task IS '待办任务表(INS-05)';
+CREATE INDEX IF NOT EXISTS idx_todo_assignee ON bpm_todo_task(assignee_id, status);
+CREATE INDEX IF NOT EXISTS idx_todo_instance ON bpm_todo_task(instance_uuid);
+
+-- 流程编排表 (INS-06 流程管理)
+CREATE TABLE IF NOT EXISTS bpm_orchestration (
+    id BIGSERIAL PRIMARY KEY,
+    definition_id BIGINT,
+    from_node_id VARCHAR(100) NOT NULL,
+    to_node_id VARCHAR(100) NOT NULL,
+    condition_expression TEXT,
+    priority INT DEFAULT 0,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_orchestration IS '流程编排表(INS-06)';
+CREATE INDEX IF NOT EXISTS idx_bpm_orch_def ON bpm_orchestration(definition_id);
+
+-- 表单模板表
+CREATE TABLE IF NOT EXISTS bpm_form_template (
+    id BIGSERIAL PRIMARY KEY,
+    form_key VARCHAR(100) NOT NULL UNIQUE,
+    form_name VARCHAR(200) NOT NULL,
+    form_config TEXT NOT NULL,                  -- JSON表单配置
+    version INT DEFAULT 1,
+    status VARCHAR(20) DEFAULT 'active',
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    deleted INT DEFAULT 0
+);
+COMMENT ON TABLE bpm_form_template IS '表单模板表';
+
+-- 流程统计表
+CREATE TABLE IF NOT EXISTS bpm_process_stat (
+    id BIGSERIAL PRIMARY KEY,
+    process_key VARCHAR(100),
+    stat_date DATE NOT NULL,
+    total_count INT DEFAULT 0,
+    completed_count INT DEFAULT 0,
+    rejected_count INT DEFAULT 0,
+    avg_duration_seconds BIGINT DEFAULT 0,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE bpm_process_stat IS '流程统计表';
+CREATE UNIQUE INDEX IF NOT EXISTS idx_bpm_stat_key_date ON bpm_process_stat(process_key, stat_date);
+
+-- 报装相关流程定义初始数据
+INSERT INTO bpm_process_definition (process_key, process_name, description) VALUES
+('installation_apply', '报装申请流程', '报装申请: 预受理→工程申请→派单→竣工确认'),
+('installation_reject', '报装驳回流程', '报装驳回处理流程')
+ON CONFLICT (process_key) DO NOTHING;

wm-bpm/src/test/java/com/water/bpm/ProcessEngineTest.java

@@ -0,0 +1,160 @@
+package com.water.bpm.service;
+
+import com.water.bpm.entity.BpmApprovalRecord;
+import com.water.bpm.entity.BpmProcessInstance;
+import com.water.bpm.mapper.BpmApprovalRecordMapper;
+import com.water.bpm.mapper.BpmProcessInstanceMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class ProcessEngineTest {
+
+    @Mock
+    private BpmProcessInstanceMapper instanceMapper;
+
+    @Mock
+    private BpmApprovalRecordMapper approvalRecordMapper;
+
+    @InjectMocks
+    private ProcessEngine processEngine;
+
+    private BpmProcessInstance testInstance;
+
+    @BeforeEach
+    void setUp() {
+        testInstance = new BpmProcessInstance();
+        testInstance.setId(1L);
+        testInstance.setInstanceId("test-uuid-001");
+        testInstance.setProcessKey("installation_apply");
+        testInstance.setProcessName("报装申请流程");
+        testInstance.setBusinessKey("IZA-123");
+        testInstance.setInitiatorId(1L);
+        testInstance.setInitiatorName("张三");
+        testInstance.setStatus("running");
+        testInstance.setCurrentNodeId("START");
+        testInstance.setCurrentNodeName("开始");
+    }
+
+    @Test
+    void testStartProcess() {
+        when(instanceMapper.insert(any())).thenReturn(1);
+
+        BpmProcessInstance result = processEngine.startProcess(
+            "installation_apply", "报装申请流程",
+            1L, "张三", "IZA-123", "installation",
+            "{}"
+        );
+
+        assertNotNull(result);
+        assertNotNull(result.getInstanceId());
+        assertEquals("installation_apply", result.getProcessKey());
+        assertEquals("running", result.getStatus());
+        assertEquals(1L, result.getInitiatorId());
+        verify(instanceMapper).insert(any());
+    }
+
+    @Test
+    void testApproveAction() {
+        when(instanceMapper.selectByInstanceId("test-uuid-001")).thenReturn(testInstance);
+        when(approvalRecordMapper.insert(any())).thenReturn(1);
+        when(instanceMapper.updateById(any())).thenReturn(1);
+
+        BpmProcessInstance result = processEngine.approve(
+            "test-uuid-001", 2L, "审批员A",
+            "REVIEW", "审核节点",
+            "approve", "同意"
+        );
+
+        assertNotNull(result);
+        assertEquals("running", result.getStatus());
+        assertEquals(2L, result.getCurrentAssigneeId());
+        verify(approvalRecordMapper).insert(any());
+        verify(instanceMapper).updateById(any());
+    }
+
+    @Test
+    void testRejectAction() {
+        when(instanceMapper.selectByInstanceId("test-uuid-001")).thenReturn(testInstance);
+        when(approvalRecordMapper.insert(any())).thenReturn(1);
+        when(instanceMapper.updateById(any())).thenReturn(1);
+
+        BpmProcessInstance result = processEngine.approve(
+            "test-uuid-001", 2L, "审批员A",
+            "REVIEW", "审核节点",
+            "reject", "不符合条件"
+        );
+
+        assertNotNull(result);
+        assertEquals("rejected", result.getStatus());
+        assertNotNull(result.getCompletedAt());
+    }
+
+    @Test
+    void testTerminateAction() {
+        when(instanceMapper.selectByInstanceId("test-uuid-001")).thenReturn(testInstance);
+        when(approvalRecordMapper.insert(any())).thenReturn(1);
+        when(instanceMapper.updateById(any())).thenReturn(1);
+
+        BpmProcessInstance result = processEngine.approve(
+            "test-uuid-001", 1L, "张三",
+            "CANCEL", "取消",
+            "terminate", "主动取消"
+        );
+
+        assertNotNull(result);
+        assertEquals("terminated", result.getStatus());
+    }
+
+    @Test
+    void testApproveInstanceNotFound() {
+        when(instanceMapper.selectByInstanceId("invalid-uuid")).thenReturn(null);
+
+        assertThrows(RuntimeException.class, () -> {
+            processEngine.approve("invalid-uuid", 1L, "test", "node", "name", "approve", "ok");
+        });
+    }
+
+    @Test
+    void testCompleteProcess() {
+        when(instanceMapper.selectByInstanceId("test-uuid-001")).thenReturn(testInstance);
+        when(instanceMapper.updateById(any())).thenReturn(1);
+
+        processEngine.completeProcess("test-uuid-001");
+
+        assertEquals("completed", testInstance.getStatus());
+        assertEquals("END", testInstance.getCurrentNodeId());
+        assertNotNull(testInstance.getCompletedAt());
+        verify(instanceMapper).updateById(any());
+    }
+
+    @Test
+    void testGetInstance() {
+        when(instanceMapper.selectByInstanceId("test-uuid-001")).thenReturn(testInstance);
+
+        BpmProcessInstance result = processEngine.getInstance("test-uuid-001");
+
+        assertNotNull(result);
+        assertEquals("test-uuid-001", result.getInstanceId());
+    }
+
+    @Test
+    void testGetTodoList() {
+        when(instanceMapper.selectTodoByAssigneeId(1L)).thenReturn(List.of(testInstance));
+
+        List<BpmProcessInstance> result = processEngine.getTodoList(1L);
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+    }
+}

wm-revenue/src/main/java/com/water/revenue/enums/InstallationStatus.java

@@ -9,7 +9,8 @@ public enum InstallationStatus {
     ENGINEERING_APPLY("工程申请"),
     DISPATCHED("已派单"),
     COMPLETED("竣工确认"),
-    REJECTED("已驳回");
+    REJECTED("已驳回"),
+    TERMINATED("已终止");
 
     private final String description;
 

wm-revenue/src/main/java/com/water/revenue/service/InstallationOverviewService.java

@@ -17,34 +17,34 @@ public class InstallationOverviewService {
     private final JdbcTemplate jdbcTemplate;
 
     /**
-     * 首页概览数据
+     * 首页概览数据 (INS-01)
      */
     public Map<String, Object> getOverview() {
         // 总数
         Integer total = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation", Integer.class
+            "SELECT COUNT(*) FROM installation_apply", Integer.class
         );
 
-        // 待处理
+        // 待处理（预受理状态）
         Integer pending = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation WHERE status = 'pending'", Integer.class
+            "SELECT COUNT(*) FROM installation_apply WHERE status = 'PRE_ACCEPT'", Integer.class
         );
 
-        // 进行中
+        // 进行中（工程申请+已派单）
         Integer inProgress = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation WHERE status IN ('dispatched', 'in_progress')", Integer.class
+            "SELECT COUNT(*) FROM installation_apply WHERE status IN ('ENGINEERING_APPLY', 'DISPATCHED')", Integer.class
         );
 
         // 本月完成
         String currentMonth = YearMonth.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
         Integer completedThisMonth = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation WHERE status = 'completed' AND DATE_FORMAT(completed_at, '%Y-%m') = ?",
+            "SELECT COUNT(*) FROM installation_apply WHERE status = 'COMPLETED' AND TO_CHAR(completed_time, 'YYYY-MM') = ?",
             Integer.class, currentMonth
         );
 
-        // 平均完成天数
+        // 平均完成天数（PostgreSQL 语法）
         Double avgDays = jdbcTemplate.queryForObject(
-            "SELECT AVG(DATEDIFF(completed_at, created_at)) FROM rev_installation WHERE status = 'completed' AND completed_at IS NOT NULL",
+            "SELECT AVG(EXTRACT(EPOCH FROM (completed_time - created_at))/86400) FROM installation_apply WHERE status = 'COMPLETED' AND completed_time IS NOT NULL",
             Double.class
         );
 
@@ -58,53 +58,53 @@ public class InstallationOverviewService {
     }
 
     /**
-     * 按月统计
+     * 按月统计 (INS-07)
      */
     public List<Map<String, Object>> statsByMonth(String year) {
         return jdbcTemplate.queryForList(
-            "SELECT DATE_FORMAT(created_at, '%Y-%m') as month, COUNT(*) as count, " +
-            "SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) as completed " +
-            "FROM rev_installation WHERE YEAR(created_at) = ? " +
-            "GROUP BY DATE_FORMAT(created_at, '%Y-%m') ORDER BY month",
+            "SELECT TO_CHAR(created_at, 'YYYY-MM') as month, COUNT(*) as count, " +
+            "SUM(CASE WHEN status = 'COMPLETED' THEN 1 ELSE 0 END) as completed " +
+            "FROM installation_apply WHERE EXTRACT(YEAR FROM created_at) = ? " +
+            "GROUP BY TO_CHAR(created_at, 'YYYY-MM') ORDER BY month",
             year
         );
     }
 
     /**
-     * 按区域统计
+     * 按区域统计 (INS-07)
      */
     public List<Map<String, Object>> statsByArea() {
         return jdbcTemplate.queryForList(
             "SELECT area, COUNT(*) as total, " +
-            "SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) as completed, " +
-            "SUM(CASE WHEN status IN ('pending', 'dispatched', 'in_progress') THEN 1 ELSE 0 END) as in_progress " +
-            "FROM rev_installation GROUP BY area ORDER BY total DESC"
+            "SUM(CASE WHEN status = 'COMPLETED' THEN 1 ELSE 0 END) as completed, " +
+            "SUM(CASE WHEN status IN ('PRE_ACCEPT', 'ENGINEERING_APPLY', 'DISPATCHED') THEN 1 ELSE 0 END) as in_progress " +
+            "FROM installation_apply GROUP BY area ORDER BY total DESC"
         );
     }
 
     /**
-     * 转化率分析
+     * 转化率分析 (INS-07)
      */
     public Map<String, Object> conversionAnalysis() {
         Integer total = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation", Integer.class
+            "SELECT COUNT(*) FROM installation_apply", Integer.class
         );
         Integer completed = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation WHERE status = 'completed'", Integer.class
+            "SELECT COUNT(*) FROM installation_apply WHERE status = 'COMPLETED'", Integer.class
         );
-        Integer cancelled = jdbcTemplate.queryForObject(
-            "SELECT COUNT(*) FROM rev_installation WHERE status = 'cancelled'", Integer.class
+        Integer terminated = jdbcTemplate.queryForObject(
+            "SELECT COUNT(*) FROM installation_apply WHERE status IN ('REJECTED', 'TERMINATED')", Integer.class
         );
 
-        double conversionRate = total != null && total > 0 && completed != null ? 
+        double conversionRate = total != null && total > 0 && completed != null ?
             (completed * 100.0 / total) : 0;
-        double cancelRate = total != null && total > 0 && cancelled != null ? 
-            (cancelled * 100.0 / total) : 0;
+        double cancelRate = total != null && total > 0 && terminated != null ?
+            (terminated * 100.0 / total) : 0;
 
         return Map.of(
             "total", total != null ? total : 0,
             "completed", completed != null ? completed : 0,
-            "cancelled", cancelled != null ? cancelled : 0,
+            "terminated", terminated != null ? terminated : 0,
             "conversionRate", Math.round(conversionRate * 100.0) / 100.0,
             "cancelRate", Math.round(cancelRate * 100.0) / 100.0
         );

wm-revenue/src/main/resources/db/V1__base_tables.sql

@@ -1,6 +1,7 @@
 -- =============================================
 -- 智慧水务管理系统 - 营业收费基础表
+-- 版本: V1 (PostgreSQL)
+-- 对应需求: REV-01~05, INS-01~08
 -- =============================================
 
 -- 水价阶梯表
@@ -54,7 +55,6 @@ CREATE TABLE IF NOT EXISTS rev_meter (
     install_date DATE,
     install_address VARCHAR(300),
     status VARCHAR(20) DEFAULT 'active',     -- active/dismantled/scrapped/repaired/warehouse
-    install_date DATE,
     scrapped_date DATE,
     dismantle_date DATE,
     remark VARCHAR(500),
@@ -73,8 +73,7 @@ CREATE TABLE IF NOT EXISTS rev_meter_log (
     new_meter_no VARCHAR(50),
     operator_id BIGINT,
     operator_name VARCHAR(50),
-    photos JSONB,                             -- 现场照片URL数组
-    equipment_no VARCHAR(50),                -- 设备编号（如新换的表号）
+    equipment_no VARCHAR(50),                -- 设备编号
     photos JSONB,                            -- 现场照片URL数组
     remark VARCHAR(500),
     created_at TIMESTAMP DEFAULT NOW()
@@ -118,7 +117,7 @@ CREATE TABLE IF NOT EXISTS rev_bill (
     consumption DECIMAL(10,2),
     water_fee DECIMAL(10,2),
     sewage_fee DECIMAL(10,2),
-    other_fee DECIMAL(10,2) DEFAULT 0,       -- 污水处理费/垃圾处理费等
+    other_fee DECIMAL(10,2) DEFAULT 0,
     total_fee DECIMAL(10,2),
     paid_fee DECIMAL(10,2) DEFAULT 0,
     discount_fee DECIMAL(10,2) DEFAULT 0,
@@ -153,31 +152,64 @@ CREATE INDEX IF NOT EXISTS idx_payment_bill ON rev_payment(bill_id);
 CREATE INDEX IF NOT EXISTS idx_payment_customer ON rev_payment(customer_id);
 CREATE INDEX IF NOT EXISTS idx_payment_date ON rev_payment(paid_at);
 
-CREATE TABLE IF NOT EXISTS rev_install (
+-- 报装申请表（与 InstallationApply Entity 对齐）
+CREATE TABLE IF NOT EXISTS installation_apply (
     id BIGSERIAL PRIMARY KEY,
-    application_no VARCHAR(30) UNIQUE NOT NULL,
-    applicant_name VARCHAR(50) NOT NULL,
+    apply_no VARCHAR(64) NOT NULL UNIQUE,
+    applicant_name VARCHAR(64) NOT NULL,
     applicant_phone VARCHAR(20) NOT NULL,
-    applicant_id_card VARCHAR(18),
-    area VARCHAR(50),
-    address VARCHAR(300),
-    customer_type VARCHAR(20),               -- residential/business/enterprise
-    caliber VARCHAR(10),                     -- 申请管径
-    purpose VARCHAR(200),
-    status VARCHAR(20) DEFAULT 'pre_apply',  -- pre_apply/engineering/pending_review/approved/rejected/completed/terminated
-    survey_date DATE,
-    survey_result TEXT,
-    approved_by BIGINT,
-    approved_at TIMESTAMP,
-    completed_at TIMESTAMP,
-    created_at TIMESTAMP DEFAULT NOW(),
-    updated_at TIMESTAMP DEFAULT NOW()
+    applicant_id_card VARCHAR(20),
+    address VARCHAR(256) NOT NULL,
+    area VARCHAR(64) NOT NULL,
+    water_use_type VARCHAR(32),              -- residential/business/enterprise
+    pipe_diameter DECIMAL(10,2),             -- 管径(mm)
+    status VARCHAR(32) NOT NULL DEFAULT 'PRE_ACCEPT', -- PRE_ACCEPT/ENGINEERING_APPLY/DISPATCHED/COMPLETED/REJECTED/TERMINATED
+    apply_time TIMESTAMP NOT NULL DEFAULT NOW(),
+    engineering_apply_time TIMESTAMP,
+    dispatch_time TIMESTAMP,
+    completed_time TIMESTAMP,
+    assignee_id BIGINT,
+    assignee_name VARCHAR(64),
+    remarks VARCHAR(512),
+    created_at TIMESTAMP NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMP NOT NULL DEFAULT NOW()
 );
-COMMENT ON TABLE rev_install IS '报装申请表';
+COMMENT ON TABLE installation_apply IS '报装申请表(INS-01~08)';
+CREATE INDEX IF NOT EXISTS idx_install_area ON installation_apply(area);
+CREATE INDEX IF NOT EXISTS idx_install_status ON installation_apply(status);
+CREATE INDEX IF NOT EXISTS idx_install_created ON installation_apply(created_at);
 
+-- 平台运维审计日志表 (REV-01)
+CREATE TABLE IF NOT EXISTS rev_audit_log (
+    id BIGSERIAL PRIMARY KEY,
+    user_id VARCHAR(50) NOT NULL,
+    user_name VARCHAR(100) NOT NULL,
+    action VARCHAR(50) NOT NULL,             -- login/logout/create/update/delete/query
+    target_type VARCHAR(50),                 -- user/bill/payment/installation/app
+    target_id VARCHAR(100),
+    detail TEXT,
+    ip VARCHAR(50),
+    created_at TIMESTAMP NOT NULL DEFAULT NOW()
+);
+COMMENT ON TABLE rev_audit_log IS '平台运维审计日志表(REV-01)';
+CREATE INDEX IF NOT EXISTS idx_audit_user ON rev_audit_log(user_id);
+CREATE INDEX IF NOT EXISTS idx_audit_action ON rev_audit_log(action);
+CREATE INDEX IF NOT EXISTS idx_audit_time ON rev_audit_log(created_at);
+
+-- 应用接入注册表 (REV-04)
+CREATE TABLE IF NOT EXISTS rev_app_registry (
+    id BIGSERIAL PRIMARY KEY,
+    app_id VARCHAR(64) NOT NULL UNIQUE,
+    app_secret VARCHAR(128) NOT NULL,
+    app_name VARCHAR(100) NOT NULL,
+    redirect_uris VARCHAR(500),
+    enabled SMALLINT DEFAULT 1,              -- 1:启用 0:禁用
+    created_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE rev_app_registry IS '应用接入注册表(REV-04)';
+CREATE INDEX IF NOT EXISTS idx_app_name ON rev_app_registry(app_name);
+
+-- 初始数据
 INSERT INTO rev_water_price (customer_type, tier_no, range_start, range_end, water_price, sewage_price, effective_date) VALUES
 ('residential', 1, 0, 12, 3.45, 0.8, '2025-01-01'),
 ('residential', 2, 12, 24, 4.15, 0.8, '2025-01-01'),
@@ -185,32 +217,4 @@ INSERT INTO rev_water_price (customer_type, tier_no, range_start, range_end, wat
 ('business', 1, 0, 100, 4.50, 1.0, '2025-01-01'),
 ('business', 2, 100, 500, 5.30, 1.0, '2025-01-01'),
 ('business', 3, 500, null, 6.80, 1.0, '2025-01-01')
-ON CONFLICT (id) DO NOTHING;
-
-INSERT INTO rev_customer (customer_no, customer_name, phone, area, address, customer_type) VALUES 
-('C001', '张三', '13812345678', '精芒片区', '精河县精芒街道123号', 'residential'),
-('C002', '李四', '13987654321', '托里片区', '精河县托里路456号', 'residential'),
-('C003', '王五', '13555666777', '八家户片区', '精河县八家户街789号', 'business')
-ON CONFLICT (customer_no) DO NOTHING;
-
-INSERT INTO rev_meter (meter_no, customer_id, caliber, meter_type, install_date) VALUES 
-('M001', 1, 'DN15', 'mechanical', '2025-01-01'),
-('M002', 2, 'DN20', 'electromagnetic', '2025-02-01'),
-('M003', 3, 'DN15', 'ultrasonic', '2025-03-01')
-ON CONFLICT (meter_no) DO NOTHING;
-
-INSERT INTO rev_reading (meter_id, reading_date, reading_period, prev_reading, curr_reading, consumption, read_type, verified) VALUES 
-(1, '2026-06-01', '2026-06', 1000.00, 1100.00, 100.00, 'remote', 1),
-(2, '2026-06-01', '2026-06', 2000.00, 2100.00, 100.00, 'manual', 1),
-(3, '2026-06-01', '2026-06', 3000.00, 3200.00, 200.00, 'remote', 1)
-ON CONFLICT (id) DO NOTHING;
-
-INSERT INTO rev_bill (bill_no, customer_id, meter_id, reading_id, bill_period, prev_reading, curr_reading, consumption, water_fee, sewage_fee, total_fee, status, due_date) VALUES 
-('BILL-001', 1, 1, 1, '2026-06', 1000.00, 1100.00, 100.00, 345.00, 80.00, 425.00, 'pending', '2026-07-15'),
-('BILL-002', 2, 2, 2, '2026-06', 2000.00, 2100.00, 100.00, 345.00, 80.00, 425.00, 'pending', '2026-07-15'),
-('BILL-003', 3, 3, 3, '2026-06', 3000.00, 3200.00, 200.00, 690.00, 160.00, 850.00, 'pending', '2026-07-15')
-ON CONFLICT (bill_no) DO NOTHING;
+ON CONFLICT DO NOTHING;

wm-revenue/src/main/resources/db/V3__sso_tables.sql

@@ -1,5 +1,9 @@
+-- =============================================
+-- SSO单点登录表结构 (PostgreSQL)
+-- 对应需求: REV-05 (SSO/OAuth2/OIDC)
+-- =============================================
+
+-- 创建SSO令牌表 (REV-05)
 CREATE TABLE IF NOT EXISTS sso_token (
     id BIGSERIAL PRIMARY KEY,
     user_id VARCHAR(50) NOT NULL,
@@ -8,13 +12,13 @@ CREATE TABLE IF NOT EXISTS sso_token (
     create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     expire_time TIMESTAMP NOT NULL,
     status INTEGER DEFAULT 1,
-    last_use_time TIMESTAMP,
-    INDEX idx_token (token),
-    INDEX idx_user_id (user_id),
-    INDEX idx_expire_time (expire_time)
+    last_use_time TIMESTAMP
 );
+CREATE INDEX IF NOT EXISTS idx_sso_token ON sso_token(token);
+CREATE INDEX IF NOT EXISTS idx_sso_user_id ON sso_token(user_id);
+CREATE INDEX IF NOT EXISTS idx_sso_expire_time ON sso_token(expire_time);
 
+-- 创建应用注册表 (REV-04/REV-05 应用接入)
 CREATE TABLE IF NOT EXISTS app_registry (
     id BIGSERIAL PRIMARY KEY,
     app_name VARCHAR(100) NOT NULL UNIQUE,
@@ -25,10 +29,10 @@ CREATE TABLE IF NOT EXISTS app_registry (
     status INTEGER DEFAULT 1,
     create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    admin_user VARCHAR(100),
-    INDEX idx_app_key (app_key),
-    INDEX idx_status (status)
+    admin_user VARCHAR(100)
 );
+CREATE INDEX IF NOT EXISTS idx_app_key ON app_registry(app_key);
+CREATE INDEX IF NOT EXISTS idx_app_status ON app_registry(status);
 
 -- 创建SSO访问日志表
 CREATE TABLE IF NOT EXISTS sso_access_log (
@@ -36,18 +40,18 @@ CREATE TABLE IF NOT EXISTS sso_access_log (
     user_id VARCHAR(50),
     username VARCHAR(100),
     app_name VARCHAR(100),
-    action VARCHAR(50) NOT NULL, -- login, logout, validate, token_exchange
+    action VARCHAR(50) NOT NULL,             -- login/logout/validate/token_exchange
     ip_address VARCHAR(50),
     user_agent TEXT,
     token_used VARCHAR(500),
-    status INTEGER DEFAULT 1, -- 1:成功, 0:失败
+    status INTEGER DEFAULT 1,                -- 1:成功 0:失败
     error_message TEXT,
-    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    INDEX idx_user_id (user_id),
-    INDEX idx_username (username),
-    INDEX idx_app_name (app_name),
-    INDEX idx_create_time (create_time)
+    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
+CREATE INDEX IF NOT EXISTS idx_sso_access_user ON sso_access_log(user_id);
+CREATE INDEX IF NOT EXISTS idx_sso_access_username ON sso_access_log(username);
+CREATE INDEX IF NOT EXISTS idx_sso_access_app ON sso_access_log(app_name);
+CREATE INDEX IF NOT EXISTS idx_sso_access_time ON sso_access_log(create_time);
 
 -- 创建应用接入记录表
 CREATE TABLE IF NOT EXISTS app_access_log (
@@ -55,34 +59,34 @@ CREATE TABLE IF NOT EXISTS app_access_log (
     app_key VARCHAR(200) NOT NULL,
     app_name VARCHAR(100) NOT NULL,
     client_id VARCHAR(200),
-    action VARCHAR(50) NOT NULL, -- register, validate, auth, token_request
+    action VARCHAR(50) NOT NULL,             -- register/validate/auth/token_request
     ip_address VARCHAR(50),
     user_agent TEXT,
     request_data TEXT,
     response_data TEXT,
     status INTEGER DEFAULT 1,
-    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    INDEX idx_app_key (app_key),
-    INDEX idx_create_time (create_time)
+    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
+CREATE INDEX IF NOT EXISTS idx_app_access_key ON app_access_log(app_key);
+CREATE INDEX IF NOT EXISTS idx_app_access_time ON app_access_log(create_time);
 
+-- 创建权限配置表 (REV-03 用户授权)
 CREATE TABLE IF NOT EXISTS app_permission (
     id BIGSERIAL PRIMARY KEY,
     app_key VARCHAR(200) NOT NULL,
     permission_name VARCHAR(100) NOT NULL,
     permission_code VARCHAR(200) NOT NULL,
-    resource_type VARCHAR(50), -- api, menu, button
+    resource_type VARCHAR(50),               -- api/menu/button
     resource_id VARCHAR(200),
     is_enabled INTEGER DEFAULT 1,
     create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE KEY uk_app_key_permission (app_key, permission_code),
-    INDEX idx_app_key (app_key),
-    INDEX idx_permission_code (permission_code)
+    UNIQUE (app_key, permission_code)
 );
+CREATE INDEX IF NOT EXISTS idx_perm_app_key ON app_permission(app_key);
+CREATE INDEX IF NOT EXISTS idx_perm_code ON app_permission(permission_code);
 
+-- 创建Token刷新记录表 (REV-05 OAuth2)
 CREATE TABLE IF NOT EXISTS refresh_token (
     id BIGSERIAL PRIMARY KEY,
     user_id VARCHAR(50) NOT NULL,
@@ -94,12 +98,12 @@ CREATE TABLE IF NOT EXISTS refresh_token (
     create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     expire_time TIMESTAMP NOT NULL,
     last_use_time TIMESTAMP,
-    is_revoked INTEGER DEFAULT 0,
-    INDEX idx_access_token (access_token),
-    INDEX idx_refresh_token (refresh_token),
-    INDEX idx_user_id (user_id),
-    INDEX idx_client_id (client_id)
+    is_revoked INTEGER DEFAULT 0
 );
+CREATE INDEX IF NOT EXISTS idx_rt_access ON refresh_token(access_token);
+CREATE INDEX IF NOT EXISTS idx_rt_refresh ON refresh_token(refresh_token);
+CREATE INDEX IF NOT EXISTS idx_rt_user ON refresh_token(user_id);
+CREATE INDEX IF NOT EXISTS idx_rt_client ON refresh_token(client_id);
 
 -- 插入默认的OAuth2客户端配置
 INSERT INTO app_registry (app_name, app_key, app_secret, redirect_uri, description, admin_user) VALUES
@@ -118,12 +122,12 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
+-- 创建SSO触发器：当更新token时更新最后使用时间
 CREATE OR REPLACE FUNCTION update_last_use_time()
 RETURNS TRIGGER AS $$
 BEGIN
     IF NEW.status = 1 THEN
-        UPDATE sso_token SET last_use_time = NOW() 
+        UPDATE sso_token SET last_use_time = NOW()
         WHERE token = NEW.token AND id != NEW.id;
     END IF;
     RETURN NEW;
@@ -138,4 +142,4 @@ CREATE TRIGGER trigger_clean_expired_tokens
 CREATE TRIGGER trigger_update_last_use_time
     AFTER UPDATE ON sso_token
     FOR EACH ROW
-    EXECUTE FUNCTION update_last_use_time();
+    EXECUTE FUNCTION update_last_use_time();

wm-revenue/src/main/resources/sql/installation_apply.sql

@@ -1,26 +1,3 @@
-CREATE TABLE IF NOT EXISTS installation_apply (
-    id              BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
-    apply_no        VARCHAR(64)    NOT NULL COMMENT '申请编号',
-    applicant_name  VARCHAR(64)    NOT NULL COMMENT '申请人姓名',
-    applicant_phone VARCHAR(20)    NOT NULL COMMENT '申请人电话',
-    applicant_id_card VARCHAR(20)  DEFAULT NULL COMMENT '申请人身份证号',
-    address         VARCHAR(256)   NOT NULL COMMENT '用水地址',
-    area            VARCHAR(64)    NOT NULL COMMENT '所属区域',
-    water_use_type  VARCHAR(32)    DEFAULT NULL COMMENT '用水类型（居民/商业/工业/其他）',
-    pipe_diameter   DECIMAL(10,2)  DEFAULT NULL COMMENT '管径（mm）',
-    status          VARCHAR(32)    NOT NULL DEFAULT 'PRE_ACCEPT' COMMENT '状态: PRE_ACCEPT/ENGINEERING_APPLY/DISPATCHED/COMPLETED/REJECTED',
-    apply_time      DATETIME       NOT NULL COMMENT '申请时间',
-    engineering_apply_time DATETIME DEFAULT NULL COMMENT '工程申请时间',
-    dispatch_time   DATETIME       DEFAULT NULL COMMENT '派单时间',
-    completed_time  DATETIME       DEFAULT NULL COMMENT '竣工时间',
-    assignee_id     BIGINT         DEFAULT NULL COMMENT '指派人ID',
-    assignee_name   VARCHAR(64)    DEFAULT NULL COMMENT '指派人姓名',
-    remarks         VARCHAR(512)   DEFAULT NULL COMMENT '备注',
-    created_at      DATETIME       NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    updated_at      DATETIME       NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    UNIQUE KEY uk_apply_no (apply_no),
-    KEY idx_area (area),
-    KEY idx_status (status),
-    KEY idx_created_at (created_at)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='报装申请表';
+-- 报装申请表 (PostgreSQL, 与 InstallationApply Entity 对齐)
+-- 注意: 此表已在 V1__base_tables.sql 中定义，此处为兼容旧代码保留
+-- 实际部署由 Flyway 按 V1 顺序执行，本文件不参与 Flyway migration

wm-revenue/src/test/java/com/water/revenue/service/AppAccessServiceTest.java

@@ -0,0 +1,110 @@
+package com.water.revenue.service;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class AppAccessServiceTest {
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+
+    @InjectMocks
+    private AppAccessService appAccessService;
+
+    @Test
+    void testRegisterApp() {
+        when(jdbcTemplate.update(anyString(), any(), any(), any(), any(), any(), any())).thenReturn(1);
+
+        Map<String, Object> result = appAccessService.registerApp("测试应用", "http://localhost:3000/callback");
+
+        assertNotNull(result);
+        assertNotNull(result.get("appId"));
+        assertNotNull(result.get("appSecret"));
+        assertEquals("测试应用", result.get("appName"));
+        assertEquals("http://localhost:3000/callback", result.get("redirectUris"));
+    }
+
+    @Test
+    void testToggleAppEnable() {
+        when(jdbcTemplate.update(anyString(), any(), any())).thenReturn(1);
+
+        Map<String, Object> result = appAccessService.toggleApp("APP-123", true);
+
+        assertNotNull(result);
+        assertEquals("APP-123", result.get("appId"));
+        assertEquals(true, result.get("enabled"));
+    }
+
+    @Test
+    void testToggleAppNotFound() {
+        when(jdbcTemplate.update(anyString(), any(), any())).thenReturn(0);
+
+        assertThrows(RuntimeException.class, () -> {
+            appAccessService.toggleApp("INVALID-ID", true);
+        });
+    }
+
+    @Test
+    void testListApps() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of(
+            Map.of("app_id", "APP-001", "app_name", "营收前端", "enabled", 1),
+            Map.of("app_id", "APP-002", "app_name", "微信网厅", "enabled", 1)
+        ));
+
+        List<Map<String, Object>> result = appAccessService.listApps(null, 1, 10);
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
+
+    @Test
+    void testGetAppDetail() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of(
+            Map.of("app_id", "APP-001", "app_name", "营收前端", "redirect_uris", "http://localhost:3000/callback", "enabled", 1)
+        ));
+
+        Map<String, Object> result = appAccessService.getAppDetail("APP-001");
+
+        assertNotNull(result);
+        assertEquals("APP-001", result.get("app_id"));
+        assertEquals("营收前端", result.get("app_name"));
+    }
+
+    @Test
+    void testGetAppDetailNotFound() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of());
+
+        assertThrows(RuntimeException.class, () -> {
+            appAccessService.getAppDetail("INVALID-ID");
+        });
+    }
+
+    @Test
+    void testDeleteApp() {
+        when(jdbcTemplate.update(anyString(), any())).thenReturn(1);
+
+        appAccessService.deleteApp("APP-001");
+        verify(jdbcTemplate).update(eq("DELETE FROM rev_app_registry WHERE app_id = ?"), eq("APP-001"));
+    }
+
+    @Test
+    void testDeleteAppNotFound() {
+        when(jdbcTemplate.update(anyString(), any())).thenReturn(0);
+
+        assertThrows(RuntimeException.class, () -> {
+            appAccessService.deleteApp("INVALID-ID");
+        });
+    }
+}

wm-revenue/src/test/java/com/water/revenue/service/InstallationOverviewServiceTest.java

@@ -0,0 +1,113 @@
+package com.water.revenue.service;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class InstallationOverviewServiceTest {
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+
+    @InjectMocks
+    private InstallationOverviewService overviewService;
+
+    @Test
+    void testGetOverview() {
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply"), eq(Integer.class)))
+            .thenReturn(100);
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply WHERE status = 'PRE_ACCEPT'"), eq(Integer.class)))
+            .thenReturn(15);
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply WHERE status IN ('ENGINEERING_APPLY', 'DISPATCHED')"), eq(Integer.class)))
+            .thenReturn(25);
+        when(jdbcTemplate.queryForObject(contains("TO_CHAR(completed_time"), eq(Integer.class), anyString()))
+            .thenReturn(60);
+        when(jdbcTemplate.queryForObject(contains("EXTRACT(EPOCH"), eq(Double.class)))
+            .thenReturn(7.5);
+
+        Map<String, Object> result = overviewService.getOverview();
+
+        assertNotNull(result);
+        assertEquals(100, result.get("total"));
+        assertEquals(15, result.get("pending"));
+        assertEquals(25, result.get("inProgress"));
+        assertEquals(60, result.get("completedThisMonth"));
+        assertEquals(7.5, result.get("avgDays"));
+    }
+
+    @Test
+    void testGetOverviewWithNullValues() {
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply"), eq(Integer.class)))
+            .thenReturn(null);
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply WHERE status = 'PRE_ACCEPT'"), eq(Integer.class)))
+            .thenReturn(null);
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply WHERE status IN ('ENGINEERING_APPLY', 'DISPATCHED')"), eq(Integer.class)))
+            .thenReturn(null);
+        when(jdbcTemplate.queryForObject(contains("TO_CHAR(completed_time"), eq(Integer.class), anyString()))
+            .thenReturn(null);
+        when(jdbcTemplate.queryForObject(contains("EXTRACT(EPOCH"), eq(Double.class)))
+            .thenReturn(null);
+
+        Map<String, Object> result = overviewService.getOverview();
+
+        assertNotNull(result);
+        assertEquals(0, result.get("total"));
+        assertEquals(0, result.get("pending"));
+    }
+
+    @Test
+    void testStatsByMonth() {
+        when(jdbcTemplate.queryForList(anyString(), anyString())).thenReturn(List.of(
+            Map.of("month", "2026-01", "count", 10L, "completed", 8L),
+            Map.of("month", "2026-02", "count", 15L, "completed", 12L)
+        ));
+
+        List<Map<String, Object>> result = overviewService.statsByMonth("2026");
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
+
+    @Test
+    void testStatsByArea() {
+        when(jdbcTemplate.queryForList(anyString())).thenReturn(List.of(
+            Map.of("area", "精芒片区", "total", 50L, "completed", 40L, "in_progress", 10L)
+        ));
+
+        List<Map<String, Object>> result = overviewService.statsByArea();
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        assertEquals("精芒片区", result.get(0).get("area"));
+    }
+
+    @Test
+    void testConversionAnalysis() {
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply"), eq(Integer.class)))
+            .thenReturn(100);
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply WHERE status = 'COMPLETED'"), eq(Integer.class)))
+            .thenReturn(80);
+        when(jdbcTemplate.queryForObject(eq("SELECT COUNT(*) FROM installation_apply WHERE status IN ('REJECTED', 'TERMINATED')"), eq(Integer.class)))
+            .thenReturn(5);
+
+        Map<String, Object> result = overviewService.conversionAnalysis();
+
+        assertNotNull(result);
+        assertEquals(100, result.get("total"));
+        assertEquals(80, result.get("completed"));
+        assertEquals(5, result.get("terminated"));
+        assertEquals(80.0, result.get("conversionRate"));
+        assertEquals(5.0, result.get("cancelRate"));
+    }
+}

wm-revenue/src/test/java/com/water/revenue/service/InstallationServiceTest.java

@@ -0,0 +1,145 @@
+package com.water.revenue.service;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class InstallationServiceTest {
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+
+    @InjectMocks
+    private InstallationService installationService;
+
+    @Test
+    void testPreAccept() {
+        when(jdbcTemplate.update(anyString(), any())).thenReturn(1);
+
+        Map<String, Object> request = new HashMap<>();
+        request.put("applicantName", "张三");
+        request.put("applicantPhone", "13800138000");
+        request.put("applicantIdCard", "123456789012345678");
+        request.put("address", "精河县精芒街道1号");
+        request.put("area", "精芒片区");
+        request.put("waterUseType", "residential");
+        request.put("pipeDiameter", 15);
+        request.put("remarks", "测试报装");
+
+        Map<String, Object> result = installationService.preAccept(request);
+
+        assertNotNull(result);
+        assertNotNull(result.get("applyNo"));
+        assertEquals("PRE_ACCEPT", result.get("status"));
+        assertEquals("张三", result.get("applicantName"));
+        verify(jdbcTemplate).update(anyString(), any());
+    }
+
+    @Test
+    void testEngineeringApply() {
+        when(jdbcTemplate.update(anyString(), any(), any(), any())).thenReturn(1);
+
+        Map<String, Object> engineeringInfo = new HashMap<>();
+        engineeringInfo.put("remarks", "工程申请备注");
+
+        Map<String, Object> result = installationService.engineeringApply("IZA-123", engineeringInfo);
+
+        assertNotNull(result);
+        assertEquals("IZA-123", result.get("applyNo"));
+        assertEquals("ENGINEERING_APPLY", result.get("status"));
+        verify(jdbcTemplate).update(anyString(), any(), any(), any());
+    }
+
+    @Test
+    void testEngineeringApplyNotFound() {
+        when(jdbcTemplate.update(anyString(), any(), any(), any())).thenReturn(0);
+
+        assertThrows(RuntimeException.class, () -> {
+            installationService.engineeringApply("INVALID-NO", new HashMap<>());
+        });
+    }
+
+    @Test
+    void testDispatch() {
+        when(jdbcTemplate.update(anyString(), any(), any(), any(), any())).thenReturn(1);
+
+        Map<String, Object> result = installationService.dispatch("IZA-123", 1L, "施工员A");
+
+        assertNotNull(result);
+        assertEquals("IZA-123", result.get("applyNo"));
+        assertEquals("DISPATCHED", result.get("status"));
+        assertEquals(1L, result.get("assigneeId"));
+        assertEquals("施工员A", result.get("assigneeName"));
+    }
+
+    @Test
+    void testComplete() {
+        when(jdbcTemplate.update(anyString(), any(), any(), any())).thenReturn(1);
+
+        Map<String, Object> completionInfo = new HashMap<>();
+        completionInfo.put("remarks", "竣工确认");
+
+        Map<String, Object> result = installationService.complete("IZA-123", completionInfo);
+
+        assertNotNull(result);
+        assertEquals("IZA-123", result.get("applyNo"));
+        assertEquals("COMPLETED", result.get("status"));
+    }
+
+    @Test
+    void testGetDetail() {
+        when(jdbcTemplate.queryForMap(anyString(), any())).thenReturn(Map.of(
+            "id", 1L,
+            "apply_no", "IZA-123",
+            "applicant_name", "张三",
+            "status", "PRE_ACCEPT"
+        ));
+
+        Map<String, Object> result = installationService.getDetail("IZA-123");
+
+        assertNotNull(result);
+        assertEquals("IZA-123", result.get("apply_no"));
+        assertEquals("张三", result.get("applicant_name"));
+    }
+
+    @Test
+    void testList() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of(
+            Map.of("id", 1L, "apply_no", "IZA-001", "status", "PRE_ACCEPT"),
+            Map.of("id", 2L, "apply_no", "IZA-002", "status", "COMPLETED")
+        ));
+        when(jdbcTemplate.queryForObject(anyString(), eq(Long.class), any())).thenReturn(2L);
+
+        Map<String, Object> query = Map.of("page", 1, "size", 10, "area", "", "status", "", "keyword", "");
+        Map<String, Object> result = installationService.list(query);
+
+        assertNotNull(result);
+        assertEquals(2L, result.get("total"));
+        assertNotNull(result.get("records"));
+    }
+
+    @Test
+    void testStats() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of(
+            Map.of("status", "PRE_ACCEPT", "count", 5L),
+            Map.of("status", "COMPLETED", "count", 10L)
+        ));
+
+        Map<String, Object> result = installationService.stats("精芒片区");
+
+        assertNotNull(result);
+        assertEquals("精芒片区", result.get("area"));
+        assertNotNull(result.get("byStatus"));
+    }
+}

wm-revenue/src/test/java/com/water/revenue/service/RevAuditServiceTest.java

@@ -0,0 +1,90 @@
+package com.water.revenue.service;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class RevAuditServiceTest {
+
+    @Mock
+    private JdbcTemplate jdbcTemplate;
+
+    @InjectMocks
+    private RevAuditService revAuditService;
+
+    @Test
+    void testLog() {
+        doNothing().when(jdbcTemplate).update(anyString(), any(), any(), any(), any(), any(), any(), any());
+
+        revAuditService.log("1", "admin", "login", "user", "1", "用户登录", "192.168.1.1");
+
+        verify(jdbcTemplate).update(anyString(), any(), any(), any(), any(), any(), any(), any());
+    }
+
+    @Test
+    void testQueryLogs() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of(
+            Map.of("id", 1L, "user_name", "admin", "action", "login"),
+            Map.of("id", 2L, "user_name", "testuser", "action", "create")
+        ));
+        when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class), any())).thenReturn(2);
+
+        Map<String, Object> result = revAuditService.queryLogs(null, null, "2026-06-01", "2026-06-30", 1, 10);
+
+        assertNotNull(result);
+        assertEquals(2, result.get("total"));
+        assertEquals(1, result.get("page"));
+        assertEquals(10, result.get("size"));
+        assertNotNull(result.get("data"));
+    }
+
+    @Test
+    void testQueryLogsByUser() {
+        when(jdbcTemplate.queryForList(anyString(), any())).thenReturn(List.of(
+            Map.of("id", 1L, "user_name", "admin", "action", "login")
+        ));
+        when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class), any())).thenReturn(1);
+
+        Map<String, Object> result = revAuditService.queryLogs("1", null, null, null, 1, 10);
+
+        assertNotNull(result);
+        assertEquals(1, result.get("total"));
+    }
+
+    @Test
+    void testStatsByDay() {
+        when(jdbcTemplate.queryForList(anyString(), anyString(), anyString())).thenReturn(List.of(
+            Map.of("day", "2026-06-15", "count", 50L),
+            Map.of("day", "2026-06-16", "count", 30L)
+        ));
+
+        List<Map<String, Object>> result = revAuditService.statsByDay("2026-06-01", "2026-06-30");
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
+
+    @Test
+    void testStatsByAction() {
+        when(jdbcTemplate.queryForList(anyString(), anyString(), anyString())).thenReturn(List.of(
+            Map.of("action", "login", "count", 100L),
+            Map.of("action", "create", "count", 50L)
+        ));
+
+        List<Map<String, Object>> result = revAuditService.statsByAction("2026-06-01", "2026-06-30");
+
+        assertNotNull(result);
+        assertEquals(2, result.size());
+    }
+}