feat(wm-patrol): #88 巡查APP（任务/工单/统计/问题上报/个人中心）

- PatrolAppService: 统一APP服务（PAT-21~PAT-29）
  - getAppOverview: APP总览（今日任务/待办工单/本月完成/里程/异常）
  - getTodayTasks: 今日任务（含进度/路线/时长）
  - getPendingWorkOrders: 待办工单
  - getUserStats: 个人巡检统计（week/month/year）
  - getTaskList: 任务列表（状态筛选+分页）
  - getWorkOrderList: 工单列表（状态筛选+分页）
  - reportIssue: 问题上报（文字+照片+语音+GPS）
  - getProfile/updateAvatar: 个人中心
  - getHistoryTasks: 历史任务
- PatrolAppController: /patrol/app 统一入口
- V88__patrol_app.sql: patrol_user_stats_monthly + voice_url + avatar

sql/V88__patrol_app.sql

@@ -0,0 +1,23 @@
+-- V88: 巡查APP相关表 - Issue #88
+-- PAT-21~PAT-29
+
+-- 用户巡检统计（按月汇总）
+CREATE TABLE IF NOT EXISTS patrol_user_stats_monthly (
+    id              BIGSERIAL PRIMARY KEY,
+    user_id         BIGINT NOT NULL,
+    year_month      VARCHAR(7) NOT NULL,  -- '2026-06'
+    completed_tasks INT DEFAULT 0,
+    total_distance  DOUBLE PRECISION DEFAULT 0,
+    issue_count     INT DEFAULT 0,
+    patrol_hours    DOUBLE PRECISION DEFAULT 0,
+    created_at      TIMESTAMPTZ DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ DEFAULT NOW(),
+    UNIQUE(user_id, year_month)
+);
+CREATE INDEX IF NOT EXISTS idx_patrol_stats_user ON patrol_user_stats_monthly(user_id, year_month);
+
+-- 问题上报表加 voice_url 字段（patrol_problem 已在 problem_reporting.sql 创建）
+ALTER TABLE patrol_problem ADD COLUMN IF NOT EXISTS voice_url VARCHAR(500);
+
+-- 用户头像（如果 sys_user 表无 avatar 字段则添加）
+ALTER TABLE sys_user ADD COLUMN IF NOT EXISTS avatar VARCHAR(500);

sql/V_meter_lifecycle.sql

@@ -0,0 +1,133 @@
+-- ============================================================
+-- 水表全生命周期管理 DDL
+-- 包含: rev_water_meter, rev_meter_install_record,
+--       rev_meter_replace_record, rev_meter_lifecycle_log
+-- ============================================================
+
+-- 1. 水表主表
+CREATE TABLE IF NOT EXISTS rev_water_meter (
+    id              BIGSERIAL       PRIMARY KEY,
+    meter_no        VARCHAR(64)     NOT NULL UNIQUE,
+    model           VARCHAR(64),
+    diameter        INTEGER,
+    manufacturer    VARCHAR(128),
+    production_date DATE,
+    install_date    DATE,
+    install_address VARCHAR(512),
+    customer_no     VARCHAR(64),
+    status          VARCHAR(32)     NOT NULL DEFAULT 'IN_STOCK',
+    in_stock_time   TIMESTAMP,
+    out_stock_time  TIMESTAMP,
+    initial_reading NUMERIC(14,4)   DEFAULT 0,
+    current_reading NUMERIC(14,4)   DEFAULT 0,
+    dismantle_date  DATE,
+    scrapped_date   DATE,
+    remark          VARCHAR(512),
+    created_at      TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at      TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+COMMENT ON TABLE  rev_water_meter                     IS '水表主表';
+COMMENT ON COLUMN rev_water_meter.meter_no            IS '水表编号';
+COMMENT ON COLUMN rev_water_meter.model               IS '水表型号';
+COMMENT ON COLUMN rev_water_meter.diameter            IS '口径(mm)';
+COMMENT ON COLUMN rev_water_meter.manufacturer        IS '制造商';
+COMMENT ON COLUMN rev_water_meter.production_date     IS '生产日期';
+COMMENT ON COLUMN rev_water_meter.install_date        IS '安装日期';
+COMMENT ON COLUMN rev_water_meter.install_address     IS '安装地址';
+COMMENT ON COLUMN rev_water_meter.customer_no         IS '客户编号';
+COMMENT ON COLUMN rev_water_meter.status              IS '状态: IN_STOCK/INSTALLED/DISMANTLED/SCRAPPED/REPAIRING';
+COMMENT ON COLUMN rev_water_meter.in_stock_time       IS '入库时间';
+COMMENT ON COLUMN rev_water_meter.out_stock_time      IS '出库时间';
+COMMENT ON COLUMN rev_water_meter.initial_reading     IS '初始读数';
+COMMENT ON COLUMN rev_water_meter.current_reading     IS '当前读数';
+COMMENT ON COLUMN rev_water_meter.dismantle_date      IS '拆除日期';
+COMMENT ON COLUMN rev_water_meter.scrapped_date       IS '报废日期';
+
+-- 2. 水表安装记录
+CREATE TABLE IF NOT EXISTS rev_meter_install_record (
+    id              BIGSERIAL       PRIMARY KEY,
+    meter_no        VARCHAR(64)     NOT NULL,
+    customer_no     VARCHAR(64),
+    installer       VARCHAR(128),
+    install_date    DATE,
+    install_address VARCHAR(512),
+    old_meter_no    VARCHAR(64),
+    initial_reading NUMERIC(14,4)   DEFAULT 0,
+    remark          VARCHAR(512),
+    created_at      TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at      TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+COMMENT ON TABLE rev_meter_install_record IS '水表安装记录';
+
+-- 3. 水表换表记录
+CREATE TABLE IF NOT EXISTS rev_meter_replace_record (
+    id               BIGSERIAL       PRIMARY KEY,
+    old_meter_no     VARCHAR(64)     NOT NULL,
+    new_meter_no     VARCHAR(64)     NOT NULL,
+    customer_no      VARCHAR(64),
+    replace_type     VARCHAR(32)     NOT NULL,
+    reason           VARCHAR(512),
+    replacer         VARCHAR(128),
+    replace_date     DATE,
+    old_reading      NUMERIC(14,4),
+    new_reading      NUMERIC(14,4),
+    approval_status  VARCHAR(32)     DEFAULT 'APPROVED',
+    approver         VARCHAR(128),
+    approval_time    TIMESTAMP,
+    remark           VARCHAR(512),
+    created_at       TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at       TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+COMMENT ON TABLE  rev_meter_replace_record                  IS '水表换表记录';
+COMMENT ON COLUMN rev_meter_replace_record.replace_type     IS '换表类型: FAULT-故障, EXPIRED-到期';
+COMMENT ON COLUMN rev_meter_replace_record.approval_status  IS '审批状态: PENDING/APPROVED/REJECTED';
+
+-- 4. 水表生命周期日志
+CREATE TABLE IF NOT EXISTS rev_meter_lifecycle_log (
+    id              BIGSERIAL       PRIMARY KEY,
+    meter_no        VARCHAR(64)     NOT NULL,
+    action_type     VARCHAR(32)     NOT NULL,
+    action_time     TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    operator        VARCHAR(128),
+    detail          VARCHAR(1024),
+    old_meter_no    VARCHAR(64),
+    new_meter_no    VARCHAR(64),
+    customer_no     VARCHAR(64),
+    remark          VARCHAR(512),
+    created_at      TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+COMMENT ON TABLE  rev_meter_lifecycle_log                IS '水表生命周期日志';
+COMMENT ON COLUMN rev_meter_lifecycle_log.action_type    IS '操作类型: STOCK_IN/INSTALL/DISMANTLE/REPLACE/SCRAP/REPAIR';
+
+-- ============================================================
+-- 索引
+-- ============================================================
+
+-- rev_water_meter 索引
+CREATE INDEX IF NOT EXISTS idx_water_meter_status       ON rev_water_meter (status);
+CREATE INDEX IF NOT EXISTS idx_water_meter_customer     ON rev_water_meter (customer_no);
+CREATE INDEX IF NOT EXISTS idx_water_meter_diameter     ON rev_water_meter (diameter);
+CREATE INDEX IF NOT EXISTS idx_water_meter_manufacturer ON rev_water_meter (manufacturer);
+CREATE INDEX IF NOT EXISTS idx_water_meter_created      ON rev_water_meter (created_at);
+
+-- rev_meter_install_record 索引
+CREATE INDEX IF NOT EXISTS idx_install_record_meter     ON rev_meter_install_record (meter_no);
+CREATE INDEX IF NOT EXISTS idx_install_record_customer  ON rev_meter_install_record (customer_no);
+CREATE INDEX IF NOT EXISTS idx_install_record_date      ON rev_meter_install_record (install_date);
+
+-- rev_meter_replace_record 索引
+CREATE INDEX IF NOT EXISTS idx_replace_record_old       ON rev_meter_replace_record (old_meter_no);
+CREATE INDEX IF NOT EXISTS idx_replace_record_new       ON rev_meter_replace_record (new_meter_no);
+CREATE INDEX IF NOT EXISTS idx_replace_record_customer  ON rev_meter_replace_record (customer_no);
+CREATE INDEX IF NOT EXISTS idx_replace_record_approval  ON rev_meter_replace_record (approval_status);
+CREATE INDEX IF NOT EXISTS idx_replace_record_date      ON rev_meter_replace_record (replace_date);
+
+-- rev_meter_lifecycle_log 索引
+CREATE INDEX IF NOT EXISTS idx_lifecycle_log_meter      ON rev_meter_lifecycle_log (meter_no);
+CREATE INDEX IF NOT EXISTS idx_lifecycle_log_action     ON rev_meter_lifecycle_log (action_type);
+CREATE INDEX IF NOT EXISTS idx_lifecycle_log_time       ON rev_meter_lifecycle_log (action_time);
+CREATE INDEX IF NOT EXISTS idx_lifecycle_log_customer   ON rev_meter_lifecycle_log (customer_no);

sql/V_smart_meter_sms_alipay.sql

@@ -0,0 +1,106 @@
+-- =====================================================
+-- V_smart_meter_sms_alipay.sql
+-- 智能表平台 + 短信平台 + 支付宝生活缴费 DDL
+-- =====================================================
+
+-- 1. 智能水表表
+CREATE TABLE IF NOT EXISTS rev_smart_meter (
+    id              BIGSERIAL PRIMARY KEY,
+    meter_no        VARCHAR(64)   NOT NULL,
+    customer_no     VARCHAR(64),
+    signal_strength INTEGER       DEFAULT 100,
+    battery_level   INTEGER       DEFAULT 100,
+    valve_status    VARCHAR(16)   DEFAULT 'OPEN',
+    last_report_time TIMESTAMP,
+    online_status   VARCHAR(16)   DEFAULT 'ONLINE',
+    current_reading DOUBLE PRECISION DEFAULT 0,
+    install_address VARCHAR(256),
+    area_code       VARCHAR(32),
+    remark          VARCHAR(512),
+    create_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP,
+    update_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX IF NOT EXISTS idx_smart_meter_meter_no ON rev_smart_meter(meter_no);
+CREATE INDEX IF NOT EXISTS idx_smart_meter_customer_no ON rev_smart_meter(customer_no);
+CREATE INDEX IF NOT EXISTS idx_smart_meter_online_status ON rev_smart_meter(online_status);
+CREATE INDEX IF NOT EXISTS idx_smart_meter_area_code ON rev_smart_meter(area_code);
+
+-- 2. 短信模板表
+CREATE TABLE IF NOT EXISTS rev_sms_template (
+    id              BIGSERIAL PRIMARY KEY,
+    template_name   VARCHAR(128)  NOT NULL,
+    template_type   VARCHAR(32)   NOT NULL,
+    content         TEXT          NOT NULL,
+    variables       VARCHAR(512),
+    enabled         INTEGER       DEFAULT 1,
+    remark          VARCHAR(512),
+    create_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP,
+    update_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX IF NOT EXISTS idx_sms_template_type ON rev_sms_template(template_type);
+
+-- 3. 短信发送记录表
+CREATE TABLE IF NOT EXISTS rev_sms_record (
+    id              BIGSERIAL PRIMARY KEY,
+    phone           VARCHAR(32)   NOT NULL,
+    content         TEXT,
+    template_id     BIGINT,
+    send_status     VARCHAR(16)   DEFAULT 'PENDING',
+    send_time       TIMESTAMP,
+    error_msg       VARCHAR(512),
+    customer_no     VARCHAR(64),
+    biz_type        VARCHAR(32),
+    create_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX IF NOT EXISTS idx_sms_record_phone ON rev_sms_record(phone);
+CREATE INDEX IF NOT EXISTS idx_sms_record_send_status ON rev_sms_record(send_status);
+CREATE INDEX IF NOT EXISTS idx_sms_record_send_time ON rev_sms_record(send_time);
+CREATE INDEX IF NOT EXISTS idx_sms_record_customer_no ON rev_sms_record(customer_no);
+
+-- 4. 支付宝生活缴费订单表
+CREATE TABLE IF NOT EXISTS rev_alipay_order (
+    id              BIGSERIAL PRIMARY KEY,
+    out_trade_no    VARCHAR(128)  NOT NULL,
+    alipay_trade_no VARCHAR(128),
+    customer_no     VARCHAR(64),
+    bill_id         BIGINT,
+    amount          DECIMAL(12, 2),
+    status          VARCHAR(16)   DEFAULT 'CREATED',
+    notify_data     TEXT,
+    bill_period     VARCHAR(32),
+    pay_time        TIMESTAMP,
+    refund_amount   DECIMAL(12, 2),
+    refund_time     TIMESTAMP,
+    remark          VARCHAR(512),
+    create_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP,
+    update_time     TIMESTAMP     DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_alipay_order_out_trade_no ON rev_alipay_order(out_trade_no);
+CREATE INDEX IF NOT EXISTS idx_alipay_order_customer_no ON rev_alipay_order(customer_no);
+CREATE INDEX IF NOT EXISTS idx_alipay_order_status ON rev_alipay_order(status);
+CREATE INDEX IF NOT EXISTS idx_alipay_order_pay_time ON rev_alipay_order(pay_time);
+
+-- =====================================================
+-- 默认短信模板数据
+-- =====================================================
+
+INSERT INTO rev_sms_template (template_name, template_type, content, variables, enabled, remark) VALUES
+('账单通知', 'BILL_NOTICE',
+ '【XX水务】尊敬的${customerName}，您${billPeriod}的水费账单已出，应缴金额${amount}元，请及时缴费。',
+ '["customerName","billPeriod","amount"]', 1, '月度账单通知'),
+
+('欠费提醒', 'ARREARS_WARNING',
+ '【XX水务】尊敬的${customerName}，您有${overdueAmount}元水费已逾期${overdueDays}天，请尽快缴清，逾期将影响正常用水。',
+ '["customerName","overdueAmount","overdueDays"]', 1, '欠费催缴提醒'),
+
+('阀门控制通知', 'VALVE_CONTROL',
+ '【XX水务】尊敬的${customerName}，您编号为${meterNo}的水表阀门已${action}，如有疑问请联系客服。',
+ '["customerName","meterNo","action"]', 1, '远程阀门操作通知'),
+
+('停水通知', 'GENERAL',
+ '【XX水务】${areaName}将于${startTime}至${endTime}进行${reason}，届时将暂停供水，请提前做好储水准备。',
+ '["areaName","startTime","endTime","reason"]', 1, '通用停水通知');

sql/create_sequences.sql

@@ -0,0 +1,11 @@
+-- 创建巡检问题序列
+CREATE SEQUENCE IF NOT EXISTS seq_patrol_problem
+INCREMENT 1
+START 1
+NO CYCLE;
+
+-- 创建工单序列
+CREATE SEQUENCE IF NOT EXISTS seq_work_order
+INCREMENT 1
+START 1
+NO CYCLE;

sql/enhanced_reading_tables.sql

@@ -0,0 +1,136 @@
+-- 增强抄表功能相关表结构
+
+-- 1. 批量抄表报告表
+CREATE TABLE IF NOT EXISTS rev_batch_report (
+    report_id VARCHAR(100) PRIMARY KEY,
+    period VARCHAR(7) NOT NULL COMMENT '抄表周期 yyyy-MM',
+    total_meters INTEGER NOT NULL DEFAULT 0 COMMENT '总表数',
+    success_meters INTEGER NOT NULL DEFAULT 0 COMMENT '成功抄表数',
+    failed_meters INTEGER NOT NULL DEFAULT 0 COMMENT '失败抄表数',
+    abnormal_meters INTEGER NOT NULL DEFAULT 0 COMMENT '异常读数数',
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+-- 2. 抄表异常记录表
+CREATE TABLE IF NOT EXISTS rev_reading_exception (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    meter_id BIGINT NOT NULL,
+    meter_no VARCHAR(50) NOT NULL,
+    exception_type VARCHAR(50) NOT NULL COMMENT '异常类型: DECREASE/NEGATIVE/EXCESSIVE/ZERO',
+    exception_reason TEXT COMMENT '异常原因描述',
+    prev_reading DECIMAL(12,2) NOT NULL,
+    curr_reading DECIMAL(12,2) NOT NULL,
+    consumption DECIMAL(12,2) NOT NULL,
+    reading_date DATE NOT NULL,
+    area VARCHAR(100) NOT NULL,
+    is_resolved BOOLEAN DEFAULT FALSE COMMENT '是否已处理',
+    resolved_at TIMESTAMP NULL,
+    resolved_by VARCHAR(100) NULL,
+    remark TEXT COMMENT '处理备注',
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_meter_id (meter_id),
+    INDEX idx_reading_date (reading_date),
+    INDEX idx_exception_type (exception_type),
+    INDEX idx_area (area)
+);
+
+-- 3. 大表监控记录表
+CREATE TABLE IF NOT EXISTS rev_large_meter_monitor (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    meter_id BIGINT NOT NULL,
+    meter_no VARCHAR(50) NOT NULL,
+    caliber VARCHAR(20) NOT NULL COMMENT '管径',
+    customer_name VARCHAR(200) NOT NULL,
+    area VARCHAR(100) NOT NULL,
+    device_sn VARCHAR(100) COMMENT '设备号',
+    current_reading DECIMAL(12,2) COMMENT '当前读数',
+    last_reading_date DATE COMMENT '上次抄表日期',
+    monthly_consumption DECIMAL(12,2) COMMENT '月用量',
+    monitor_status VARCHAR(20) DEFAULT 'NORMAL' COMMENT '监控状态: NORMAL/ALARM/OFFLINE',
+    alert_level VARCHAR(20) COMMENT '预警级别: LOW/MEDIUM/HIGH/CRITICAL',
+    alert_count INTEGER DEFAULT 0 COMMENT '预警次数',
+    last_alert_time TIMESTAMP NULL COMMENT '最后预警时间',
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_meter_no (meter_no),
+    INDEX idx_caliber (caliber),
+    INDEX idx_area (area),
+    INDEX idx_monitor_status (monitor_status),
+    INDEX idx_alert_level (alert_level)
+);
+
+-- 4. 远传抄表任务表
+CREATE TABLE IF NOT EXISTS rev_remote_reading_task (
+    task_id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    task_name VARCHAR(200) NOT NULL,
+    task_type VARCHAR(50) NOT NULL COMMENT '任务类型: SINGLE_AREA/MULTI_AREA/ALL_AREA',
+    areas TEXT COMMENT '涉及区域列表(JSON)',
+    status VARCHAR(20) DEFAULT 'PENDING' COMMENT '任务状态: PENDING/RUNNING/COMPLETED/FAILED',
+    total_meters INTEGER DEFAULT 0,
+    success_meters INTEGER DEFAULT 0,
+    failed_meters INTEGER DEFAULT 0,
+    abnormal_meters INTEGER DEFAULT 0,
+    start_time TIMESTAMP NULL,
+    end_time TIMESTAMP NULL,
+    error_message TEXT,
+    created_by VARCHAR(100) NOT NULL,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_status (status),
+    INDEX idx_created_at (created_at)
+);
+
+-- 5. 预警记录表
+CREATE TABLE IF NOT EXISTS rev_alert_record (
+    alert_id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    meter_id BIGINT NOT NULL,
+    meter_no VARCHAR(50) NOT NULL,
+    alert_type VARCHAR(50) NOT NULL COMMENT '预警类型: HIGH_CONSUMPTION/DEVICE_OFFLINE/ZERO_FLOW/ABNORMAL_DECREASE',
+    alert_title VARCHAR(200) NOT NULL COMMENT '预警标题',
+    alert_description TEXT COMMENT '预警描述',
+    severity VARCHAR(20) DEFAULT 'MEDIUM' COMMENT '严重程度: LOW/MEDIUM/HIGH/CRITICAL',
+    status VARCHAR(20) DEFAULT 'PENDING' COMMENT '处理状态: PENDING/ACKNOWLEDGED/RESOLVED',
+    acknowledged_by VARCHAR(100) NULL,
+    acknowledged_at TIMESTAMP NULL,
+    resolved_by VARCHAR(100) NULL,
+    resolved_at TIMESTAMP NULL,
+    additional_issues TEXT COMMENT '附加问题(JSON)',
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_meter_no (meter_no),
+    INDEX idx_alert_type (alert_type),
+    INDEX idx_severity (severity),
+    INDEX idx_status (status),
+    INDEX idx_created_at (created_at)
+);
+
+-- 6. 抄表结果统计视图
+CREATE OR REPLACE VIEW v_reading_statistics AS
+SELECT 
+    r.period,
+    r.area,
+    r.total_meters,
+    r.success_meters,
+    r.failed_meters,
+    r.abnormal_meters,
+    ROUND((r.success_meters * 100.0 / NULLIF(r.total_meters, 0)), 2) as success_rate,
+    ROUND((r.abnormal_meters * 100.0 / NULLIF(r.total_meters, 0)), 2) as abnormal_rate
+FROM rev_batch_report r
+ORDER BY r.period DESC, r.area;
+
+-- 7. 大表监控统计视图
+CREATE OR REPLACE VIEW v_large_meter_statistics AS
+SELECT 
+    caliber,
+    COUNT(*) as total_count,
+    SUM(CASE WHEN monitor_status = 'NORMAL' THEN 1 ELSE 0 END) as normal_count,
+    SUM(CASE WHEN monitor_status = 'ALARM' THEN 1 ELSE 0 END) as alarm_count,
+    SUM(CASE WHEN monitor_status = 'OFFLINE' THEN 1 ELSE 0 END) as offline_count,
+    ROUND(SUM(monthly_consumption), 2) as total_consumption,
+    ROUND(AVG(monthly_consumption), 2) as avg_consumption,
+    MAX(monthly_consumption) as max_consumption
+FROM rev_large_meter_monitor
+GROUP BY caliber
+ORDER BY caliber;
+

sql/problem_reporting.sql

@@ -0,0 +1,112 @@
+-- =============================================
+-- 智慧水务管理系统 - 巡检问题上报 + 工单管理 DDL
+-- 版本: V1
+-- =============================================
+
+-- 巡检问题上报表
+CREATE TABLE IF NOT EXISTS patrol_problem (
+    id BIGSERIAL PRIMARY KEY,
+    problem_no VARCHAR(30) UNIQUE NOT NULL,   -- 问题编号：WQ-2026-001
+    task_id BIGINT REFERENCES patrol_task(id),
+    point_seq INT,
+    device_id BIGINT,
+    device_name VARCHAR(200),
+    problem_type VARCHAR(50) NOT NULL,       -- 设备故障/水质异常/安全隐患/环境卫生/其他
+    problem_level VARCHAR(20) DEFAULT 'normal', -- low/normal/high/critical
+    problem_title VARCHAR(200) NOT NULL,
+    problem_description TEXT,
+    location VARCHAR(300),
+    lng DOUBLE PRECISION,
+    lat DOUBLE PRECISION,
+    photo_urls JSONB,                        -- 现场照片URL数组
+    reporter_id BIGINT REFERENCES sys_user(id),
+    reporter_name VARCHAR(50),
+    report_time TIMESTAMP DEFAULT NOW(),
+    status VARCHAR(20) DEFAULT 'reported',    -- reported/processing/completed/closed
+    work_order_id BIGINT,                    -- 关联工单ID
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE patrol_problem IS '巡检问题上报表';
+CREATE INDEX IF NOT EXISTS idx_problem_task ON patrol_problem(task_id);
+CREATE INDEX IF NOT EXISTS idx_problem_status ON patrol_problem(status);
+CREATE INDEX IF NOT EXISTS idx_problem_device ON patrol_problem(device_id);
+CREATE INDEX IF NOT EXISTS idx_problem_type ON patrol_problem(problem_type);
+
+-- 工单表
+CREATE TABLE IF NOT EXISTS work_order (
+    id BIGSERIAL PRIMARY KEY,
+    order_no VARCHAR(30) UNIQUE NOT NULL,     -- 工单编号：WO-2026-001
+    problem_id BIGINT REFERENCES patrol_problem(id),
+    order_type VARCHAR(50) NOT NULL,        -- 设备维修/水质处理/安全隐患处理/清洁/其他
+    priority VARCHAR(20) DEFAULT 'normal',   -- low/normal/high/critical
+    title VARCHAR(200) NOT NULL,
+    description TEXT,
+    location VARCHAR(300),
+    contact_person VARCHAR(50),
+    contact_phone VARCHAR(20),
+    reporter_id BIGINT REFERENCES sys_user(id),
+    reporter_name VARCHAR(50),
+    assignee_id BIGINT REFERENCES sys_user(id),
+    assignee_name VARCHAR(50),
+    status VARCHAR(20) DEFAULT 'pending',    -- pending/assigned/processing/completed/cancelled
+    process_status VARCHAR(20) DEFAULT 'created', -- created/accepted/in_progress/completed
+    estimated_duration INT,                  -- 预计工时(分钟)
+    actual_start_time TIMESTAMP,
+    actual_end_time TIMESTAMP,
+    completion_time TIMESTAMP,
+    photos_before JSONB,                     -- 处理前照片
+    photos_after JSONB,                      -- 处理后照片
+    solution_description TEXT,               -- 处理方案描述
+    solution_result TEXT,                    -- 处理结果
+    customer_feedback TEXT,                  -- 客户反馈
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE work_order IS '工单表';
+CREATE INDEX IF NOT EXISTS idx_order_problem ON work_order(problem_id);
+CREATE INDEX IF NOT EXISTS idx_order_status ON work_order(status, process_status);
+CREATE INDEX IF NOT EXISTS idx_order_assignee ON work_order(assignee_id);
+
+-- 工单处理记录表
+CREATE TABLE IF NOT EXISTS work_order_process (
+    id BIGSERIAL PRIMARY KEY,
+    work_order_id BIGINT REFERENCES work_order(id),
+    process_step VARCHAR(50) NOT NULL,       -- created/accepted/in_progress/completed
+    processor_id BIGINT REFERENCES sys_user(id),
+    processor_name VARCHAR(50),
+    action VARCHAR(50) NOT NULL,            -- create/assign/start/complete/cancel
+    comment TEXT,
+    photos JSONB,                            -- 处理过程照片
+    created_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE work_order_process IS '工单处理记录表';
+CREATE INDEX IF NOT EXISTS idx_process_order ON work_order_process(work_order_id);
+CREATE INDEX IF NOT EXISTS idx_process_step ON work_order_process(process_step);
+
+-- 工单附件表
+CREATE TABLE IF NOT EXISTS work_order_attachment (
+    id BIGSERIAL PRIMARY KEY,
+    work_order_id BIGINT REFERENCES work_order(id),
+    file_name VARCHAR(200) NOT NULL,
+    file_path VARCHAR(500) NOT NULL,
+    file_type VARCHAR(50),                  -- image/pdf/doc/other
+    file_size BIGINT,
+    uploaded_by BIGINT REFERENCES sys_user(id),
+    uploaded_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE work_order_attachment IS '工单附件表';
+CREATE INDEX IF NOT EXISTS idx_attachment_order ON work_order_attachment(work_order_id);
+
+-- 巡检问题与工单关联触发记录
+CREATE TABLE IF NOT EXISTS patrol_work_order_trigger (
+    id BIGSERIAL PRIMARY KEY,
+    patrol_problem_id BIGINT REFERENCES patrol_problem(id),
+    work_order_id BIGINT REFERENCES work_order(id),
+    trigger_type VARCHAR(20) NOT NULL,      -- auto/manual
+    trigger_condition JSONB,                 -- 触发条件
+    created_at TIMESTAMP DEFAULT NOW()
+);
+COMMENT ON TABLE patrol_work_order_trigger IS '巡检问题与工单关联触发记录';
+CREATE INDEX IF NOT EXISTS idx_trigger_problem ON patrol_work_order_trigger(patrol_problem_id);
+CREATE INDEX IF NOT EXISTS idx_trigger_order ON patrol_work_order_trigger(work_order_id);

sql/revenue_tables.sql

@@ -0,0 +1,178 @@
+-- 营业收费系统表结构
+-- 客户信息表
+CREATE TABLE IF NOT EXISTS rev_customer (
+    id BIGSERIAL PRIMARY KEY,
+    customer_no VARCHAR(30) UNIQUE NOT NULL,
+    customer_name VARCHAR(100) NOT NULL,
+    customer_type VARCHAR(20) DEFAULT 'residential', -- residential/business/enterprise/institution
+    area VARCHAR(50),
+    address VARCHAR(300),
+    phone VARCHAR(20),
+    id_card VARCHAR(18),
+    contract_no VARCHAR(50),
+    status VARCHAR(20) DEFAULT 'active',
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+
+-- 水表档案表
+CREATE TABLE IF NOT EXISTS rev_meter (
+    id BIGSERIAL PRIMARY KEY,
+    meter_no VARCHAR(50) UNIQUE NOT NULL,
+    customer_id BIGINT REFERENCES rev_customer(id),
+    device_id BIGINT, -- 关联IoT设备
+    caliber VARCHAR(10), -- DN15/DN20/DN40...
+    meter_type VARCHAR(20), -- mechanical/ultrasonic/electromagnetic
+    initial_reading DECIMAL(10,2),
+    install_date DATE,
+    status VARCHAR(20) DEFAULT 'active', -- active/dismantled/scrapped/repaired
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+
+-- 抄表记录表
+CREATE TABLE IF NOT EXISTS rev_reading (
+    id BIGSERIAL PRIMARY KEY,
+    meter_id BIGINT REFERENCES rev_meter(id),
+    reading_date DATE NOT NULL,
+    prev_reading DECIMAL(10,2),
+    curr_reading DECIMAL(10,2),
+    consumption DECIMAL(10,2), -- 用水量
+    read_type VARCHAR(20), -- manual/remote/estimate
+    reader_id BIGINT,
+    photo_url VARCHAR(500),
+    verified TINYINT DEFAULT 0,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+
+-- 水费账单表
+CREATE TABLE IF NOT EXISTS rev_bill (
+    id BIGSERIAL PRIMARY KEY,
+    customer_id BIGINT REFERENCES rev_customer(id),
+    bill_period VARCHAR(10) NOT NULL, -- 2026-06
+    consumption DECIMAL(10,2),
+    water_fee DECIMAL(10,2),
+    sewage_fee DECIMAL(10,2),
+    total_fee DECIMAL(10,2),
+    paid_fee DECIMAL(10,2) DEFAULT 0,
+    status VARCHAR(20) DEFAULT 'pending', -- pending/partial/paid/overdue
+    due_date DATE,
+    paid_at TIMESTAMP,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW(),
+    UNIQUE(customer_id, bill_period)
+);
+
+-- 报装申请表
+CREATE TABLE IF NOT EXISTS rev_install (
+    id BIGSERIAL PRIMARY KEY,
+    app_no VARCHAR(50) UNIQUE NOT NULL,
+    customer_name VARCHAR(100) NOT NULL,
+    phone VARCHAR(20) NOT NULL,
+    area VARCHAR(50) NOT NULL,
+    address VARCHAR(300) NOT NULL,
+    customer_type VARCHAR(20) NOT NULL,
+    caliber VARCHAR(10) NOT NULL,
+    status VARCHAR(20) DEFAULT 'pre_apply', -- pre_apply/engineering/completed/terminated
+    apply_time TIMESTAMP DEFAULT NOW(),
+    complete_time TIMESTAMP,
+    engineer_id BIGINT,
+    remark TEXT,
+    created_at TIMESTAMP DEFAULT NOW(),
+    updated_at TIMESTAMP DEFAULT NOW()
+);
+
+-- 知识库字典类型
+INSERT INTO sys_dict_type (dict_key, dict_name, status, created_at) VALUES 
+('knowledge_base', '客服知识库', 1, NOW())
+ON CONFLICT (dict_key) DO NOTHING;
+
+-- 知识库字典数据
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, dict_sort, status) 
+VALUES (
+    (SELECT id FROM sys_dict_type WHERE dict_key = 'knowledge_base'),
+    '水费缴纳方式', 
+    '支持微信、支付宝、银行卡等多种缴费方式，可通过微信公众号、营业厅或自助终端缴纳。',
+    1, 
+    1
+),
+(
+    (SELECT id FROM sys_dict_type WHERE dict_key = 'knowledge_base'),
+    '水费计算规则', 
+    '水费 = 基本水费 + 超额水费 + 污水处理费。阶梯水价：第一级0-12m³/户，第二级12-24m³/户，第三级24m³以上/户。',
+    2, 
+    1
+),
+(
+    (SELECT id FROM sys_dict_type WHERE dict_key = 'knowledge_base'),
+    '报装流程', 
+    '1. 提交申请 2. 现场勘查 3. 方案制定 4. 工程施工 5. 验收通水 6. 资料归档。一般7-15个工作日完成。',
+    3, 
+    1
+),
+(
+    (SELECT id FROM sys_dict_type WHERE dict_key = 'knowledge_base'),
+    '水质问题处理', 
+    '如发现水质异常，请立即拨打客服热线400-123-4567，我们会安排工作人员24小时内上门处理。',
+    4, 
+    1
+)
+ON CONFLICT (dict_value) DO NOTHING;
+
+-- 公告板字典类型
+INSERT INTO sys_dict_type (dict_key, dict_name, status, created_at) VALUES 
+('notice_water_stop', '停水公告', 1, NOW()),
+('notice_water_quality', '水质公告', 1, NOW()),
+('notice_service', '服务通知', 1, NOW())
+ON CONFLICT (dict_key) DO NOTHING;
+
+-- 示例停水公告
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, created_at) 
+VALUES (
+    (SELECT id FROM sys_dict_type WHERE dict_key = 'notice_water_stop'),
+    '精芒片区计划停水通知',
+    '因管道维修，精芒片区将于2026年6月15日9:00-17:00停水，请提前储水。'
+) ON CONFLICT (dict_value) DO NOTHING;
+
+INSERT INTO sys_dict_data (dict_type_id, dict_label, dict_value, created_at) 
+VALUES (
+    (SELECT id FROM sys_dict_type WHERE dict_key = 'notice_service'),
+    '营业厅服务时间调整',
+    '精河营业厅周末服务时间调整为9:00-17:00，欢迎大家前来办理业务。'
+) ON CONFLICT (dict_value) DO NOTHING;
+
+-- 示例数据
+-- 创建一些测试客户
+INSERT INTO rev_customer (customer_no, customer_name, phone, area, address) VALUES 
+('C001', '张三', '13812345678', '精芒片区', '精河县精芒街道123号'),
+('C002', '李四', '13987654321', '托里片区', '精河县托里路456号'),
+('C003', '王五', '13555666777', '八家户片区', '精河县八家户街789号')
+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, prev_reading, curr_reading, consumption, read_type) VALUES 
+(1, '2026-05-01', 1000.00, 1100.00, 100.00, 'remote'),
+(2, '2026-05-01', 2000.00, 2100.00, 100.00, 'manual'),
+(3, '2026-05-01', 3000.00, 3200.00, 200.00, 'remote')
+ON CONFLICT (id) DO NOTHING;
+
+-- 创建测试账单
+INSERT INTO rev_bill (customer_id, bill_period, consumption, water_fee, sewage_fee, total_fee, status, due_date) VALUES 
+(1, '2026-05', 100.00, 45.00, 15.00, 60.00, 'pending', '2026-06-20'),
+(2, '2026-05', 100.00, 45.00, 15.00, 60.00, 'paid', '2026-06-15'),
+(3, '2026-05', 200.00, 90.00, 30.00, 120.00, 'overdue', '2026-06-10')
+ON CONFLICT (id) DO NOTHING;
+
+-- 创建测试报装申请
+INSERT INTO rev_install (app_no, customer_name, phone, area, address, customer_type, caliber, status) VALUES 
+('A001', '赵六', '13666777888', '大镇阿合其片区', '精河县大镇路999号', 'residential', 'DN15', 'completed'),
+('A002', '钱七', '13777888999', '托托片区', '精河县托托街111号', 'business', 'DN20', 'engineering')
+ON CONFLICT (app_no) DO NOTHING;

wm-patrol/pom.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent><groupId>com.water</groupId><artifactId>wm-parent</artifactId><version>1.0.0-SNAPSHOT</version></parent>
+    <artifactId>wm-patrol</artifactId>
+    <dependencies>
+        <dependency><groupId>com.water</groupId><artifactId>wm-common</artifactId></dependency>
+        <dependency><groupId>org.springframework.boot</groupId><artifactId>spring-boot-starter-web</artifactId></dependency>
+        <dependency><groupId>com.alibaba.cloud</groupId><artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId></dependency>
+        <dependency><groupId>com.baomidou</groupId><artifactId>mybatis-plus-spring-boot3-starter</artifactId></dependency>
+        <dependency><groupId>cn.dev33</groupId><artifactId>sa-token-spring-boot3-starter</artifactId></dependency>
+        <dependency><groupId>org.postgresql</groupId><artifactId>postgresql</artifactId></dependency>
+    </dependencies>
+</project>

wm-patrol/src/main/java/com/water/patrol/PatrolApplication.java

@@ -0,0 +1,11 @@
+package com.water.patrol;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PatrolApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(PatrolApplication.class, args);
+    }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolAppController.java

@@ -0,0 +1,127 @@
+package com.water.patrol.controller;
+
+import com.water.common.core.result.R;
+import com.water.patrol.service.PatrolAppService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡查APP控制器 - Issue #88
+ * PAT-21~PAT-29 统一入口
+ */
+@Tag(name = "巡查APP")
+@RestController
+@RequestMapping("/patrol/app")
+@RequiredArgsConstructor
+public class PatrolAppController {
+
+    private final PatrolAppService patrolAppService;
+
+    // ========== PAT-21 APP总览 ==========
+
+    @Operation(summary = "APP总览")
+    @GetMapping("/overview")
+    public R<Map<String, Object>> overview(@RequestParam Long userId) {
+        return R.ok(patrolAppService.getAppOverview(userId));
+    }
+
+    // ========== PAT-22 今日任务 ==========
+
+    @Operation(summary = "今日任务")
+    @GetMapping("/today-tasks")
+    public R<List<Map<String, Object>>> todayTasks(@RequestParam Long userId) {
+        return R.ok(patrolAppService.getTodayTasks(userId));
+    }
+
+    // ========== PAT-23 待办工单 ==========
+
+    @Operation(summary = "待办工单")
+    @GetMapping("/pending-work-orders")
+    public R<List<Map<String, Object>>> pendingWorkOrders(@RequestParam Long userId) {
+        return R.ok(patrolAppService.getPendingWorkOrders(userId));
+    }
+
+    // ========== PAT-24 巡检统计 ==========
+
+    @Operation(summary = "巡检统计")
+    @GetMapping("/stats")
+    public R<Map<String, Object>> stats(@RequestParam Long userId,
+                                         @RequestParam(defaultValue = "month") String period) {
+        return R.ok(patrolAppService.getUserStats(userId, period));
+    }
+
+    // ========== PAT-25 任务列表 ==========
+
+    @Operation(summary = "任务列表")
+    @GetMapping("/tasks")
+    public R<Map<String, Object>> tasks(@RequestParam Long userId,
+                                         @RequestParam(required = false) String status,
+                                         @RequestParam(defaultValue = "1") int page,
+                                         @RequestParam(defaultValue = "20") int size) {
+        return R.ok(patrolAppService.getTaskList(userId, status, page, size));
+    }
+
+    // ========== PAT-26 工单列表 ==========
+
+    @Operation(summary = "工单列表")
+    @GetMapping("/work-orders")
+    public R<Map<String, Object>> workOrders(@RequestParam Long userId,
+                                              @RequestParam(required = false) String status,
+                                              @RequestParam(defaultValue = "1") int page,
+                                              @RequestParam(defaultValue = "20") int size) {
+        return R.ok(patrolAppService.getWorkOrderList(userId, status, page, size));
+    }
+
+    // ========== PAT-27 问题上报 ==========
+
+    @Operation(summary = "问题上报")
+    @PostMapping("/report-issue")
+    public R<Map<String, Object>> reportIssue(@RequestBody Map<String, Object> req) {
+        Long taskId = Long.parseLong(String.valueOf(req.get("taskId")));
+        Long deviceId = req.get("deviceId") != null ? Long.parseLong(String.valueOf(req.get("deviceId"))) : null;
+        String issueType = (String) req.get("issueType");
+        String description = (String) req.get("description");
+
+        @SuppressWarnings("unchecked")
+        List<String> photoUrls = (List<String>) req.getOrDefault("photoUrls", List.of());
+        String voiceUrl = (String) req.get("voiceUrl");
+
+        Double lng = req.get("lng") != null ? ((Number) req.get("lng")).doubleValue() : null;
+        Double lat = req.get("lat") != null ? ((Number) req.get("lat")).doubleValue() : null;
+
+        return R.ok(patrolAppService.reportIssue(taskId, deviceId, issueType, description,
+            photoUrls, voiceUrl, lng, lat));
+    }
+
+    // ========== PAT-28 个人中心 ==========
+
+    @Operation(summary = "个人中心")
+    @GetMapping("/profile")
+    public R<Map<String, Object>> profile(@RequestParam Long userId) {
+        return R.ok(patrolAppService.getProfile(userId));
+    }
+
+    @Operation(summary = "更新头像")
+    @PutMapping("/avatar")
+    public R<Map<String, Object>> updateAvatar(@RequestParam Long userId,
+                                                @RequestParam String avatarUrl) {
+        return R.ok(patrolAppService.updateAvatar(userId, avatarUrl));
+    }
+
+    // ========== PAT-29 历史任务 ==========
+
+    @Operation(summary = "历史任务")
+    @GetMapping("/history-tasks")
+    public R<Map<String, Object>> historyTasks(@RequestParam Long userId,
+                                                @RequestParam(required = false) String startDate,
+                                                @RequestParam(required = false) String endDate,
+                                                @RequestParam(defaultValue = "1") int page,
+                                                @RequestParam(defaultValue = "20") int size) {
+        return R.ok(patrolAppService.getHistoryTasks(userId, startDate, endDate, page, size));
+    }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolAppIssueController.java

@@ -0,0 +1,12 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolIssueReport; import com.water.patrol.service.PatrolAppIssueService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal; import java.util.Map;
+@Tag(name="APP-问题上报") @RestController @RequestMapping("/api/patrol/app/issue") @RequiredArgsConstructor
+public class PatrolAppIssueController {
+    private final PatrolAppIssueService svc;
+    @Operation(summary="上报问题") @PostMapping public R<PatrolIssueReport> submit(@RequestParam(required=false) Long taskId, @RequestParam Long reporterId, @RequestParam String reporterName, @RequestParam String issueType, @RequestParam String description, @RequestParam(required=false) String photos, @RequestParam(required=false) String videos, @RequestParam(required=false) BigDecimal lng, @RequestParam(required=false) BigDecimal lat, @RequestParam(required=false) String address, @RequestParam(required=false) String severity) { return R.ok(svc.submit(taskId,reporterId,reporterName,issueType,description,photos,videos,lng,lat,address,severity)); }
+    @Operation(summary="我的上报") @GetMapping("/my") public R<Map<String,Object>> myReports(@RequestParam Long reporterId) { return R.ok(svc.myReports(reporterId)); }
+    @Operation(summary="上报详情") @GetMapping("/{id}") public R<PatrolIssueReport> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolAppProfileController.java

@@ -0,0 +1,10 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.service.PatrolAppProfileService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="APP-个人中心") @RestController @RequestMapping("/api/patrol/app/profile") @RequiredArgsConstructor
+public class PatrolAppProfileController {
+    private final PatrolAppProfileService svc;
+    @Operation(summary="个人数据") @GetMapping public R<Map<String,Object>> profile(@RequestParam Long workerId) { return R.ok(svc.getProfile(workerId)); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolAppTaskController.java

@@ -0,0 +1,14 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolTask; import com.water.patrol.service.PatrolAppTaskService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="APP-我的任务") @RestController @RequestMapping("/api/patrol/app/task") @RequiredArgsConstructor
+public class PatrolAppTaskController {
+    private final PatrolAppTaskService svc;
+    @Operation(summary="我的任务列表") @GetMapping("/my") public R<Map<String,Object>> myTasks(@RequestParam Long workerId, @RequestParam(required=false) String status) { return R.ok(svc.myTasks(workerId,status)); }
+    @Operation(summary="任务详情") @GetMapping("/{id}") public R<PatrolTask> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="接受任务") @PutMapping("/{id}/accept") public R<String> accept(@PathVariable Long id) { svc.accept(id); return R.ok("OK"); }
+    @Operation(summary="完成任务") @PutMapping("/{id}/complete") public R<String> complete(@PathVariable Long id, @RequestParam Integer completedCheckpoints, @RequestParam Double distance, @RequestParam(required=false) String remark) { svc.complete(id,completedCheckpoints,distance,remark); return R.ok("OK"); }
+    @Operation(summary="我的统计") @GetMapping("/my/stats") public R<Map<String,Object>> myStats(@RequestParam Long workerId) { return R.ok(svc.myStats(workerId)); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolAppWoController.java

@@ -0,0 +1,13 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolWorkOrder; import com.water.patrol.service.PatrolAppWorkOrderService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="APP-我的工单") @RestController @RequestMapping("/api/patrol/app/work-order") @RequiredArgsConstructor
+public class PatrolAppWoController {
+    private final PatrolAppWorkOrderService svc;
+    @Operation(summary="我的工单列表") @GetMapping("/my") public R<Map<String,Object>> myWorkOrders(@RequestParam Long assigneeId, @RequestParam(required=false) String status) { return R.ok(svc.myWorkOrders(assigneeId,status)); }
+    @Operation(summary="工单详情") @GetMapping("/{id}") public R<PatrolWorkOrder> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="接受工单") @PutMapping("/{id}/accept") public R<String> accept(@PathVariable Long id) { svc.accept(id); return R.ok("OK"); }
+    @Operation(summary="解决工单") @PutMapping("/{id}/resolve") public R<String> resolve(@PathVariable Long id, @RequestParam String resolution, @RequestParam(required=false) String resultPhotos) { svc.resolve(id,resolution,resultPhotos); return R.ok("OK"); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolAreaController.java

@@ -0,0 +1,16 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolArea; import com.water.patrol.service.PatrolAreaService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal; import java.util.Map;
+@Tag(name="巡检区域") @RestController @RequestMapping("/api/patrol/area") @RequiredArgsConstructor
+public class PatrolAreaController {
+    private final PatrolAreaService svc;
+    @Operation(summary="创建区域") @PostMapping public R<PatrolArea> create(@RequestParam String areaName, @RequestParam String areaCode, @RequestParam(required=false) String description, @RequestParam BigDecimal centerLng, @RequestParam BigDecimal centerLat, @RequestParam(required=false) String boundary, @RequestParam(required=false) Double radius) { return R.ok(svc.create(areaName,areaCode,description,centerLng,centerLat,boundary,radius)); }
+    @Operation(summary="区域列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String keyword, @RequestParam(required=false) String status, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.list(keyword,status,page,size)); }
+    @Operation(summary="区域详情") @GetMapping("/{id}") public R<PatrolArea> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="更新区域") @PutMapping("/{id}") public R<PatrolArea> update(@PathVariable Long id, @RequestBody PatrolArea patch) { return R.ok(svc.update(id,patch)); }
+    @Operation(summary="更新状态") @PutMapping("/{id}/status") public R<String> updateStatus(@PathVariable Long id, @RequestParam String status) { svc.updateStatus(id,status); return R.ok("OK"); }
+    @Operation(summary="删除区域") @DeleteMapping("/{id}") public R<String> delete(@PathVariable Long id) { svc.delete(id); return R.ok("OK"); }
+    @Operation(summary="区域统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolController.java

@@ -0,0 +1,100 @@
+package com.water.patrol.controller;
+
+import com.water.common.core.result.R;
+import com.water.patrol.service.PatrolService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.util.*;
+
+@Tag(name = "巡检管理")
+@RestController
+@RequestMapping("/patrol")
+@RequiredArgsConstructor
+public class PatrolController {
+
+    private final PatrolService patrolService;
+
+    // ---- 路线 ----
+    @PostMapping("/route")
+    public R<Map<String, Object>> createRoute(@RequestBody Map<String, Object> req) {
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> points = (List<Map<String, Object>>) req.getOrDefault("points", List.of());
+        return R.ok(patrolService.createRoute(
+            (String) req.get("routeName"), (String) req.get("area"),
+            points, (int) req.getOrDefault("estimDuration", 60)));
+    }
+
+    @GetMapping("/route/list")
+    public R<List<Map<String, Object>>> routes(@RequestParam String area) {
+        return R.ok(patrolService.getRoutes(area));
+    }
+
+    // ---- 任务 ----
+    @PostMapping("/task")
+    public R<Map<String, Object>> createTask(@RequestBody Map<String, Object> req) {
+        return R.ok(patrolService.createTask(
+            Long.parseLong(String.valueOf(req.get("routeId"))),
+            Long.parseLong(String.valueOf(req.get("assigneeId"))),
+            (String) req.get("taskDate")));
+    }
+
+    @GetMapping("/task/today")
+    public R<List<Map<String, Object>>> todayTasks(@RequestParam Long userId) {
+        return R.ok(patrolService.getTodayTasks(userId));
+    }
+
+    @PutMapping("/task/{id}/start")
+    public R<Map<String, Object>> startTask(@PathVariable Long id) {
+        return R.ok(patrolService.startTask(id));
+    }
+
+    @PutMapping("/task/{id}/complete")
+    public R<Map<String, Object>> completeTask(@PathVariable Long id, @RequestParam double distance) {
+        return R.ok(patrolService.completeTask(id, distance));
+    }
+
+    // ---- 巡检记录 ----
+    @PostMapping("/record")
+    public R<Map<String, Object>> record(@RequestBody Map<String, Object> req) {
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> items = (List<Map<String, Object>>) req.getOrDefault("checkItems", List.of());
+        return R.ok(patrolService.recordCheck(
+            Long.parseLong(String.valueOf(req.get("taskId"))),
+            (int) req.get("pointSeq"),
+            req.get("deviceId") != null ? Long.parseLong(String.valueOf(req.get("deviceId"))) : null,
+            items,
+            ((Number) req.get("lng")).doubleValue(),
+            ((Number) req.get("lat")).doubleValue()));
+    }
+
+    @GetMapping("/record/list/{taskId}")
+    public R<List<Map<String, Object>>> records(@PathVariable Long taskId) {
+        return R.ok(patrolService.getTaskRecords(taskId));
+    }
+
+    // ---- 问题上报 ----
+    @PostMapping("/issue/report")
+    public R<Map<String, Object>> reportIssue(@RequestBody Map<String, Object> req) {
+        @SuppressWarnings("unchecked")
+        List<String> photos = (List<String>) req.getOrDefault("photoUrls", List.of());
+        return R.ok(patrolService.reportIssue(
+            Long.parseLong(String.valueOf(req.get("taskId"))),
+            req.get("deviceId") != null ? Long.parseLong(String.valueOf(req.get("deviceId"))) : null,
+            (String) req.get("issueType"), (String) req.get("description"),
+            photos,
+            ((Number) req.get("lng")).doubleValue(),
+            ((Number) req.get("lat")).doubleValue()));
+    }
+
+    // ---- 统计 ----
+    @GetMapping("/stats")
+    public R<Map<String, Object>> stats(@RequestParam String area,
+                                         @RequestParam String start,
+                                         @RequestParam String end) {
+        return R.ok(patrolService.getStats(area, LocalDate.parse(start), LocalDate.parse(end)));
+    }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolCoreController.java

@@ -0,0 +1,186 @@
+package com.water.patrol.controller;
+
+import com.water.common.core.result.R;
+import com.water.patrol.service.PatrolCoreService;
+import com.water.patrol.service.PatrolWoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡检管理核心控制器 - Issue #86
+ * PAT-01~PAT-06
+ */
+@Tag(name = "巡检管理核心")
+@RestController
+@RequestMapping("/patrol/core")
+@RequiredArgsConstructor
+public class PatrolCoreController {
+
+    private final PatrolCoreService coreService;
+    private final PatrolWoService woService;
+
+    // ========== PAT-01 巡检总览 ==========
+
+    @GetMapping("/overview")
+    @Operation(summary = "巡检总览数据")
+    public R<Map<String, Object>> overview() {
+        return R.ok(coreService.getOverview());
+    }
+
+    @GetMapping("/overview/today-tasks")
+    @Operation(summary = "今日任务")
+    public R<List<Map<String, Object>>> todayTasks() {
+        return R.ok(coreService.getTodayTasks());
+    }
+
+    @GetMapping("/overview/recent-issues")
+    @Operation(summary = "最近问题")
+    public R<List<Map<String, Object>>> recentIssues(@RequestParam(defaultValue = "10") int limit) {
+        return R.ok(coreService.getRecentIssues(limit));
+    }
+
+    // ========== PAT-02 任务轨迹 ==========
+
+    @PostMapping("/track/record")
+    @Operation(summary = "记录GPS轨迹点")
+    public R<Map<String, Object>> recordTrack(@RequestBody Map<String, Object> req) {
+        Long taskId = Long.parseLong(String.valueOf(req.get("taskId")));
+        Long workerId = req.get("workerId") != null ? Long.parseLong(String.valueOf(req.get("workerId"))) : null;
+        double lng = ((Number) req.get("lng")).doubleValue();
+        double lat = ((Number) req.get("lat")).doubleValue();
+        double speed = req.get("speed") != null ? ((Number) req.get("speed")).doubleValue() : 0;
+        double accuracy = req.get("accuracy") != null ? ((Number) req.get("accuracy")).doubleValue() : 0;
+        return R.ok(coreService.recordTrackPoint(taskId, workerId, lng, lat, speed, accuracy));
+    }
+
+    @GetMapping("/track/{taskId}")
+    @Operation(summary = "获取任务轨迹")
+    public R<List<Map<String, Object>>> getTrack(@PathVariable Long taskId) {
+        return R.ok(coreService.getTrack(taskId));
+    }
+
+    @GetMapping("/track/{taskId}/replay")
+    @Operation(summary = "轨迹回放")
+    public R<Map<String, Object>> replayTrack(@PathVariable Long taskId) {
+        return R.ok(coreService.replayTrack(taskId));
+    }
+
+    @GetMapping("/track/{taskId}/stats")
+    @Operation(summary = "轨迹统计")
+    public R<Map<String, Object>> trackStats(@PathVariable Long taskId) {
+        return R.ok(coreService.getTrackStats(taskId));
+    }
+
+    // ========== PAT-03 任务台账 ==========
+
+    @GetMapping("/ledger/tasks")
+    @Operation(summary = "任务台账")
+    public R<Map<String, Object>> taskLedger(
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) Long workerId,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "20") int size) {
+        return R.ok(coreService.getTaskLedger(status, workerId, page, size));
+    }
+
+    // ========== PAT-04 设备台账 ==========
+
+    @GetMapping("/ledger/devices")
+    @Operation(summary = "设备台账")
+    public R<Map<String, Object>> deviceLedger(
+            @RequestParam(required = false) String type,
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String area,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "20") int size) {
+        return R.ok(coreService.getDeviceLedger(type, status, area, page, size));
+    }
+
+    @PostMapping("/device")
+    @Operation(summary = "新增设备")
+    public R<Map<String, Object>> createDevice(@RequestBody Map<String, Object> req) {
+        return R.ok(coreService.createDevice(
+            (String) req.get("deviceNo"),
+            (String) req.get("deviceName"),
+            (String) req.get("deviceType"),
+            (String) req.get("location"),
+            ((Number) req.getOrDefault("lng", 0)).doubleValue(),
+            ((Number) req.getOrDefault("lat", 0)).doubleValue(),
+            (String) req.get("area")));
+    }
+
+    @PutMapping("/device/{deviceId}/status")
+    @Operation(summary = "更新设备状态")
+    public R<Map<String, Object>> updateDeviceStatus(@PathVariable Long deviceId,
+                                                      @RequestBody Map<String, Object> req) {
+        return R.ok(coreService.updateDeviceStatus(deviceId, (String) req.get("status")));
+    }
+
+    // ========== PAT-05 工单管理 ==========
+
+    @PostMapping("/work-order")
+    @Operation(summary = "创建巡检工单")
+    public R<Map<String, Object>> createWo(@RequestBody Map<String, Object> req) {
+        Long taskId = req.get("taskId") != null ? Long.parseLong(String.valueOf(req.get("taskId"))) : null;
+        return R.ok(woService.create(
+            (String) req.get("issueType"),
+            (String) req.get("description"),
+            (String) req.get("severity"),
+            (String) req.get("location"),
+            req.get("lng") != null ? ((Number) req.get("lng")).doubleValue() : null,
+            req.get("lat") != null ? ((Number) req.get("lat")).doubleValue() : null,
+            taskId));
+    }
+
+    @GetMapping("/work-order/list")
+    @Operation(summary = "工单列表")
+    public R<Map<String, Object>> listWo(
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String severity,
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "20") int size) {
+        return R.ok(woService.list(status, severity, page, size));
+    }
+
+    @GetMapping("/work-order/{woId}")
+    @Operation(summary = "工单详情")
+    public R<Map<String, Object>> woDetail(@PathVariable Long woId) {
+        Map<String, Object> detail = woService.getDetail(woId);
+        if (detail == null) {
+            return R.fail("工单不存在");
+        }
+        return R.ok(detail);
+    }
+
+    @GetMapping("/work-order/stats")
+    @Operation(summary = "工单统计")
+    public R<Map<String, Object>> woStats() {
+        return R.ok(woService.stats());
+    }
+
+    // ========== PAT-06 工单处理 ==========
+
+    @PutMapping("/work-order/{woId}/assign")
+    @Operation(summary = "分派工单")
+    public R<Map<String, Object>> assignWo(@PathVariable Long woId, @RequestBody Map<String, Object> req) {
+        Long assigneeId = Long.parseLong(String.valueOf(req.get("assigneeId")));
+        return R.ok(woService.assign(woId, assigneeId, (String) req.get("assigneeName")));
+    }
+
+    @PutMapping("/work-order/{woId}/process")
+    @Operation(summary = "处理工单")
+    public R<Map<String, Object>> processWo(@PathVariable Long woId, @RequestBody Map<String, Object> req) {
+        return R.ok(woService.process(woId, (String) req.get("resolution")));
+    }
+
+    @PutMapping("/work-order/{woId}/resolve")
+    @Operation(summary = "解决工单")
+    public R<Map<String, Object>> resolveWo(@PathVariable Long woId) {
+        return R.ok(woService.resolve(woId));
+    }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolDeviceController.java

@@ -0,0 +1,16 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolDevice; import com.water.patrol.service.PatrolDeviceService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal; import java.util.Map;
+@Tag(name="设备台账") @RestController @RequestMapping("/api/patrol/device") @RequiredArgsConstructor
+public class PatrolDeviceController {
+    private final PatrolDeviceService svc;
+    @Operation(summary="注册") @PostMapping public R<PatrolDevice> create(@RequestParam String deviceNo, @RequestParam String deviceName, @RequestParam String deviceType, @RequestParam String location, @RequestParam BigDecimal lng, @RequestParam BigDecimal lat) { return R.ok(svc.create(deviceNo,deviceName,deviceType,location,lng,lat)); }
+    @Operation(summary="列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String deviceType, @RequestParam(required=false) String status, @RequestParam(required=false) String keyword, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.list(deviceType,status,keyword,page,size)); }
+    @Operation(summary="详情") @GetMapping("/{id}") public R<PatrolDevice> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="状态") @PutMapping("/{id}/status") public R<String> updateStatus(@PathVariable Long id, @RequestParam String status) { svc.updateStatus(id,status); return R.ok("OK"); }
+    @Operation(summary="维护") @PutMapping("/{id}/maintenance") public R<String> maintenance(@PathVariable Long id) { svc.recordMaintenance(id); return R.ok("OK"); }
+    @Operation(summary="统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+    @Operation(summary="删除") @DeleteMapping("/{id}") public R<String> delete(@PathVariable Long id) { svc.delete(id); return R.ok("OK"); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolFormController.java

@@ -0,0 +1,15 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolForm; import com.water.patrol.service.PatrolFormService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="巡检表单") @RestController @RequestMapping("/api/patrol/form") @RequiredArgsConstructor
+public class PatrolFormController {
+    private final PatrolFormService svc;
+    @Operation(summary="创建表单") @PostMapping public R<PatrolForm> create(@RequestBody Map<String,Object> req) { return R.ok(svc.create((String)req.get("formName"),(String)req.get("formCode"),(String)req.get("formType"),(String)req.get("fieldConfig"))); }
+    @Operation(summary="表单列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String keyword, @RequestParam(required=false) String formType, @RequestParam(required=false) String status, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.list(keyword,formType,status,page,size)); }
+    @Operation(summary="表单详情") @GetMapping("/{id}") public R<PatrolForm> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="更新表单") @PutMapping("/{id}") public R<PatrolForm> update(@PathVariable Long id, @RequestBody PatrolForm patch) { return R.ok(svc.update(id,patch)); }
+    @Operation(summary="删除表单") @DeleteMapping("/{id}") public R<String> delete(@PathVariable Long id) { svc.delete(id); return R.ok("OK"); }
+    @Operation(summary="表单统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolLedgerController.java

@@ -0,0 +1,15 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolTask; import com.water.patrol.service.PatrolLedgerService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="巡检台账") @RestController @RequestMapping("/api/patrol/ledger") @RequiredArgsConstructor
+public class PatrolLedgerController {
+    private final PatrolLedgerService svc;
+    @Operation(summary="列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String status, @RequestParam(required=false) String workerName, @RequestParam(required=false) String startDate, @RequestParam(required=false) String endDate, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.listTasks(status,workerName,startDate,endDate,page,size)); }
+    @Operation(summary="详情") @GetMapping("/{id}") public R<PatrolTask> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="创建") @PostMapping public R<PatrolTask> create(@RequestBody Map<String,Object> req) { return R.ok(svc.createTask((String)req.get("taskName"),((Number)req.get("routeId")).longValue(),((Number)req.get("workerId")).longValue(),(String)req.get("workerName"))); }
+    @Operation(summary="开始") @PutMapping("/{id}/start") public R<String> start(@PathVariable Long id) { svc.startTask(id); return R.ok("OK"); }
+    @Operation(summary="完成") @PutMapping("/{id}/complete") public R<String> complete(@PathVariable Long id, @RequestParam Integer completedCheckpoints, @RequestParam Double distance) { svc.completeTask(id,completedCheckpoints,distance); return R.ok("OK"); }
+    @Operation(summary="统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolOverviewController.java

@@ -0,0 +1,11 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.service.PatrolOverviewService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="巡检总览") @RestController @RequestMapping("/api/patrol/overview") @RequiredArgsConstructor
+public class PatrolOverviewController {
+    private final PatrolOverviewService svc;
+    @Operation(summary="总览") @GetMapping public R<Map<String,Object>> overview() { return R.ok(svc.getOverview()); }
+    @Operation(summary="月度统计") @GetMapping("/monthly") public R<Map<String,Object>> monthly(@RequestParam int year, @RequestParam int month) { return R.ok(svc.getMonthlyStats(year,month)); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolProblemController.java

@@ -0,0 +1,126 @@
+package com.water.patrol.controller;
+
+import com.water.patrol.entity.PatrolProblem;
+import com.water.patrol.service.PatrolProblemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/patrol/problems")
+public class PatrolProblemController {
+
+    @Autowired
+    private PatrolProblemService patrolProblemService;
+
+    /**
+     * 创建巡检问题
+     */
+    @PostMapping
+    public ResponseEntity<PatrolProblem> createProblem(@RequestBody PatrolProblem patrolProblem) {
+        PatrolProblem created = patrolProblemService.createProblem(patrolProblem);
+        return ResponseEntity.ok(created);
+    }
+
+    /**
+     * 根据ID查询问题
+     */
+    @GetMapping("/{id}")
+    public ResponseEntity<PatrolProblem> getProblemById(@PathVariable Long id) {
+        PatrolProblem problem = patrolProblemService.getProblemById(id);
+        if (problem != null) {
+            return ResponseEntity.ok(problem);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 根据问题编号查询
+     */
+    @GetMapping("/problem-no/{problemNo}")
+    public ResponseEntity<PatrolProblem> getProblemByProblemNo(@PathVariable String problemNo) {
+        PatrolProblem problem = patrolProblemService.getProblemByProblemNo(problemNo);
+        if (problem != null) {
+            return ResponseEntity.ok(problem);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 根据任务ID查询问题列表
+     */
+    @GetMapping("/task/{taskId}")
+    public ResponseEntity<List<PatrolProblem>> getProblemsByTaskId(@PathVariable Long taskId) {
+        List<PatrolProblem> problems = patrolProblemService.getProblemsByTaskId(taskId);
+        return ResponseEntity.ok(problems);
+    }
+
+    /**
+     * 根据状态查询问题列表
+     */
+    @GetMapping("/status/{status}")
+    public ResponseEntity<List<PatrolProblem>> getProblemsByStatus(@PathVariable String status) {
+        List<PatrolProblem> problems = patrolProblemService.getProblemsByStatus(status);
+        return ResponseEntity.ok(problems);
+    }
+
+    /**
+     * 根据设备ID查询问题列表
+     */
+    @GetMapping("/device/{deviceId}")
+    public ResponseEntity<List<PatrolProblem>> getProblemsByDeviceId(@PathVariable Long deviceId) {
+        List<PatrolProblem> problems = patrolProblemService.getProblemsByDeviceId(deviceId);
+        return ResponseEntity.ok(problems);
+    }
+
+    /**
+     * 更新问题信息
+     */
+    @PutMapping("/{id}")
+    public ResponseEntity<PatrolProblem> updateProblem(@PathVariable Long id, @RequestBody PatrolProblem patrolProblem) {
+        patrolProblem.setId(id);
+        PatrolProblem updated = patrolProblemService.updateProblem(patrolProblem);
+        if (updated != null) {
+            return ResponseEntity.ok(updated);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 更新问题状态
+     */
+    @PutMapping("/{id}/status")
+    public ResponseEntity<Boolean> updateProblemStatus(@PathVariable Long id, @RequestParam String status, @RequestParam(required = false) Long workOrderId) {
+        boolean updated = patrolProblemService.updateProblemStatus(id, status, workOrderId);
+        return ResponseEntity.ok(updated);
+    }
+
+    /**
+     * 删除问题
+     */
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Boolean> deleteProblem(@PathVariable Long id) {
+        boolean deleted = patrolProblemService.deleteProblem(id);
+        return ResponseEntity.ok(deleted);
+    }
+
+    /**
+     * 自动创建工单
+     */
+    @PostMapping("/{id}/auto-create-work-order")
+    public ResponseEntity<Boolean> autoCreateWorkOrder(@PathVariable Long id) {
+        boolean created = patrolProblemService.autoCreateWorkOrder(id);
+        return ResponseEntity.ok(created);
+    }
+
+    /**
+     * 获取问题统计信息
+     */
+    @GetMapping("/statistics")
+    public ResponseEntity<PatrolProblemService.ProblemStatistics> getProblemStatistics() {
+        PatrolProblemService.ProblemStatistics statistics = patrolProblemService.getProblemStatistics();
+        return ResponseEntity.ok(statistics);
+    }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolRouteSetupController.java

@@ -0,0 +1,16 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolRouteSetup; import com.water.patrol.service.PatrolRouteSetupService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="巡检路线设置") @RestController @RequestMapping("/api/patrol/route-setup") @RequiredArgsConstructor
+public class PatrolRouteSetupController {
+    private final PatrolRouteSetupService svc;
+    @Operation(summary="创建路线") @PostMapping public R<PatrolRouteSetup> create(@RequestBody Map<String,Object> req) { return R.ok(svc.create((String)req.get("routeName"),(String)req.get("routeCode"),((Number)req.get("areaId")).longValue(),(String)req.get("areaName"),(Integer)req.get("checkpointCount"),(String)req.get("checkpointList"),(Double)req.get("totalDistance"),(Integer)req.get("estimatedMinutes"))); }
+    @Operation(summary="路线列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String keyword, @RequestParam(required=false) String status, @RequestParam(required=false) Long areaId, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.list(keyword,status,areaId,page,size)); }
+    @Operation(summary="路线详情") @GetMapping("/{id}") public R<PatrolRouteSetup> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="更新路线") @PutMapping("/{id}") public R<PatrolRouteSetup> update(@PathVariable Long id, @RequestBody PatrolRouteSetup patch) { return R.ok(svc.update(id,patch)); }
+    @Operation(summary="更新状态") @PutMapping("/{id}/status") public R<String> updateStatus(@PathVariable Long id, @RequestParam String status) { svc.updateStatus(id,status); return R.ok("OK"); }
+    @Operation(summary="删除路线") @DeleteMapping("/{id}") public R<String> delete(@PathVariable Long id) { svc.delete(id); return R.ok("OK"); }
+    @Operation(summary="路线统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolTemplateController.java

@@ -0,0 +1,16 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolTemplate; import com.water.patrol.service.PatrolTemplateService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="巡检模板") @RestController @RequestMapping("/api/patrol/template") @RequiredArgsConstructor
+public class PatrolTemplateController {
+    private final PatrolTemplateService svc;
+    @Operation(summary="创建模板") @PostMapping public R<PatrolTemplate> create(@RequestBody Map<String,Object> req) { return R.ok(svc.create((String)req.get("templateName"),(String)req.get("templateCode"),((Number)req.get("routeId")).longValue(),(String)req.get("routeName"),((Number)req.get("formId")).longValue(),(String)req.get("formName"),(String)req.get("scheduleType"),(String)req.get("scheduleConfig"))); }
+    @Operation(summary="模板列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String keyword, @RequestParam(required=false) String status, @RequestParam(required=false) String scheduleType, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.list(keyword,status,scheduleType,page,size)); }
+    @Operation(summary="模板详情") @GetMapping("/{id}") public R<PatrolTemplate> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="更新模板") @PutMapping("/{id}") public R<PatrolTemplate> update(@PathVariable Long id, @RequestBody PatrolTemplate patch) { return R.ok(svc.update(id,patch)); }
+    @Operation(summary="更新状态") @PutMapping("/{id}/status") public R<String> updateStatus(@PathVariable Long id, @RequestParam String status) { svc.updateStatus(id,status); return R.ok("OK"); }
+    @Operation(summary="删除模板") @DeleteMapping("/{id}") public R<String> delete(@PathVariable Long id) { svc.delete(id); return R.ok("OK"); }
+    @Operation(summary="模板统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolTrackController.java

@@ -0,0 +1,13 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolTrackPoint; import com.water.patrol.service.PatrolTrackService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal; import java.util.*;
+@Tag(name="巡检轨迹") @RestController @RequestMapping("/api/patrol/track") @RequiredArgsConstructor
+public class PatrolTrackController {
+    private final PatrolTrackService svc;
+    @Operation(summary="记录GPS") @PostMapping public R<PatrolTrackPoint> record(@RequestParam Long taskId, @RequestParam Long workerId, @RequestParam BigDecimal lng, @RequestParam BigDecimal lat, @RequestParam(required=false) BigDecimal speed, @RequestParam(required=false) BigDecimal accuracy, @RequestParam(required=false) String address) { return R.ok(svc.recordPoint(taskId,workerId,lng,lat,speed,accuracy,address)); }
+    @Operation(summary="轨迹") @GetMapping("/{taskId}") public R<List<PatrolTrackPoint>> getTrack(@PathVariable Long taskId) { return R.ok(svc.getTrack(taskId)); }
+    @Operation(summary="摘要") @GetMapping("/{taskId}/summary") public R<Map<String,Object>> summary(@PathVariable Long taskId) { return R.ok(svc.getTrackSummary(taskId)); }
+    @Operation(summary="导出") @GetMapping("/{taskId}/export") public R<List<Map<String,Object>>> export(@PathVariable Long taskId) { return R.ok(svc.exportTrack(taskId)); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/PatrolWoController.java

@@ -0,0 +1,17 @@
+package com.water.patrol.controller;
+import com.water.common.core.result.R; import com.water.patrol.entity.PatrolWorkOrder; import com.water.patrol.service.PatrolWorkOrderService;
+import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+@Tag(name="巡检工单") @RestController @RequestMapping("/api/patrol/work-order") @RequiredArgsConstructor
+public class PatrolWoController {
+    private final PatrolWorkOrderService svc;
+    @Operation(summary="创建") @PostMapping public R<PatrolWorkOrder> create(@RequestBody Map<String,Object> req) { return R.ok(svc.create(((Number)req.get("taskId")).longValue(),(String)req.get("issueType"),(String)req.get("description"),(String)req.get("photos"),(String)req.get("severity"))); }
+    @Operation(summary="列表") @GetMapping public R<Map<String,Object>> list(@RequestParam(required=false) String status, @RequestParam(required=false) String severity, @RequestParam(required=false) String keyword, @RequestParam(defaultValue="1") int page, @RequestParam(defaultValue="20") int size) { return R.ok(svc.list(status,severity,keyword,page,size)); }
+    @Operation(summary="详情") @GetMapping("/{id}") public R<PatrolWorkOrder> detail(@PathVariable Long id) { return R.ok(svc.getDetail(id)); }
+    @Operation(summary="分配") @PutMapping("/{id}/assign") public R<String> assign(@PathVariable Long id, @RequestParam Long assigneeId, @RequestParam String assigneeName) { svc.assign(id,assigneeId,assigneeName); return R.ok("OK"); }
+    @Operation(summary="开始") @PutMapping("/{id}/start") public R<String> start(@PathVariable Long id) { svc.startProcess(id); return R.ok("OK"); }
+    @Operation(summary="解决") @PutMapping("/{id}/resolve") public R<String> resolve(@PathVariable Long id, @RequestParam String resolution) { svc.resolve(id,resolution); return R.ok("OK"); }
+    @Operation(summary="关闭") @PutMapping("/{id}/close") public R<String> close(@PathVariable Long id) { svc.close(id); return R.ok("OK"); }
+    @Operation(summary="统计") @GetMapping("/stats") public R<Map<String,Object>> stats() { return R.ok(svc.getStats()); }
+}

wm-patrol/src/main/java/com/water/patrol/controller/WorkOrderController.java

@@ -0,0 +1,151 @@
+package com.water.patrol.controller;
+
+import com.water.patrol.entity.WorkOrder;
+import com.water.patrol.service.WorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/work-orders")
+public class WorkOrderController {
+
+    @Autowired
+    private WorkOrderService workOrderService;
+
+    /**
+     * 根据ID查询工单
+     */
+    @GetMapping("/{id}")
+    public ResponseEntity<WorkOrder> getWorkOrderById(@PathVariable Long id) {
+        WorkOrder workOrder = workOrderService.getWorkOrderById(id);
+        if (workOrder != null) {
+            return ResponseEntity.ok(workOrder);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 根据工单编号查询
+     */
+    @GetMapping("/order-no/{orderNo}")
+    public ResponseEntity<WorkOrder> getWorkOrderByOrderNo(@PathVariable String orderNo) {
+        WorkOrder workOrder = workOrderService.getWorkOrderByOrderNo(orderNo);
+        if (workOrder != null) {
+            return ResponseEntity.ok(workOrder);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 根据问题ID查询工单
+     */
+    @GetMapping("/problem/{problemId}")
+    public ResponseEntity<WorkOrder> getWorkOrderByProblemId(@PathVariable Long problemId) {
+        WorkOrder workOrder = workOrderService.getWorkOrderByProblemId(problemId);
+        if (workOrder != null) {
+            return ResponseEntity.ok(workOrder);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 根据状态查询工单列表
+     */
+    @GetMapping("/status/{status}")
+    public ResponseEntity<List<WorkOrder>> getWorkOrdersByStatus(@PathVariable String status) {
+        List<WorkOrder> workOrders = workOrderService.getWorkOrdersByStatus(status);
+        return ResponseEntity.ok(workOrders);
+    }
+
+    /**
+     * 根据处理人查询工单列表
+     */
+    @GetMapping("/assignee/{assigneeId}")
+    public ResponseEntity<List<WorkOrder>> getWorkOrdersByAssigneeId(@PathVariable Long assigneeId) {
+        List<WorkOrder> workOrders = workOrderService.getWorkOrdersByAssigneeId(assigneeId);
+        return ResponseEntity.ok(workOrders);
+    }
+
+    /**
+     * 根据处理状态查询工单列表
+     */
+    @GetMapping("/process-status/{processStatus}")
+    public ResponseEntity<List<WorkOrder>> getWorkOrdersByProcessStatus(@PathVariable String processStatus) {
+        List<WorkOrder> workOrders = workOrderService.getWorkOrdersByProcessStatus(processStatus);
+        return ResponseEntity.ok(workOrders);
+    }
+
+    /**
+     * 更新工单信息
+     */
+    @PutMapping("/{id}")
+    public ResponseEntity<WorkOrder> updateWorkOrder(@PathVariable Long id, @RequestBody WorkOrder workOrder) {
+        workOrder.setId(id);
+        WorkOrder updated = workOrderService.updateWorkOrder(workOrder);
+        if (updated != null) {
+            return ResponseEntity.ok(updated);
+        }
+        return ResponseEntity.notFound().build();
+    }
+
+    /**
+     * 更新工单状态
+     */
+    @PutMapping("/{id}/status")
+    public ResponseEntity<Boolean> updateWorkOrderStatus(@PathVariable Long id, 
+                                                       @RequestParam String status, 
+                                                       @RequestParam(required = false) String processStatus) {
+        boolean updated = workOrderService.updateWorkOrderStatus(id, status, processStatus);
+        return ResponseEntity.ok(updated);
+    }
+
+    /**
+     * 分派工单
+     */
+    @PutMapping("/{id}/assign")
+    public ResponseEntity<Boolean> assignWorkOrder(@PathVariable Long id, 
+                                                 @RequestParam Long assigneeId, 
+                                                 @RequestParam String assigneeName) {
+        boolean assigned = workOrderService.assignWorkOrder(id, assigneeId, assigneeName);
+        return ResponseEntity.ok(assigned);
+    }
+
+    /**
+     * 开始处理工单
+     */
+    @PutMapping("/{id}/start")
+    public ResponseEntity<Boolean> startWorkOrder(@PathVariable Long id) {
+        boolean started = workOrderService.startWorkOrder(id);
+        return ResponseEntity.ok(started);
+    }
+
+    /**
+     * 完成工单
+     */
+    @PutMapping("/{id}/complete")
+    public ResponseEntity<Boolean> completeWorkOrder(@PathVariable Long id, @RequestParam String solutionResult) {
+        boolean completed = workOrderService.completeWorkOrder(id, solutionResult);
+        return ResponseEntity.ok(completed);
+    }
+
+    /**
+     * 删除工单
+     */
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Boolean> deleteWorkOrder(@PathVariable Long id) {
+        boolean deleted = workOrderService.deleteWorkOrder(id);
+        return ResponseEntity.ok(deleted);
+    }
+
+    /**
+     * 获取工单统计信息
+     */
+    @GetMapping("/statistics")
+    public ResponseEntity<WorkOrderService.WorkOrderStatistics> getWorkOrderStatistics() {
+        WorkOrderService.WorkOrderStatistics statistics = workOrderService.getWorkOrderStatistics();
+        return ResponseEntity.ok(statistics);
+    }
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolArea.java

@@ -0,0 +1,15 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+@Data @TableName("pat_area")
+public class PatrolArea {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String areaName; private String areaCode; private String description;
+    private BigDecimal centerLng; private BigDecimal centerLat;
+    private String boundary; private Double radius;
+    private String status;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolDevice.java

@@ -0,0 +1,16 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+@Data @TableName("pat_device")
+public class PatrolDevice {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String deviceNo; private String deviceName; private String deviceType;
+    private String location; private BigDecimal lng; private BigDecimal lat;
+    private String status; private LocalDate lastMaintenanceDate; private LocalDate nextMaintenanceDate;
+    private String remark;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolForm.java

@@ -0,0 +1,13 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+@Data @TableName("pat_form")
+public class PatrolForm {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String formName; private String formCode;
+    private String formType; private String fieldConfig;
+    private String status; private String remark;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolIssueReport.java

@@ -0,0 +1,19 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+@Data @TableName("pat_issue_report")
+public class PatrolIssueReport {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String reportNo; private Long taskId;
+    private Long reporterId; private String reporterName;
+    private String issueType; private String description;
+    private String photos; private String videos;
+    private BigDecimal lng; private BigDecimal lat;
+    private String address; private String severity;
+    private String status; private Long workOrderId;
+    private String remark;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolProblem.java

@@ -0,0 +1,31 @@
+package com.water.patrol.entity;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class PatrolProblem {
+    private Long id;
+    private String problemNo;
+    private Long taskId;
+    private Integer pointSeq;
+    private Long deviceId;
+    private String deviceName;
+    private String problemType;        // 设备故障/水质异常/安全隐患/环境卫生/其他
+    private String problemLevel;       // low/normal/high/critical
+    private String problemTitle;
+    private String problemDescription;
+    private String location;
+    private Double lng;
+    private Double lat;
+    private List<String> photoUrls;
+    private Long reporterId;
+    private String reporterName;
+    private LocalDateTime reportTime;
+    private String status;             // reported/processing/completed/closed
+    private Long workOrderId;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolRouteSetup.java

@@ -0,0 +1,15 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+@Data @TableName("pat_route_setup")
+public class PatrolRouteSetup {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String routeName; private String routeCode;
+    private Long areaId; private String areaName;
+    private Integer checkpointCount; private String checkpointList;
+    private Double totalDistance; private Integer estimatedMinutes;
+    private String status; private String remark;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolTask.java

@@ -0,0 +1,15 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+@Data @TableName("pat_task")
+public class PatrolTask {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String taskNo; private String taskName; private Long routeId;
+    private Long workerId; private String workerName; private String status;
+    private LocalDateTime startTime; private LocalDateTime endTime;
+    private Integer checkpoints; private Integer completedCheckpoints; private Integer abnormalCount;
+    private Double distance; private String remark;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolTemplate.java

@@ -0,0 +1,15 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+@Data @TableName("pat_template")
+public class PatrolTemplate {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String templateName; private String templateCode;
+    private Long routeId; private String routeName;
+    private Long formId; private String formName;
+    private String scheduleType; private String scheduleConfig;
+    private String status; private String remark;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolTrackPoint.java

@@ -0,0 +1,12 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+@Data @TableName("pat_track_point")
+public class PatrolTrackPoint {
+    @TableId(type = IdType.AUTO) private Long id;
+    private Long taskId; private Long workerId;
+    private BigDecimal lng; private BigDecimal lat; private BigDecimal speed; private BigDecimal accuracy;
+    private String address; private LocalDateTime timestamp;
+}

wm-patrol/src/main/java/com/water/patrol/entity/PatrolWorkOrder.java

@@ -0,0 +1,14 @@
+package com.water.patrol.entity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.time.LocalDateTime;
+@Data @TableName("pat_work_order")
+public class PatrolWorkOrder {
+    @TableId(type = IdType.AUTO) private Long id;
+    private String orderNo; private Long taskId; private String issueType;
+    private String description; private String photos; private String severity;
+    private Long assigneeId; private String assigneeName; private String status;
+    private String resolution; private LocalDateTime resolvedAt;
+    @TableField(fill = FieldFill.INSERT) private LocalDateTime createdAt;
+    @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/WorkOrder.java

@@ -0,0 +1,37 @@
+package com.water.patrol.entity;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class WorkOrder {
+    private Long id;
+    private String orderNo;
+    private Long problemId;
+    private String orderType;        // 设备维修/水质处理/安全隐患处理/清洁/其他
+    private String priority;         // low/normal/high/critical
+    private String title;
+    private String description;
+    private String location;
+    private String contactPerson;
+    private String contactPhone;
+    private Long reporterId;
+    private String reporterName;
+    private Long assigneeId;
+    private String assigneeName;
+    private String status;           // pending/assigned/processing/completed/cancelled
+    private String processStatus;    // created/accepted/in_progress/completed
+    private Integer estimatedDuration;
+    private LocalDateTime actualStartTime;
+    private LocalDateTime actualEndTime;
+    private LocalDateTime completionTime;
+    private List<String> photosBefore;
+    private List<String> photosAfter;
+    private String solutionDescription;
+    private String solutionResult;
+    private String customerFeedback;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}

wm-patrol/src/main/java/com/water/patrol/entity/WorkOrderProcess.java

@@ -0,0 +1,18 @@
+package com.water.patrol.entity;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class WorkOrderProcess {
+    private Long id;
+    private Long workOrderId;
+    private String processStep;      // created/accepted/in_progress/completed
+    private Long processorId;
+    private String processorName;
+    private String action;           // create/assign/start/complete/cancel
+    private String comment;
+    private List<String> photos;
+    private LocalDateTime createdAt;
+}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolAreaMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolArea;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolAreaMapper extends BaseMapper<PatrolArea> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolDeviceMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolDevice;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolDeviceMapper extends BaseMapper<PatrolDevice> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolFormMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolForm;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolFormMapper extends BaseMapper<PatrolForm> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolIssueReportMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolIssueReport;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolIssueReportMapper extends BaseMapper<PatrolIssueReport> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolProblemMapper.java

@@ -0,0 +1,47 @@
+package com.water.patrol.mapper;
+
+import com.water.patrol.entity.PatrolProblem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface PatrolProblemMapper {
+    
+    // 插入巡检问题
+    int insert(PatrolProblem patrolProblem);
+    
+    // 根据ID查询
+    PatrolProblem selectById(Long id);
+    
+    // 根据问题编号查询
+    PatrolProblem selectByProblemNo(String problemNo);
+    
+    // 根据任务ID查询问题列表
+    List<PatrolProblem> selectByTaskId(Long taskId);
+    
+    // 根据状态查询问题列表
+    List<PatrolProblem> selectByStatus(String status);
+    
+    // 根据设备ID查询问题列表
+    List<PatrolProblem> selectByDeviceId(Long deviceId);
+    
+    // 更新问题信息
+    int update(PatrolProblem patrolProblem);
+    
+    // 更新问题状态
+    int updateStatus(@Param("id") Long id, @Param("status") String status, @Param("workOrderId") Long workOrderId);
+    
+    // 删除问题
+    int deleteById(Long id);
+    
+    // 生成问题编号
+    String generateProblemNo();
+    
+    // 获取问题总数
+    int countAll();
+    
+    // 获取指定状态的问题数
+    int countByStatus(String status);
+}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolRouteSetupMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolRouteSetup;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolRouteSetupMapper extends BaseMapper<PatrolRouteSetup> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolTaskMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolTask;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolTaskMapper extends BaseMapper<PatrolTask> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolTemplateMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolTemplate;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolTemplateMapper extends BaseMapper<PatrolTemplate> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolTrackPointMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolTrackPoint;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolTrackPointMapper extends BaseMapper<PatrolTrackPoint> {}

wm-patrol/src/main/java/com/water/patrol/mapper/PatrolWorkOrderMapper.java

@@ -0,0 +1,5 @@
+package com.water.patrol.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.patrol.entity.PatrolWorkOrder;
+import org.apache.ibatis.annotations.Mapper;
+@Mapper public interface PatrolWorkOrderMapper extends BaseMapper<PatrolWorkOrder> {}

wm-patrol/src/main/java/com/water/patrol/mapper/WorkOrderMapper.java

@@ -0,0 +1,60 @@
+package com.water.patrol.mapper;
+
+import com.water.patrol.entity.WorkOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface WorkOrderMapper {
+    
+    // 插入工单
+    int insert(WorkOrder workOrder);
+    
+    // 根据ID查询
+    WorkOrder selectById(Long id);
+    
+    // 根据工单编号查询
+    WorkOrder selectByOrderNo(String orderNo);
+    
+    // 根据问题ID查询工单
+    WorkOrder selectByProblemId(Long problemId);
+    
+    // 根据状态查询工单列表
+    List<WorkOrder> selectByStatus(String status);
+    
+    // 根据处理人查询工单列表
+    List<WorkOrder> selectByAssigneeId(Long assigneeId);
+    
+    // 根据处理状态查询工单列表
+    List<WorkOrder> selectByProcessStatus(String processStatus);
+    
+    // 更新工单信息
+    int update(WorkOrder workOrder);
+    
+    // 更新工单状态
+    int updateStatus(@Param("id") Long id, @Param("status") String status, @Param("processStatus") String processStatus);
+    
+    // 更新处理人
+    int updateAssignee(@Param("id") Long id, @Param("assigneeId") Long assigneeId, @Param("assigneeName") String assigneeName);
+    
+    // 更新完成信息
+    int updateCompletion(@Param("id") Long id, @Param("actualEndTime") LocalDateTime actualEndTime, 
+                        @Param("completionTime") LocalDateTime completionTime, @Param("solutionResult") String solutionResult);
+    
+    // 删除工单
+    int deleteById(Long id);
+    
+    // 生成工单编号
+    String generateOrderNo();
+    
+    // 获取工单总数
+    int countAll();
+    
+    // 获取指定状态的工单数
+    int countByStatus(String status);
+    
+    // 获取指定处理状态的工单数
+    int countByProcessStatus(String processStatus);
+}

wm-patrol/src/main/java/com/water/patrol/mapper/WorkOrderProcessMapper.java

@@ -0,0 +1,25 @@
+package com.water.patrol.mapper;
+
+import com.water.patrol.entity.WorkOrderProcess;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+@Mapper
+public interface WorkOrderProcessMapper {
+    
+    // 插入处理记录
+    int insert(WorkOrderProcess workOrderProcess);
+    
+    // 根据工单ID查询处理记录列表
+    List<WorkOrderProcess> selectByWorkOrderId(Long workOrderId);
+    
+    // 根据ID查询
+    WorkOrderProcess selectById(Long id);
+    
+    // 获取最新的处理记录
+    WorkOrderProcess selectLatestByWorkOrderId(Long workOrderId);
+    
+    // 删除处理记录
+    int deleteById(Long id);
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolAppIssueService.java

@@ -0,0 +1,30 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.patrol.entity.PatrolIssueReport; import com.water.patrol.mapper.PatrolIssueReportMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.math.BigDecimal; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolAppIssueService {
+    private final PatrolIssueReportMapper mapper;
+    public PatrolIssueReport submit(Long taskId, Long reporterId, String reporterName,
+            String issueType, String description, String photos, String videos,
+            BigDecimal lng, BigDecimal lat, String address, String severity) {
+        PatrolIssueReport r = new PatrolIssueReport();
+        r.setReportNo("PIR-"+System.currentTimeMillis()); r.setTaskId(taskId);
+        r.setReporterId(reporterId); r.setReporterName(reporterName);
+        r.setIssueType(issueType); r.setDescription(description);
+        r.setPhotos(photos); r.setVideos(videos);
+        r.setLng(lng); r.setLat(lat); r.setAddress(address);
+        r.setSeverity(severity != null ? severity : "medium");
+        r.setStatus("submitted");
+        mapper.insert(r); return r;
+    }
+    public Map<String, Object> myReports(Long reporterId) {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("reports", mapper.selectList(new LambdaQueryWrapper<PatrolIssueReport>().eq(PatrolIssueReport::getReporterId, reporterId).orderByDesc(PatrolIssueReport::getCreatedAt)));
+        r.put("totalCount", mapper.selectCount(new LambdaQueryWrapper<PatrolIssueReport>().eq(PatrolIssueReport::getReporterId, reporterId)));
+        return r;
+    }
+    public PatrolIssueReport getDetail(Long id) { return mapper.selectById(id); }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolAppProfileService.java

@@ -0,0 +1,23 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.patrol.entity.PatrolTask; import com.water.patrol.entity.PatrolWorkOrder;
+import com.water.patrol.mapper.PatrolTaskMapper; import com.water.patrol.mapper.PatrolWorkOrderMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolAppProfileService {
+    private final PatrolTaskMapper taskMapper;
+    private final PatrolWorkOrderMapper woMapper;
+    public Map<String, Object> getProfile(Long workerId) {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("workerId", workerId);
+        r.put("totalTasks", taskMapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId)));
+        r.put("completedTasks", taskMapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId).eq(PatrolTask::getStatus, "completed")));
+        r.put("totalDistance", 0);
+        r.put("totalWorkOrders", woMapper.selectCount(new LambdaQueryWrapper<PatrolWorkOrder>().eq(PatrolWorkOrder::getAssigneeId, workerId)));
+        r.put("resolvedWorkOrders", woMapper.selectCount(new LambdaQueryWrapper<PatrolWorkOrder>().eq(PatrolWorkOrder::getAssigneeId, workerId).eq(PatrolWorkOrder::getStatus, "resolved")));
+        r.put("reportedIssues", 0);
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolAppService.java

@@ -0,0 +1,399 @@
+package com.water.patrol.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+/**
+ * 巡查APP核心服务 - Issue #88
+ * PAT-21 APP总览, PAT-22 今日任务, PAT-23 待办工单, PAT-24 巡检统计,
+ * PAT-25 任务列表, PAT-26 工单列表, PAT-27 问题上报, PAT-28 个人中心, PAT-29 历史任务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PatrolAppService {
+
+    private final JdbcTemplate jdbc;
+
+    // ========== PAT-21 APP总览 ==========
+
+    /**
+     * APP总览：今日任务数、待办工单数、本月完成数、本月里程、异常上报数
+     */
+    public Map<String, Object> getAppOverview(Long userId) {
+        LocalDate today = LocalDate.now();
+        LocalDate monthStart = today.withDayOfMonth(1);
+
+        long todayTasks = countQuery(
+            "SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ? AND task_date = ?",
+            userId, today);
+
+        long pendingWorkOrders = countQuery(
+            "SELECT COUNT(*) FROM patrol_work_order WHERE assignee_id = ? AND status IN ('assigned','processing')",
+            userId);
+
+        long monthCompleted = countQuery(
+            "SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ? AND task_date >= ? AND status = 'completed'",
+            userId, monthStart);
+
+        Double monthDistance = jdbc.queryForObject(
+            "SELECT COALESCE(SUM(distance), 0) FROM patrol_task WHERE assignee_id = ? AND task_date >= ? AND status = 'completed'",
+            Double.class, userId, monthStart);
+
+        long monthIssues = countQuery(
+            "SELECT COUNT(*) FROM patrol_problem WHERE reporter_id = ? AND created_at >= ?",
+            userId, monthStart.atStartOfDay());
+
+        Map<String, Object> overview = new LinkedHashMap<>();
+        overview.put("todayTaskCount", todayTasks);
+        overview.put("pendingWorkOrderCount", pendingWorkOrders);
+        overview.put("monthCompletedCount", monthCompleted);
+        overview.put("monthDistance", monthDistance != null ? Math.round(monthDistance * 100.0) / 100.0 : 0.0);
+        overview.put("monthIssueCount", monthIssues);
+        return overview;
+    }
+
+    // ========== PAT-22 今日任务 ==========
+
+    /**
+     * 今日任务列表（含进度百分比、路线名称、预计时长）
+     */
+    public List<Map<String, Object>> getTodayTasks(Long userId) {
+        return jdbc.queryForList(
+            "SELECT pt.id, pt.task_name, pt.status, pt.task_date, pt.plan_start, pt.plan_end, " +
+            "  pr.route_name, pr.area, pr.estim_duration, " +
+            "  CASE WHEN pt.status = 'completed' THEN 100 " +
+            "       WHEN pt.status = 'in_progress' THEN " +
+            "         COALESCE(ROUND( " +
+            "           (SELECT COUNT(*)::NUMERIC FROM patrol_record WHERE task_id = pt.id) " +
+            "           / NULLIF((SELECT COUNT(*)::NUMERIC FROM patrol_route_checkpoint WHERE route_id = pt.route_id), 0) " +
+            "           * 100), 50) " +
+            "       ELSE 0 END AS progress_percent " +
+            "FROM patrol_task pt " +
+            "LEFT JOIN patrol_route pr ON pt.route_id = pr.id " +
+            "WHERE pt.assignee_id = ? AND pt.task_date = CURRENT_DATE " +
+            "ORDER BY pt.plan_start",
+            userId);
+    }
+
+    // ========== PAT-23 待办工单 ==========
+
+    /**
+     * 待办工单列表（assigned/processing状态）
+     */
+    public List<Map<String, Object>> getPendingWorkOrders(Long userId) {
+        return jdbc.queryForList(
+            "SELECT wo.id, wo.order_no, wo.issue_type, wo.description, wo.severity, " +
+            "  wo.location, wo.status, wo.created_at, wo.task_id " +
+            "FROM patrol_work_order wo " +
+            "WHERE wo.assignee_id = ? AND wo.status IN ('assigned','processing') " +
+            "ORDER BY wo.created_at DESC",
+            userId);
+    }
+
+    // ========== PAT-24 巡检统计 ==========
+
+    /**
+     * 个人巡检统计（period: week/month/year）
+     * 完成任务数、总里程、异常上报数、巡检时长
+     */
+    public Map<String, Object> getUserStats(Long userId, String period) {
+        LocalDate start;
+        LocalDate end = LocalDate.now();
+
+        switch (period != null ? period : "month") {
+            case "week":
+                start = end.minusDays(end.getDayOfWeek().getValue() - 1);
+                break;
+            case "year":
+                start = end.withDayOfYear(1);
+                break;
+            default:
+                start = end.withDayOfMonth(1);
+                break;
+        }
+
+        long completedTasks = countQuery(
+            "SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ? AND task_date BETWEEN ? AND ? AND status = 'completed'",
+            userId, start, end);
+
+        Double totalDistance = jdbc.queryForObject(
+            "SELECT COALESCE(SUM(distance), 0) FROM patrol_task WHERE assignee_id = ? AND task_date BETWEEN ? AND ? AND status = 'completed'",
+            Double.class, userId, start, end);
+
+        long issueCount = countQuery(
+            "SELECT COUNT(*) FROM patrol_problem WHERE reporter_id = ? AND created_at >= ? AND created_at < ?",
+            userId, start.atStartOfDay(), end.plusDays(1).atStartOfDay());
+
+        Double patrolHours = jdbc.queryForObject(
+            "SELECT COALESCE(SUM(EXTRACT(EPOCH FROM (actual_end - actual_start)) / 3600.0), 0) " +
+            "FROM patrol_task WHERE assignee_id = ? AND task_date BETWEEN ? AND ? AND status = 'completed' AND actual_start IS NOT NULL AND actual_end IS NOT NULL",
+            Double.class, userId, start, end);
+
+        Map<String, Object> stats = new LinkedHashMap<>();
+        stats.put("period", period != null ? period : "month");
+        stats.put("startDate", start.toString());
+        stats.put("endDate", end.toString());
+        stats.put("completedTasks", completedTasks);
+        stats.put("totalDistance", totalDistance != null ? Math.round(totalDistance * 100.0) / 100.0 : 0.0);
+        stats.put("issueCount", issueCount);
+        stats.put("patrolHours", patrolHours != null ? Math.round(patrolHours * 100.0) / 100.0 : 0.0);
+        return stats;
+    }
+
+    // ========== PAT-25 任务列表 ==========
+
+    /**
+     * 任务列表（支持按状态筛选，分页）
+     */
+    public Map<String, Object> getTaskList(Long userId, String status, int page, int size) {
+        StringBuilder sql = new StringBuilder(
+            "SELECT pt.id, pt.task_name, pt.status, pt.task_date, pt.plan_start, pt.plan_end, " +
+            "  pt.actual_start, pt.actual_end, pt.distance, pt.route_id, " +
+            "  pr.route_name, pr.area " +
+            "FROM patrol_task pt " +
+            "LEFT JOIN patrol_route pr ON pt.route_id = pr.id " +
+            "WHERE pt.assignee_id = ?");
+        List<Object> params = new ArrayList<>();
+        params.add(userId);
+
+        if (status != null && !status.isEmpty()) {
+            sql.append(" AND pt.status = ?");
+            params.add(status);
+        }
+        sql.append(" ORDER BY pt.task_date DESC, pt.plan_start DESC LIMIT ? OFFSET ?");
+        params.add(size);
+        params.add((page - 1) * size);
+
+        List<Map<String, Object>> records = jdbc.queryForList(sql.toString(), params.toArray());
+
+        StringBuilder countSql = new StringBuilder("SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ?");
+        List<Object> countParams = new ArrayList<>();
+        countParams.add(userId);
+        if (status != null && !status.isEmpty()) {
+            countSql.append(" AND status = ?");
+            countParams.add(status);
+        }
+        long total = countQuery(countSql.toString(), countParams.toArray());
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    // ========== PAT-26 工单列表 ==========
+
+    /**
+     * 工单列表（支持按状态筛选，分页）
+     */
+    public Map<String, Object> getWorkOrderList(Long userId, String status, int page, int size) {
+        StringBuilder sql = new StringBuilder(
+            "SELECT wo.id, wo.order_no, wo.issue_type, wo.description, wo.severity, " +
+            "  wo.location, wo.status, wo.created_at, wo.updated_at, wo.task_id " +
+            "FROM patrol_work_order wo " +
+            "WHERE wo.assignee_id = ?");
+        List<Object> params = new ArrayList<>();
+        params.add(userId);
+
+        if (status != null && !status.isEmpty()) {
+            sql.append(" AND wo.status = ?");
+            params.add(status);
+        }
+        sql.append(" ORDER BY wo.created_at DESC LIMIT ? OFFSET ?");
+        params.add(size);
+        params.add((page - 1) * size);
+
+        List<Map<String, Object>> records = jdbc.queryForList(sql.toString(), params.toArray());
+
+        StringBuilder countSql = new StringBuilder("SELECT COUNT(*) FROM patrol_work_order WHERE assignee_id = ?");
+        List<Object> countParams = new ArrayList<>();
+        countParams.add(userId);
+        if (status != null && !status.isEmpty()) {
+            countSql.append(" AND status = ?");
+            countParams.add(status);
+        }
+        long total = countQuery(countSql.toString(), countParams.toArray());
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    // ========== PAT-27 问题上报 ==========
+
+    /**
+     * 问题上报：文字描述 + 照片URL列表 + 语音URL + GPS坐标
+     * 自动创建巡检问题记录 + 工单
+     */
+    public Map<String, Object> reportIssue(Long taskId, Long deviceId, String issueType,
+                                            String description, List<String> photoUrls,
+                                            String voiceUrl, Double lng, Double lat) {
+        log.info("APP问题上报: taskId={}, type={}, desc={}", taskId, issueType, description);
+
+        String problemNo = "PAT-" + System.currentTimeMillis();
+
+        // 1. 创建巡检问题记录
+        jdbc.update(
+            "INSERT INTO patrol_problem (problem_no, task_id, device_id, reporter_id, " +
+            "  issue_type, description, photo_urls, voice_url, gps_lng, gps_lat, status, created_at) " +
+            "SELECT ?, ?, ?, assignee_id, ?, ?, ?::jsonb, ?, ?, ?, 'reported', NOW() " +
+            "FROM patrol_task WHERE id = ?",
+            problemNo, taskId, deviceId,
+            issueType, description,
+            photoUrls != null ? photoUrls.toString() : "[]",
+            voiceUrl, lng, lat, taskId);
+
+        // 2. 自动创建工单
+        String orderNo = "PWO-" + System.currentTimeMillis();
+        jdbc.update(
+            "INSERT INTO patrol_work_order (order_no, task_id, issue_type, description, severity, " +
+            "  location, lng, lat, status, created_at) " +
+            "VALUES (?, ?, ?, ?, 'medium', ?, ?, ?, 'pending', NOW())",
+            orderNo, taskId, issueType, description,
+            description.length() > 50 ? description.substring(0, 50) : description,
+            lng, lat);
+
+        // 3. 关联工单到问题
+        jdbc.update(
+            "UPDATE patrol_problem SET work_order_id = (SELECT id FROM patrol_work_order WHERE order_no = ? LIMIT 1) " +
+            "WHERE problem_no = ?",
+            orderNo, problemNo);
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("problemNo", problemNo);
+        result.put("orderNo", orderNo);
+        result.put("issueType", issueType);
+        result.put("reported", true);
+        result.put("photoCount", photoUrls != null ? photoUrls.size() : 0);
+        result.put("hasVoice", voiceUrl != null && !voiceUrl.isEmpty());
+        return result;
+    }
+
+    // ========== PAT-28 个人中心 ==========
+
+    /**
+     * 个人信息（姓名、工号、部门、累计里程、累计任务数）
+     */
+    public Map<String, Object> getProfile(Long userId) {
+        // 用户基本信息
+        Map<String, Object> user = jdbc.queryForMap(
+            "SELECT id, username, real_name, employee_no, department, phone, email, avatar " +
+            "FROM sys_user WHERE id = ?",
+            userId);
+
+        // 累计里程
+        Double totalDistance = jdbc.queryForObject(
+            "SELECT COALESCE(SUM(distance), 0) FROM patrol_task WHERE assignee_id = ? AND status = 'completed'",
+            Double.class, userId);
+
+        // 累计任务数
+        long totalTasks = countQuery(
+            "SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ? AND status = 'completed'",
+            userId);
+
+        // 本月统计
+        LocalDate monthStart = LocalDate.now().withDayOfMonth(1);
+        long monthTasks = countQuery(
+            "SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ? AND task_date >= ? AND status = 'completed'",
+            userId, monthStart);
+
+        Map<String, Object> profile = new LinkedHashMap<>();
+        profile.put("userId", user.get("id"));
+        profile.put("username", user.get("username"));
+        profile.put("realName", user.get("real_name"));
+        profile.put("employeeNo", user.get("employee_no"));
+        profile.put("department", user.get("department"));
+        profile.put("phone", user.get("phone"));
+        profile.put("email", user.get("email"));
+        profile.put("avatar", user.get("avatar"));
+        profile.put("totalDistance", totalDistance != null ? Math.round(totalDistance * 100.0) / 100.0 : 0.0);
+        profile.put("totalTaskCount", totalTasks);
+        profile.put("monthTaskCount", monthTasks);
+        return profile;
+    }
+
+    /**
+     * 更新头像
+     */
+    public Map<String, Object> updateAvatar(Long userId, String avatarUrl) {
+        jdbc.update("UPDATE sys_user SET avatar = ?, updated_at = NOW() WHERE id = ?", avatarUrl, userId);
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("userId", userId);
+        result.put("avatar", avatarUrl);
+        result.put("updated", true);
+        return result;
+    }
+
+    // ========== PAT-29 历史任务 ==========
+
+    /**
+     * 历史任务列表（按日期范围筛选，分页）
+     */
+    public Map<String, Object> getHistoryTasks(Long userId, String startDate, String endDate,
+                                                int page, int size) {
+        StringBuilder sql = new StringBuilder(
+            "SELECT pt.id, pt.task_name, pt.status, pt.task_date, pt.plan_start, pt.plan_end, " +
+            "  pt.actual_start, pt.actual_end, pt.distance, " +
+            "  pr.route_name, pr.area " +
+            "FROM patrol_task pt " +
+            "LEFT JOIN patrol_route pr ON pt.route_id = pr.id " +
+            "WHERE pt.assignee_id = ? AND pt.status = 'completed'");
+        List<Object> params = new ArrayList<>();
+        params.add(userId);
+
+        if (startDate != null && !startDate.isEmpty()) {
+            sql.append(" AND pt.task_date >= ?::DATE");
+            params.add(startDate);
+        }
+        if (endDate != null && !endDate.isEmpty()) {
+            sql.append(" AND pt.task_date <= ?::DATE");
+            params.add(endDate);
+        }
+        sql.append(" ORDER BY pt.task_date DESC, pt.actual_end DESC LIMIT ? OFFSET ?");
+        params.add(size);
+        params.add((page - 1) * size);
+
+        List<Map<String, Object>> records = jdbc.queryForList(sql.toString(), params.toArray());
+
+        StringBuilder countSql = new StringBuilder(
+            "SELECT COUNT(*) FROM patrol_task WHERE assignee_id = ? AND status = 'completed'");
+        List<Object> countParams = new ArrayList<>();
+        countParams.add(userId);
+        if (startDate != null && !startDate.isEmpty()) {
+            countSql.append(" AND task_date >= ?::DATE");
+            countParams.add(startDate);
+        }
+        if (endDate != null && !endDate.isEmpty()) {
+            countSql.append(" AND task_date <= ?::DATE");
+            countParams.add(endDate);
+        }
+        long total = countQuery(countSql.toString(), countParams.toArray());
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    // ========== 工具方法 ==========
+
+    private long countQuery(String sql, Object... args) {
+        Long count = jdbc.queryForObject(sql, Long.class, args);
+        return count != null ? count : 0;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolAppTaskService.java

@@ -0,0 +1,42 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.patrol.entity.PatrolTask; import com.water.patrol.mapper.PatrolTaskMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolAppTaskService {
+    private final PatrolTaskMapper mapper;
+    public Map<String, Object> myTasks(Long workerId, String status) {
+        LambdaQueryWrapper<PatrolTask> w = new LambdaQueryWrapper<>();
+        w.eq(PatrolTask::getWorkerId, workerId);
+        if (status != null && !status.isEmpty()) w.eq(PatrolTask::getStatus, status);
+        w.orderByDesc(PatrolTask::getCreatedAt);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("tasks", mapper.selectList(w));
+        r.put("totalCount", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId)));
+        r.put("pendingCount", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId).eq(PatrolTask::getStatus, "pending")));
+        r.put("inProgressCount", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId).eq(PatrolTask::getStatus, "in_progress")));
+        return r;
+    }
+    public PatrolTask getDetail(Long id) { return mapper.selectById(id); }
+    public void accept(Long id) {
+        PatrolTask t = mapper.selectById(id);
+        if (t == null) throw new RuntimeException("任务不存在");
+        t.setStatus("in_progress"); t.setStartTime(LocalDateTime.now()); mapper.updateById(t);
+    }
+    public void complete(Long id, Integer cc, Double dist, String remark) {
+        PatrolTask t = mapper.selectById(id);
+        if (t == null) throw new RuntimeException("任务不存在");
+        t.setStatus("completed"); t.setEndTime(LocalDateTime.now());
+        t.setCompletedCheckpoints(cc); t.setDistance(dist); t.setRemark(remark);
+        mapper.updateById(t);
+    }
+    public Map<String, Object> myStats(Long workerId) {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("total", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId)));
+        r.put("completed", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getWorkerId, workerId).eq(PatrolTask::getStatus, "completed")));
+        r.put("totalDistance", 0);
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolAppWorkOrderService.java

@@ -0,0 +1,36 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.patrol.entity.PatrolWorkOrder; import com.water.patrol.mapper.PatrolWorkOrderMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolAppWorkOrderService {
+    private final PatrolWorkOrderMapper mapper;
+    public Map<String, Object> myWorkOrders(Long assigneeId, String status) {
+        LambdaQueryWrapper<PatrolWorkOrder> w = new LambdaQueryWrapper<>();
+        w.eq(PatrolWorkOrder::getAssigneeId, assigneeId);
+        if (status != null && !status.isEmpty()) w.eq(PatrolWorkOrder::getStatus, status);
+        w.orderByDesc(PatrolWorkOrder::getCreatedAt);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("workOrders", mapper.selectList(w));
+        r.put("totalCount", mapper.selectCount(new LambdaQueryWrapper<PatrolWorkOrder>().eq(PatrolWorkOrder::getAssigneeId, assigneeId)));
+        r.put("pendingCount", mapper.selectCount(new LambdaQueryWrapper<PatrolWorkOrder>().eq(PatrolWorkOrder::getAssigneeId, assigneeId).eq(PatrolWorkOrder::getStatus, "assigned")));
+        r.put("inProgressCount", mapper.selectCount(new LambdaQueryWrapper<PatrolWorkOrder>().eq(PatrolWorkOrder::getAssigneeId, assigneeId).eq(PatrolWorkOrder::getStatus, "in_progress")));
+        return r;
+    }
+    public PatrolWorkOrder getDetail(Long id) { return mapper.selectById(id); }
+    public void accept(Long id) {
+        PatrolWorkOrder wo = mapper.selectById(id);
+        if (wo == null) throw new RuntimeException("工单不存在");
+        wo.setStatus("in_progress"); mapper.updateById(wo);
+    }
+    public void resolve(Long id, String resolution, String resultPhotos) {
+        PatrolWorkOrder wo = mapper.selectById(id);
+        if (wo == null) throw new RuntimeException("工单不存在");
+        wo.setStatus("resolved"); wo.setResolution(resolution);
+        wo.setResolvedAt(LocalDateTime.now());
+        if (resultPhotos != null) wo.setPhotos(resultPhotos);
+        mapper.updateById(wo);
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolAreaService.java

@@ -0,0 +1,53 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.patrol.entity.PatrolArea; import com.water.patrol.mapper.PatrolAreaMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.math.BigDecimal; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolAreaService {
+    private final PatrolAreaMapper mapper;
+    public PatrolArea create(String areaName, String areaCode, String desc, BigDecimal cLng, BigDecimal cLat, String boundary, Double radius) {
+        PatrolArea a = new PatrolArea(); a.setAreaName(areaName); a.setAreaCode(areaCode);
+        a.setDescription(desc); a.setCenterLng(cLng); a.setCenterLat(cLat);
+        a.setBoundary(boundary); a.setRadius(radius); a.setStatus("active");
+        mapper.insert(a); return a;
+    }
+    public PatrolArea update(Long id, PatrolArea patch) {
+        PatrolArea a = mapper.selectById(id);
+        if (a == null) throw new RuntimeException("区域不存在: "+id);
+        if (patch.getAreaName() != null) a.setAreaName(patch.getAreaName());
+        if (patch.getDescription() != null) a.setDescription(patch.getDescription());
+        if (patch.getCenterLng() != null) a.setCenterLng(patch.getCenterLng());
+        if (patch.getCenterLat() != null) a.setCenterLat(patch.getCenterLat());
+        if (patch.getBoundary() != null) a.setBoundary(patch.getBoundary());
+        if (patch.getRadius() != null) a.setRadius(patch.getRadius());
+        mapper.updateById(a); return a;
+    }
+    public void delete(Long id) { mapper.deleteById(id); }
+    public PatrolArea getDetail(Long id) { return mapper.selectById(id); }
+    public Map<String, Object> list(String keyword, String status, int page, int size) {
+        LambdaQueryWrapper<PatrolArea> w = new LambdaQueryWrapper<>();
+        if (keyword != null && !keyword.isEmpty()) w.and(q -> q.like(PatrolArea::getAreaName, keyword).or().like(PatrolArea::getAreaCode, keyword));
+        if (status != null && !status.isEmpty()) w.eq(PatrolArea::getStatus, status);
+        w.orderByDesc(PatrolArea::getCreatedAt);
+        Page<PatrolArea> p = mapper.selectPage(new Page<>(page, size), w);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("records", p.getRecords()); r.put("total", p.getTotal());
+        r.put("page", page); r.put("size", size);
+        return r;
+    }
+    public void updateStatus(Long id, String status) {
+        PatrolArea a = mapper.selectById(id);
+        if (a == null) throw new RuntimeException("区域不存在: "+id);
+        a.setStatus(status); mapper.updateById(a);
+    }
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("total", mapper.selectCount(null));
+        r.put("active", mapper.selectCount(new LambdaQueryWrapper<PatrolArea>().eq(PatrolArea::getStatus,"active")));
+        r.put("inactive", mapper.selectCount(new LambdaQueryWrapper<PatrolArea>().eq(PatrolArea::getStatus,"inactive")));
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolCoreService.java

@@ -0,0 +1,252 @@
+package com.water.patrol.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+
+/**
+ * 巡检管理核心服务 - Issue #86
+ * PAT-01 总览, PAT-02 轨迹, PAT-03 任务台账, PAT-04 设备台账
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PatrolCoreService {
+
+    private final JdbcTemplate jdbc;
+
+    // ========== PAT-01 巡检总览 ==========
+
+    public Map<String, Object> getOverview() {
+        LocalDate today = LocalDate.now();
+        LocalDate monthStart = today.withDayOfMonth(1);
+
+        long todayTotal = countQuery("SELECT COUNT(*) FROM patrol_task WHERE task_date = ?", today);
+        long todayCompleted = countQuery("SELECT COUNT(*) FROM patrol_task WHERE task_date = ? AND status = 'completed'", today);
+        long monthTotal = countQuery("SELECT COUNT(*) FROM patrol_task WHERE task_date >= ?", monthStart);
+        long monthCompleted = countQuery("SELECT COUNT(*) FROM patrol_task WHERE task_date >= ? AND status = 'completed'", monthStart);
+
+        long pendingIssues = countQuery("SELECT COUNT(*) FROM patrol_work_order WHERE status IN ('pending','assigned','processing')");
+        long resolvedIssues = countQuery("SELECT COUNT(*) FROM patrol_work_order WHERE status = 'resolved'");
+
+        long coverageRate = monthTotal > 0 ? Math.round(monthCompleted * 100.0 / monthTotal) : 0;
+
+        Map<String, Object> overview = new LinkedHashMap<>();
+        overview.put("todayTotal", todayTotal);
+        overview.put("todayCompleted", todayCompleted);
+        overview.put("monthTotal", monthTotal);
+        overview.put("monthCompleted", monthCompleted);
+        overview.put("coverageRate", coverageRate);
+        overview.put("pendingIssues", pendingIssues);
+        overview.put("resolvedIssues", resolvedIssues);
+        return overview;
+    }
+
+    public List<Map<String, Object>> getTodayTasks() {
+        return jdbc.queryForList(
+            "SELECT pt.*, pr.route_name, pr.area FROM patrol_task pt " +
+            "LEFT JOIN patrol_route pr ON pt.route_id = pr.id " +
+            "WHERE pt.task_date = CURRENT_DATE ORDER BY pt.plan_start");
+    }
+
+    public List<Map<String, Object>> getRecentIssues(int limit) {
+        return jdbc.queryForList(
+            "SELECT * FROM patrol_work_order ORDER BY created_at DESC LIMIT ?", limit);
+    }
+
+    // ========== PAT-02 任务轨迹（GPS记录与回放） ==========
+
+    public Map<String, Object> recordTrackPoint(Long taskId, Long workerId,
+                                                 double lng, double lat,
+                                                 double speed, double accuracy) {
+        jdbc.update(
+            "INSERT INTO patrol_track_point (task_id, worker_id, lng, lat, speed, accuracy) " +
+            "VALUES (?,?,?,?,?,?)",
+            taskId, workerId, lng, lat, speed, accuracy);
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("taskId", taskId);
+        result.put("workerId", workerId);
+        result.put("lng", lng);
+        result.put("lat", lat);
+        result.put("recorded", true);
+        return result;
+    }
+
+    public List<Map<String, Object>> getTrack(Long taskId) {
+        return jdbc.queryForList(
+            "SELECT * FROM patrol_track_point WHERE task_id = ? ORDER BY recorded_at", taskId);
+    }
+
+    public Map<String, Object> replayTrack(Long taskId) {
+        List<Map<String, Object>> points = getTrack(taskId);
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("taskId", taskId);
+        result.put("points", points);
+        result.put("totalPoints", points.size());
+        if (!points.isEmpty()) {
+            result.put("startTime", points.get(0).get("recorded_at"));
+            result.put("endTime", points.get(points.size() - 1).get("recorded_at"));
+        }
+        return result;
+    }
+
+    public Map<String, Object> getTrackStats(Long taskId) {
+        List<Map<String, Object>> points = getTrack(taskId);
+        Map<String, Object> stats = new LinkedHashMap<>();
+        stats.put("taskId", taskId);
+        stats.put("totalPoints", points.size());
+
+        if (points.size() < 2) {
+            stats.put("totalDistance", 0.0);
+            stats.put("duration", 0);
+            stats.put("avgSpeed", 0.0);
+            return stats;
+        }
+
+        double totalDistance = 0;
+        for (int i = 1; i < points.size(); i++) {
+            double lat1 = ((Number) points.get(i - 1).get("lat")).doubleValue();
+            double lon1 = ((Number) points.get(i - 1).get("lng")).doubleValue();
+            double lat2 = ((Number) points.get(i).get("lat")).doubleValue();
+            double lon2 = ((Number) points.get(i).get("lng")).doubleValue();
+            totalDistance += haversine(lat1, lon1, lat2, lon2);
+        }
+
+        double avgSpeed = points.stream()
+            .filter(p -> p.get("speed") != null)
+            .mapToDouble(p -> ((Number) p.get("speed")).doubleValue())
+            .average().orElse(0);
+
+        stats.put("totalDistance", Math.round(totalDistance * 100.0) / 100.0);
+        stats.put("avgSpeed", Math.round(avgSpeed * 100.0) / 100.0);
+        return stats;
+    }
+
+    // ========== PAT-03 任务台账 ==========
+
+    public Map<String, Object> getTaskLedger(String status, Long workerId, int page, int size) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM patrol_task WHERE 1=1");
+        List<Object> params = new ArrayList<>();
+        if (status != null && !status.isEmpty()) {
+            sql.append(" AND status = ?");
+            params.add(status);
+        }
+        if (workerId != null) {
+            sql.append(" AND assignee_id = ?");
+            params.add(workerId);
+        }
+        sql.append(" ORDER BY task_date DESC LIMIT ? OFFSET ?");
+        params.add(size);
+        params.add((page - 1) * size);
+
+        List<Map<String, Object>> records = jdbc.queryForList(sql.toString(), params.toArray());
+
+        StringBuilder countSql = new StringBuilder("SELECT COUNT(*) FROM patrol_task WHERE 1=1");
+        List<Object> countParams = new ArrayList<>();
+        if (status != null && !status.isEmpty()) {
+            countSql.append(" AND status = ?");
+            countParams.add(status);
+        }
+        if (workerId != null) {
+            countSql.append(" AND assignee_id = ?");
+            countParams.add(workerId);
+        }
+        long total = countQuery(countSql.toString(), countParams.toArray());
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    // ========== PAT-04 设备台账 ==========
+
+    public Map<String, Object> getDeviceLedger(String deviceType, String status, String area,
+                                                int page, int size) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM patrol_device WHERE 1=1");
+        List<Object> params = new ArrayList<>();
+        if (deviceType != null && !deviceType.isEmpty()) {
+            sql.append(" AND device_type = ?");
+            params.add(deviceType);
+        }
+        if (status != null && !status.isEmpty()) {
+            sql.append(" AND status = ?");
+            params.add(status);
+        }
+        if (area != null && !area.isEmpty()) {
+            sql.append(" AND area = ?");
+            params.add(area);
+        }
+        sql.append(" ORDER BY created_at DESC LIMIT ? OFFSET ?");
+        params.add(size);
+        params.add((page - 1) * size);
+
+        List<Map<String, Object>> records = jdbc.queryForList(sql.toString(), params.toArray());
+
+        StringBuilder countSql = new StringBuilder("SELECT COUNT(*) FROM patrol_device WHERE 1=1");
+        List<Object> countParams = new ArrayList<>();
+        if (deviceType != null && !deviceType.isEmpty()) {
+            countSql.append(" AND device_type = ?");
+            countParams.add(deviceType);
+        }
+        if (status != null && !status.isEmpty()) {
+            countSql.append(" AND status = ?");
+            countParams.add(status);
+        }
+        if (area != null && !area.isEmpty()) {
+            countSql.append(" AND area = ?");
+            countParams.add(area);
+        }
+        long total = countQuery(countSql.toString(), countParams.toArray());
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    public Map<String, Object> createDevice(String deviceNo, String deviceName, String deviceType,
+                                             String location, double lng, double lat, String area) {
+        jdbc.update(
+            "INSERT INTO patrol_device (device_no, device_name, device_type, location, lng, lat, area) " +
+            "VALUES (?,?,?,?,?,?,?)",
+            deviceNo, deviceName, deviceType, location, lng, lat, area);
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("deviceNo", deviceNo);
+        result.put("deviceName", deviceName);
+        result.put("created", true);
+        return result;
+    }
+
+    public Map<String, Object> updateDeviceStatus(Long deviceId, String status) {
+        jdbc.update("UPDATE patrol_device SET status = ?, updated_at = NOW() WHERE id = ?",
+            status, deviceId);
+        return Map.of("deviceId", deviceId, "status", status, "updated", true);
+    }
+
+    // ========== 工具方法 ==========
+
+    private long countQuery(String sql, Object... args) {
+        Long count = jdbc.queryForObject(sql, Long.class, args);
+        return count != null ? count : 0;
+    }
+
+    private double haversine(double lat1, double lon1, double lat2, double lon2) {
+        double R = 6371;
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+            + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+            * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolDeviceService.java

@@ -0,0 +1,106 @@
+package com.water.patrol.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.patrol.entity.PatrolDevice;
+import com.water.patrol.mapper.PatrolDeviceMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PatrolDeviceService {
+    private final PatrolDeviceMapper deviceMapper;
+
+    public PatrolDevice create(String deviceNo, String deviceName, String deviceType,
+            String location, BigDecimal lng, BigDecimal lat) {
+        PatrolDevice d = new PatrolDevice();
+        d.setDeviceNo(deviceNo);
+        d.setDeviceName(deviceName);
+        d.setDeviceType(deviceType);
+        d.setLocation(location);
+        d.setLng(lng);
+        d.setLat(lat);
+        d.setStatus("normal");
+        d.setCreatedAt(LocalDateTime.now());
+        d.setUpdatedAt(LocalDateTime.now());
+        deviceMapper.insert(d);
+        log.info("Device created: {}", deviceNo);
+        return d;
+    }
+
+    public Map<String, Object> list(String deviceType, String status, String keyword,
+            int page, int size) {
+        LambdaQueryWrapper<PatrolDevice> w = new LambdaQueryWrapper<>();
+        if (deviceType != null && !deviceType.isEmpty()) w.eq(PatrolDevice::getDeviceType, deviceType);
+        if (status != null && !status.isEmpty()) w.eq(PatrolDevice::getStatus, status);
+        if (keyword != null && !keyword.isEmpty()) {
+            w.and(q -> q.like(PatrolDevice::getDeviceName, keyword)
+                .or().like(PatrolDevice::getDeviceNo, keyword)
+                .or().like(PatrolDevice::getLocation, keyword));
+        }
+        w.orderByDesc(PatrolDevice::getCreatedAt);
+
+        Long total = deviceMapper.selectCount(w);
+        w.last("LIMIT " + size + " OFFSET " + ((page - 1) * size));
+        List<PatrolDevice> records = deviceMapper.selectList(w);
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    public PatrolDevice getDetail(Long id) {
+        return deviceMapper.selectById(id);
+    }
+
+    public void updateStatus(Long id, String status) {
+        PatrolDevice d = deviceMapper.selectById(id);
+        if (d == null) throw new RuntimeException("Device not found: " + id);
+        d.setStatus(status);
+        d.setUpdatedAt(LocalDateTime.now());
+        deviceMapper.updateById(d);
+        log.info("Device {} status -> {}", id, status);
+    }
+
+    public void recordMaintenance(Long id) {
+        PatrolDevice d = deviceMapper.selectById(id);
+        if (d == null) throw new RuntimeException("Device not found: " + id);
+        d.setLastMaintenanceDate(LocalDate.now());
+        d.setNextMaintenanceDate(LocalDate.now().plusMonths(6));
+        d.setStatus("normal");
+        d.setUpdatedAt(LocalDateTime.now());
+        deviceMapper.updateById(d);
+        log.info("Maintenance recorded for device {}", id);
+    }
+
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        Long total = deviceMapper.selectCount(new LambdaQueryWrapper<>());
+        r.put("total", total);
+
+        LambdaQueryWrapper<PatrolDevice> normal = new LambdaQueryWrapper<PatrolDevice>().eq(PatrolDevice::getStatus, "normal");
+        r.put("normal", deviceMapper.selectCount(normal));
+
+        LambdaQueryWrapper<PatrolDevice> fault = new LambdaQueryWrapper<PatrolDevice>().eq(PatrolDevice::getStatus, "fault");
+        r.put("fault", deviceMapper.selectCount(fault));
+
+        LambdaQueryWrapper<PatrolDevice> offline = new LambdaQueryWrapper<PatrolDevice>().eq(PatrolDevice::getStatus, "offline");
+        r.put("offline", deviceMapper.selectCount(offline));
+
+        return r;
+    }
+
+    public void delete(Long id) {
+        deviceMapper.deleteById(id);
+        log.info("Device deleted: {}", id);
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolFormService.java

@@ -0,0 +1,45 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.patrol.entity.PatrolForm; import com.water.patrol.mapper.PatrolFormMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolFormService {
+    private final PatrolFormMapper mapper;
+    public PatrolForm create(String formName, String formCode, String formType, String fieldConfig) {
+        PatrolForm f = new PatrolForm(); f.setFormName(formName); f.setFormCode(formCode);
+        f.setFormType(formType); f.setFieldConfig(fieldConfig); f.setStatus("active");
+        mapper.insert(f); return f;
+    }
+    public PatrolForm update(Long id, PatrolForm patch) {
+        PatrolForm f = mapper.selectById(id);
+        if (f == null) throw new RuntimeException("表单不存在: "+id);
+        if (patch.getFormName() != null) f.setFormName(patch.getFormName());
+        if (patch.getFieldConfig() != null) f.setFieldConfig(patch.getFieldConfig());
+        if (patch.getFormType() != null) f.setFormType(patch.getFormType());
+        if (patch.getRemark() != null) f.setRemark(patch.getRemark());
+        mapper.updateById(f); return f;
+    }
+    public void delete(Long id) { mapper.deleteById(id); }
+    public PatrolForm getDetail(Long id) { return mapper.selectById(id); }
+    public Map<String, Object> list(String keyword, String formType, String status, int page, int size) {
+        LambdaQueryWrapper<PatrolForm> w = new LambdaQueryWrapper<>();
+        if (keyword != null && !keyword.isEmpty()) w.and(q -> q.like(PatrolForm::getFormName, keyword).or().like(PatrolForm::getFormCode, keyword));
+        if (formType != null && !formType.isEmpty()) w.eq(PatrolForm::getFormType, formType);
+        if (status != null && !status.isEmpty()) w.eq(PatrolForm::getStatus, status);
+        w.orderByDesc(PatrolForm::getCreatedAt);
+        Page<PatrolForm> p = mapper.selectPage(new Page<>(page, size), w);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("records", p.getRecords()); r.put("total", p.getTotal());
+        r.put("page", page); r.put("size", size);
+        return r;
+    }
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("total", mapper.selectCount(null));
+        r.put("active", mapper.selectCount(new LambdaQueryWrapper<PatrolForm>().eq(PatrolForm::getStatus,"active")));
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolLedgerService.java

@@ -0,0 +1,50 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.patrol.entity.PatrolTask; import com.water.patrol.mapper.PatrolTaskMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolLedgerService {
+    private final PatrolTaskMapper mapper;
+    public Map<String, Object> listTasks(String status, String workerName, String startDate, String endDate, int page, int size) {
+        LambdaQueryWrapper<PatrolTask> w = new LambdaQueryWrapper<>();
+        if (status != null && !status.isEmpty()) w.eq(PatrolTask::getStatus, status);
+        if (workerName != null && !workerName.isEmpty()) w.like(PatrolTask::getWorkerName, workerName);
+        if (startDate != null && !startDate.isEmpty()) w.ge(PatrolTask::getCreatedAt, startDate+"T00:00:00");
+        if (endDate != null && !endDate.isEmpty()) w.le(PatrolTask::getCreatedAt, endDate+"T23:59:59");
+        w.orderByDesc(PatrolTask::getCreatedAt);
+        Page<PatrolTask> p = mapper.selectPage(new Page<>(page, size), w);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("records", p.getRecords()); r.put("total", p.getTotal());
+        r.put("page", page); r.put("size", size); r.put("pages", p.getPages());
+        return r;
+    }
+    public PatrolTask getDetail(Long id) { return mapper.selectById(id); }
+    public PatrolTask createTask(String taskName, Long routeId, Long workerId, String workerName) {
+        PatrolTask t = new PatrolTask(); t.setTaskNo("PAT-"+System.currentTimeMillis());
+        t.setTaskName(taskName); t.setRouteId(routeId); t.setWorkerId(workerId); t.setWorkerName(workerName);
+        t.setStatus("pending"); t.setCheckpoints(0); t.setCompletedCheckpoints(0);
+        t.setAbnormalCount(0); t.setDistance(0.0); mapper.insert(t); return t;
+    }
+    public void startTask(Long id) {
+        PatrolTask t = mapper.selectById(id);
+        if (t == null) throw new RuntimeException("任务不存在: "+id);
+        t.setStatus("in_progress"); t.setStartTime(LocalDateTime.now()); mapper.updateById(t);
+    }
+    public void completeTask(Long id, Integer cc, Double dist) {
+        PatrolTask t = mapper.selectById(id);
+        if (t == null) throw new RuntimeException("任务不存在: "+id);
+        t.setStatus("completed"); t.setEndTime(LocalDateTime.now());
+        t.setCompletedCheckpoints(cc); t.setDistance(dist); mapper.updateById(t);
+    }
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("total", mapper.selectCount(null));
+        r.put("completed", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getStatus,"completed")));
+        r.put("inProgress", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getStatus,"in_progress")));
+        r.put("pending", mapper.selectCount(new LambdaQueryWrapper<PatrolTask>().eq(PatrolTask::getStatus,"pending")));
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolOverviewService.java

@@ -0,0 +1,30 @@
+package com.water.patrol.service;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service;
+import java.time.LocalDate; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolOverviewService {
+    private final JdbcTemplate jdbc;
+    public Map<String, Object> getOverview() {
+        LocalDate today = LocalDate.now();
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("todayTasks", jdbc.queryForObject("SELECT COUNT(*) FROM pat_task WHERE DATE(created_at)=?", Integer.class, today));
+        r.put("completedTasks", jdbc.queryForObject("SELECT COUNT(*) FROM pat_task WHERE DATE(created_at)=? AND status='completed'", Integer.class, today));
+        int t = (Integer) r.get("todayTasks"), c = (Integer) r.get("completedTasks");
+        r.put("completionRate", t > 0 ? Math.round(c * 100.0 / t) : 0);
+        r.put("abnormalCount", jdbc.queryForObject("SELECT COUNT(*) FROM pat_work_order WHERE DATE(created_at)=? AND status!='closed'", Integer.class, today));
+        r.put("onlineWorkers", jdbc.queryForObject("SELECT COUNT(DISTINCT worker_id) FROM pat_task WHERE status='in_progress'", Integer.class));
+        r.put("monthDistance", jdbc.queryForObject("SELECT COALESCE(SUM(distance),0) FROM pat_task WHERE DATE_PART('month',created_at)=DATE_PART('month',?::date)", Double.class, today.toString()));
+        r.put("pendingOrders", jdbc.queryForObject("SELECT COUNT(*) FROM pat_work_order WHERE status IN ('pending','assigned')", Integer.class));
+        return r;
+    }
+    public Map<String, Object> getMonthlyStats(int year, int month) {
+        String s = String.format("%d-%02d-01", year, month), e = String.format("%d-%02d-31", year, month);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("totalTasks", jdbc.queryForObject("SELECT COUNT(*) FROM pat_task WHERE created_at BETWEEN ?::date AND ?::date", Integer.class, s, e));
+        r.put("completedTasks", jdbc.queryForObject("SELECT COUNT(*) FROM pat_task WHERE created_at BETWEEN ?::date AND ?::date AND status='completed'", Integer.class, s, e));
+        r.put("totalDistance", jdbc.queryForObject("SELECT COALESCE(SUM(distance),0) FROM pat_task WHERE created_at BETWEEN ?::date AND ?::date", Double.class, s, e));
+        r.put("totalAbnormals", jdbc.queryForObject("SELECT COUNT(*) FROM pat_work_order WHERE created_at BETWEEN ?::date AND ?::date", Integer.class, s, e));
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolProblemService.java

@@ -0,0 +1,82 @@
+package com.water.patrol.service;
+
+import com.water.patrol.entity.PatrolProblem;
+import java.util.List;
+
+public interface PatrolProblemService {
+    
+    /**
+     * 创建巡检问题
+     */
+    PatrolProblem createProblem(PatrolProblem patrolProblem);
+    
+    /**
+     * 根据ID查询问题
+     */
+    PatrolProblem getProblemById(Long id);
+    
+    /**
+     * 根据问题编号查询
+     */
+    PatrolProblem getProblemByProblemNo(String problemNo);
+    
+    /**
+     * 根据任务ID查询问题列表
+     */
+    List<PatrolProblem> getProblemsByTaskId(Long taskId);
+    
+    /**
+     * 根据状态查询问题列表
+     */
+    List<PatrolProblem> getProblemsByStatus(String status);
+    
+    /**
+     * 根据设备ID查询问题列表
+     */
+    List<PatrolProblem> getProblemsByDeviceId(Long deviceId);
+    
+    /**
+     * 更新问题信息
+     */
+    PatrolProblem updateProblem(PatrolProblem patrolProblem);
+    
+    /**
+     * 更新问题状态
+     */
+    boolean updateProblemStatus(Long id, String status, Long workOrderId);
+    
+    /**
+     * 删除问题
+     */
+    boolean deleteProblem(Long id);
+    
+    /**
+     * 自动创建工单
+     */
+    boolean autoCreateWorkOrder(Long problemId);
+    
+    /**
+     * 获取问题统计信息
+     */
+    ProblemStatistics getProblemStatistics();
+    
+    class ProblemStatistics {
+        private int totalProblems;
+        private int reportedCount;
+        private int processingCount;
+        private int completedCount;
+        private int closedCount;
+        
+        // Getters and setters
+        public int getTotalProblems() { return totalProblems; }
+        public void setTotalProblems(int totalProblems) { this.totalProblems = totalProblems; }
+        public int getReportedCount() { return reportedCount; }
+        public void setReportedCount(int reportedCount) { this.reportedCount = reportedCount; }
+        public int getProcessingCount() { return processingCount; }
+        public void setProcessingCount(int processingCount) { this.processingCount = processingCount; }
+        public int getCompletedCount() { return completedCount; }
+        public void setCompletedCount(int completedCount) { this.completedCount = completedCount; }
+        public int getClosedCount() { return closedCount; }
+        public void setClosedCount(int closedCount) { this.closedCount = closedCount; }
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolRouteSetupService.java

@@ -0,0 +1,55 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.patrol.entity.PatrolRouteSetup; import com.water.patrol.mapper.PatrolRouteSetupMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolRouteSetupService {
+    private final PatrolRouteSetupMapper mapper;
+    public PatrolRouteSetup create(String routeName, String routeCode, Long areaId, String areaName,
+            Integer checkpointCount, String checkpointList, Double totalDistance, Integer estimatedMinutes) {
+        PatrolRouteSetup r = new PatrolRouteSetup(); r.setRouteName(routeName); r.setRouteCode(routeCode);
+        r.setAreaId(areaId); r.setAreaName(areaName); r.setCheckpointCount(checkpointCount);
+        r.setCheckpointList(checkpointList); r.setTotalDistance(totalDistance);
+        r.setEstimatedMinutes(estimatedMinutes); r.setStatus("active");
+        mapper.insert(r); return r;
+    }
+    public PatrolRouteSetup update(Long id, PatrolRouteSetup patch) {
+        PatrolRouteSetup r = mapper.selectById(id);
+        if (r == null) throw new RuntimeException("路线不存在: "+id);
+        if (patch.getRouteName() != null) r.setRouteName(patch.getRouteName());
+        if (patch.getCheckpointCount() != null) r.setCheckpointCount(patch.getCheckpointCount());
+        if (patch.getCheckpointList() != null) r.setCheckpointList(patch.getCheckpointList());
+        if (patch.getTotalDistance() != null) r.setTotalDistance(patch.getTotalDistance());
+        if (patch.getEstimatedMinutes() != null) r.setEstimatedMinutes(patch.getEstimatedMinutes());
+        if (patch.getRemark() != null) r.setRemark(patch.getRemark());
+        mapper.updateById(r); return r;
+    }
+    public void delete(Long id) { mapper.deleteById(id); }
+    public PatrolRouteSetup getDetail(Long id) { return mapper.selectById(id); }
+    public Map<String, Object> list(String keyword, String status, Long areaId, int page, int size) {
+        LambdaQueryWrapper<PatrolRouteSetup> w = new LambdaQueryWrapper<>();
+        if (keyword != null && !keyword.isEmpty()) w.and(q -> q.like(PatrolRouteSetup::getRouteName, keyword).or().like(PatrolRouteSetup::getRouteCode, keyword));
+        if (status != null && !status.isEmpty()) w.eq(PatrolRouteSetup::getStatus, status);
+        if (areaId != null) w.eq(PatrolRouteSetup::getAreaId, areaId);
+        w.orderByDesc(PatrolRouteSetup::getCreatedAt);
+        Page<PatrolRouteSetup> p = mapper.selectPage(new Page<>(page, size), w);
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("records", p.getRecords()); result.put("total", p.getTotal());
+        result.put("page", page); result.put("size", size);
+        return result;
+    }
+    public void updateStatus(Long id, String status) {
+        PatrolRouteSetup r = mapper.selectById(id);
+        if (r == null) throw new RuntimeException("路线不存在: "+id);
+        r.setStatus(status); mapper.updateById(r);
+    }
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("total", mapper.selectCount(null));
+        r.put("active", mapper.selectCount(new LambdaQueryWrapper<PatrolRouteSetup>().eq(PatrolRouteSetup::getStatus,"active")));
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolService.java

@@ -0,0 +1,118 @@
+package com.water.patrol.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.*;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PatrolService {
+
+    private final JdbcTemplate jdbc;
+
+    // ========== 路线管理 ==========
+    public Map<String, Object> createRoute(String routeName, String area, List<Map<String, Object>> points, int estimDuration) {
+        jdbc.update("INSERT INTO patrol_route (route_name, area, route_points, estim_duration) VALUES (?,?,?::jsonb,?)",
+            routeName, area, points.toString(), estimDuration);
+        return Map.of("routeName", routeName, "area", area, "points", points.size());
+    }
+
+    public List<Map<String, Object>> getRoutes(String area) {
+        return jdbc.queryForList("SELECT * FROM patrol_route WHERE area = ? AND status = 1", area);
+    }
+
+    // ========== 任务管理 ==========
+    public Map<String, Object> createTask(Long routeId, Long assigneeId, String taskDate) {
+        jdbc.update(
+            "INSERT INTO patrol_task (route_id, assignee_id, task_name, task_date, plan_start, plan_end, status) " +
+            "SELECT ?, ?, route_name, ?, CAST(? AS TIMESTAMP), CAST(? AS TIMESTAMP) + (estim_duration || ' minutes')::INTERVAL, 'pending' " +
+            "FROM patrol_route WHERE id = ?",
+            routeId, assigneeId, taskDate, taskDate + " 09:00:00", taskDate + " 09:00:00", routeId);
+        return Map.of("routeId", routeId, "assigneeId", assigneeId, "date", taskDate, "status", "created");
+    }
+
+    public List<Map<String, Object>> getTodayTasks(Long userId) {
+        return jdbc.queryForList(
+            "SELECT pt.*, pr.route_name, pr.area FROM patrol_task pt " +
+            "LEFT JOIN patrol_route pr ON pt.route_id = pr.id " +
+            "WHERE pt.task_date = CURRENT_DATE AND pt.assignee_id = ? " +
+            "ORDER BY pt.plan_start", userId);
+    }
+
+    public Map<String, Object> startTask(Long taskId) {
+        jdbc.update("UPDATE patrol_task SET status = 'in_progress', actual_start = NOW() WHERE id = ?", taskId);
+        return Map.of("taskId", taskId, "status", "in_progress", "startedAt", new Date());
+    }
+
+    public Map<String, Object> completeTask(Long taskId, double distance) {
+        jdbc.update(
+            "UPDATE patrol_task SET status = 'completed', actual_end = NOW(), distance = ? WHERE id = ?",
+            distance, taskId);
+        return Map.of("taskId", taskId, "status", "completed", "distance", distance);
+    }
+
+    // ========== 巡检记录 ==========
+    public Map<String, Object> recordCheck(Long taskId, int pointSeq, Long deviceId,
+                                            List<Map<String, Object>> checkItems,
+                                            double lng, double lat) {
+        jdbc.update(
+            "INSERT INTO patrol_record (task_id, point_seq, device_id, check_items, gps_lng, gps_lat, record_time) " +
+            "VALUES (?,?,?,?::jsonb,?,?,NOW())",
+            taskId, pointSeq, deviceId, checkItems.toString(), lng, lat);
+        return Map.of("taskId", taskId, "pointSeq", pointSeq, "recorded", true);
+    }
+
+    public List<Map<String, Object>> getTaskRecords(Long taskId) {
+        return jdbc.queryForList(
+            "SELECT * FROM patrol_record WHERE task_id = ? ORDER BY point_seq", taskId);
+    }
+
+    // ========== 问题上报（巡检APP） ==========
+    public Map<String, Object> reportIssue(Long taskId, Long deviceId, String issueType,
+                                            String description, List<String> photoUrls,
+                                            double lng, double lat) {
+        // 自动创建工单
+        jdbc.update(
+            "INSERT INTO patrol_task (task_name, assignee_id, task_date, status) " +
+            "SELECT CONCAT('问题处理: ', ?), assignee_id, CURRENT_DATE, 'pending' FROM patrol_task WHERE id = ?",
+            issueType + ": " + description.substring(0, Math.min(description.length(), 50)), taskId);
+
+        log.info("Issue reported: type={} desc={}", issueType, description);
+        return Map.of("reported", true, "issueType", issueType, "photos", photoUrls);
+    }
+
+    // ========== 统计分析 ==========
+    public Map<String, Object> getStats(String area, LocalDate start, LocalDate end) {
+        Map<String, Object> stats = new LinkedHashMap<>();
+
+        // 任务执行率
+        stats.put("completionRate", jdbc.queryForMap(
+            "SELECT COUNT(*) as total, SUM(CASE WHEN status='completed' THEN 1 ELSE 0 END) as completed " +
+            "FROM patrol_task WHERE task_date BETWEEN ? AND ?", start, end));
+
+        // 人员里程
+        stats.put("personDistance", jdbc.queryForList(
+            "SELECT u.real_name, SUM(pt.distance) as total_km " +
+            "FROM patrol_task pt JOIN sys_user u ON pt.assignee_id = u.id " +
+            "WHERE pt.task_date BETWEEN ? AND ? GROUP BY u.id, u.real_name", start, end));
+
+        // 巡检工作量
+        stats.put("workload", jdbc.queryForList(
+            "SELECT task_date, COUNT(*) as tasks, SUM(distance) as total_km " +
+            "FROM patrol_task WHERE task_date BETWEEN ? AND ? GROUP BY task_date ORDER BY task_date",
+            start, end));
+
+        // 问题分类统计
+        stats.put("issueStats", jdbc.queryForList(
+            "SELECT SUBSTRING(task_name FROM '^[^:]+') as issue_type, COUNT(*) as count " +
+            "FROM patrol_task WHERE task_name LIKE '%问题处理:%' AND task_date BETWEEN ? AND ? GROUP BY 1",
+            start, end));
+
+        return stats;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolTemplateService.java

@@ -0,0 +1,59 @@
+package com.water.patrol.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.water.patrol.entity.PatrolTemplate; import com.water.patrol.mapper.PatrolTemplateMapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolTemplateService {
+    private final PatrolTemplateMapper mapper;
+    public PatrolTemplate create(String templateName, String templateCode, Long routeId, String routeName,
+            Long formId, String formName, String scheduleType, String scheduleConfig) {
+        PatrolTemplate t = new PatrolTemplate(); t.setTemplateName(templateName); t.setTemplateCode(templateCode);
+        t.setRouteId(routeId); t.setRouteName(routeName); t.setFormId(formId); t.setFormName(formName);
+        t.setScheduleType(scheduleType); t.setScheduleConfig(scheduleConfig); t.setStatus("active");
+        mapper.insert(t); return t;
+    }
+    public PatrolTemplate update(Long id, PatrolTemplate patch) {
+        PatrolTemplate t = mapper.selectById(id);
+        if (t == null) throw new RuntimeException("模板不存在: "+id);
+        if (patch.getTemplateName() != null) t.setTemplateName(patch.getTemplateName());
+        if (patch.getRouteId() != null) t.setRouteId(patch.getRouteId());
+        if (patch.getRouteName() != null) t.setRouteName(patch.getRouteName());
+        if (patch.getFormId() != null) t.setFormId(patch.getFormId());
+        if (patch.getFormName() != null) t.setFormName(patch.getFormName());
+        if (patch.getScheduleType() != null) t.setScheduleType(patch.getScheduleType());
+        if (patch.getScheduleConfig() != null) t.setScheduleConfig(patch.getScheduleConfig());
+        if (patch.getRemark() != null) t.setRemark(patch.getRemark());
+        mapper.updateById(t); return t;
+    }
+    public void delete(Long id) { mapper.deleteById(id); }
+    public PatrolTemplate getDetail(Long id) { return mapper.selectById(id); }
+    public Map<String, Object> list(String keyword, String status, String scheduleType, int page, int size) {
+        LambdaQueryWrapper<PatrolTemplate> w = new LambdaQueryWrapper<>();
+        if (keyword != null && !keyword.isEmpty()) w.and(q -> q.like(PatrolTemplate::getTemplateName, keyword).or().like(PatrolTemplate::getTemplateCode, keyword));
+        if (status != null && !status.isEmpty()) w.eq(PatrolTemplate::getStatus, status);
+        if (scheduleType != null && !scheduleType.isEmpty()) w.eq(PatrolTemplate::getScheduleType, scheduleType);
+        w.orderByDesc(PatrolTemplate::getCreatedAt);
+        Page<PatrolTemplate> p = mapper.selectPage(new Page<>(page, size), w);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("records", p.getRecords()); r.put("total", p.getTotal());
+        r.put("page", page); r.put("size", size);
+        return r;
+    }
+    public void updateStatus(Long id, String status) {
+        PatrolTemplate t = mapper.selectById(id);
+        if (t == null) throw new RuntimeException("模板不存在: "+id);
+        t.setStatus(status); mapper.updateById(t);
+    }
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("total", mapper.selectCount(null));
+        r.put("active", mapper.selectCount(new LambdaQueryWrapper<PatrolTemplate>().eq(PatrolTemplate::getStatus,"active")));
+        r.put("daily", mapper.selectCount(new LambdaQueryWrapper<PatrolTemplate>().eq(PatrolTemplate::getScheduleType,"daily")));
+        r.put("weekly", mapper.selectCount(new LambdaQueryWrapper<PatrolTemplate>().eq(PatrolTemplate::getScheduleType,"weekly")));
+        r.put("monthly", mapper.selectCount(new LambdaQueryWrapper<PatrolTemplate>().eq(PatrolTemplate::getScheduleType,"monthly")));
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolTrackService.java

@@ -0,0 +1,47 @@
+package com.water.patrol.service;
+import com.water.patrol.entity.PatrolTrackPoint; import com.water.patrol.mapper.PatrolTrackPointMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*;
+@Slf4j @Service @RequiredArgsConstructor
+public class PatrolTrackService {
+    private final PatrolTrackPointMapper mapper;
+    public PatrolTrackPoint recordPoint(Long taskId, Long workerId, BigDecimal lng, BigDecimal lat, BigDecimal speed, BigDecimal accuracy, String address) {
+        PatrolTrackPoint p = new PatrolTrackPoint();
+        p.setTaskId(taskId); p.setWorkerId(workerId); p.setLng(lng); p.setLat(lat);
+        p.setSpeed(speed); p.setAccuracy(accuracy); p.setAddress(address); p.setTimestamp(LocalDateTime.now());
+        mapper.insert(p); return p;
+    }
+    public List<PatrolTrackPoint> getTrack(Long taskId) {
+        return mapper.selectList(new LambdaQueryWrapper<PatrolTrackPoint>().eq(PatrolTrackPoint::getTaskId, taskId).orderByAsc(PatrolTrackPoint::getTimestamp));
+    }
+    public Map<String, Object> getTrackSummary(Long taskId) {
+        List<PatrolTrackPoint> pts = getTrack(taskId);
+        Map<String, Object> r = new LinkedHashMap<>();
+        r.put("totalPoints", pts.size());
+        if (!pts.isEmpty()) {
+            r.put("startTime", pts.get(0).getTimestamp()); r.put("endTime", pts.get(pts.size()-1).getTimestamp());
+            double d = 0; for (int i = 1; i < pts.size(); i++) d += haversine(pts.get(i-1), pts.get(i));
+            r.put("totalDistance", Math.round(d));
+        }
+        return r;
+    }
+    public List<Map<String, Object>> exportTrack(Long taskId) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (PatrolTrackPoint p : getTrack(taskId)) {
+            Map<String, Object> m = new LinkedHashMap<>();
+            m.put("lng", p.getLng()); m.put("lat", p.getLat()); m.put("speed", p.getSpeed());
+            m.put("timestamp", p.getTimestamp()); m.put("address", p.getAddress());
+            result.add(m);
+        }
+        return result;
+    }
+    private double haversine(PatrolTrackPoint a, PatrolTrackPoint b) {
+        double R=6371000, dLat=Math.toRadians(b.getLat().doubleValue()-a.getLat().doubleValue()),
+               dLng=Math.toRadians(b.getLng().doubleValue()-a.getLng().doubleValue()),
+               la1=Math.toRadians(a.getLat().doubleValue()), la2=Math.toRadians(b.getLat().doubleValue());
+        double x=Math.sin(dLat/2)*Math.sin(dLat/2)+Math.cos(la1)*Math.cos(la2)*Math.sin(dLng/2)*Math.sin(dLng/2);
+        return R*2*Math.atan2(Math.sqrt(x),Math.sqrt(1-x));
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolWoService.java

@@ -0,0 +1,122 @@
+package com.water.patrol.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * 巡检工单服务 - Issue #86
+ * PAT-05 工单管理, PAT-06 工单处理
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PatrolWoService {
+
+    private final JdbcTemplate jdbc;
+
+    /** 创建巡检工单 */
+    public Map<String, Object> create(String issueType, String description, String severity,
+                                       String location, Double lng, Double lat, Long taskId) {
+        String orderNo = "PWO-" + System.currentTimeMillis();
+        jdbc.update(
+            "INSERT INTO patrol_work_order (order_no, task_id, issue_type, description, severity, " +
+            "location, lng, lat, status) VALUES (?,?,?,?,?,?,?,?,?)",
+            orderNo, taskId, issueType, description,
+            severity != null ? severity : "medium",
+            location, lng, lat, "pending");
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("orderNo", orderNo);
+        result.put("issueType", issueType);
+        result.put("status", "pending");
+        result.put("created", true);
+        return result;
+    }
+
+    /** 分派工单 */
+    public Map<String, Object> assign(Long woId, Long assigneeId, String assigneeName) {
+        int rows = jdbc.update(
+            "UPDATE patrol_work_order SET assignee_id = ?, assignee_name = ?, status = 'assigned' " +
+            "WHERE id = ?", assigneeId, assigneeName, woId);
+        return Map.of("success", rows > 0, "woId", woId);
+    }
+
+    /** 处理工单 */
+    public Map<String, Object> process(Long woId, String resolution) {
+        int rows = jdbc.update(
+            "UPDATE patrol_work_order SET status = 'processing', resolution = ? WHERE id = ?",
+            resolution, woId);
+        return Map.of("success", rows > 0, "woId", woId);
+    }
+
+    /** 解决工单 */
+    public Map<String, Object> resolve(Long woId) {
+        int rows = jdbc.update(
+            "UPDATE patrol_work_order SET status = 'resolved', resolved_at = NOW() WHERE id = ?", woId);
+        return Map.of("success", rows > 0, "woId", woId);
+    }
+
+    /** 工单详情 */
+    public Map<String, Object> getDetail(Long woId) {
+        List<Map<String, Object>> rows = jdbc.queryForList(
+            "SELECT * FROM patrol_work_order WHERE id = ?", woId);
+        return rows.isEmpty() ? null : rows.get(0);
+    }
+
+    /** 工单列表 */
+    public Map<String, Object> list(String status, String severity, int page, int size) {
+        StringBuilder sql = new StringBuilder("SELECT * FROM patrol_work_order WHERE 1=1");
+        List<Object> params = new ArrayList<>();
+        if (status != null && !status.isEmpty()) {
+            sql.append(" AND status = ?");
+            params.add(status);
+        }
+        if (severity != null && !severity.isEmpty()) {
+            sql.append(" AND severity = ?");
+            params.add(severity);
+        }
+        sql.append(" ORDER BY created_at DESC LIMIT ? OFFSET ?");
+        params.add(size);
+        params.add((page - 1) * size);
+
+        List<Map<String, Object>> records = jdbc.queryForList(sql.toString(), params.toArray());
+
+        StringBuilder countSql = new StringBuilder("SELECT COUNT(*) FROM patrol_work_order WHERE 1=1");
+        List<Object> countParams = new ArrayList<>();
+        if (status != null && !status.isEmpty()) {
+            countSql.append(" AND status = ?");
+            countParams.add(status);
+        }
+        if (severity != null && !severity.isEmpty()) {
+            countSql.append(" AND severity = ?");
+            countParams.add(severity);
+        }
+        long total = countQuery(countSql.toString(), countParams.toArray());
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    /** 工单统计 */
+    public Map<String, Object> stats() {
+        List<Map<String, Object>> rows = jdbc.queryForList(
+            "SELECT status, COUNT(*) as count FROM patrol_work_order GROUP BY status");
+        Map<String, Object> result = new LinkedHashMap<>();
+        for (Map<String, Object> row : rows) {
+            result.put(String.valueOf(row.get("status")), ((Number) row.get("count")).longValue());
+        }
+        return result;
+    }
+
+    private long countQuery(String sql, Object... args) {
+        Long count = jdbc.queryForObject(sql, Long.class, args);
+        return count != null ? count : 0;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/PatrolWorkOrderService.java

@@ -0,0 +1,114 @@
+package com.water.patrol.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.water.patrol.entity.PatrolWorkOrder;
+import com.water.patrol.mapper.PatrolWorkOrderMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PatrolWorkOrderService {
+    private final PatrolWorkOrderMapper woMapper;
+
+    public PatrolWorkOrder create(Long taskId, String issueType, String description,
+            String photos, String severity) {
+        PatrolWorkOrder wo = new PatrolWorkOrder();
+        wo.setOrderNo("PWO-" + System.currentTimeMillis());
+        wo.setTaskId(taskId);
+        wo.setIssueType(issueType);
+        wo.setDescription(description);
+        wo.setPhotos(photos);
+        wo.setSeverity(severity != null ? severity : "medium");
+        wo.setStatus("pending");
+        wo.setCreatedAt(LocalDateTime.now());
+        wo.setUpdatedAt(LocalDateTime.now());
+        woMapper.insert(wo);
+        log.info("Work order created: {}", wo.getOrderNo());
+        return wo;
+    }
+
+    public Map<String, Object> list(String status, String severity, String keyword,
+            int page, int size) {
+        LambdaQueryWrapper<PatrolWorkOrder> w = new LambdaQueryWrapper<>();
+        if (status != null && !status.isEmpty()) w.eq(PatrolWorkOrder::getStatus, status);
+        if (severity != null && !severity.isEmpty()) w.eq(PatrolWorkOrder::getSeverity, severity);
+        if (keyword != null && !keyword.isEmpty()) {
+            w.and(q -> q.like(PatrolWorkOrder::getDescription, keyword)
+                .or().like(PatrolWorkOrder::getOrderNo, keyword));
+        }
+        w.orderByDesc(PatrolWorkOrder::getCreatedAt);
+
+        Long total = woMapper.selectCount(w);
+        w.last("LIMIT " + size + " OFFSET " + ((page - 1) * size));
+        List<PatrolWorkOrder> records = woMapper.selectList(w);
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        result.put("records", records);
+        return result;
+    }
+
+    public PatrolWorkOrder getDetail(Long id) {
+        return woMapper.selectById(id);
+    }
+
+    public void assign(Long id, Long assigneeId, String assigneeName) {
+        PatrolWorkOrder wo = woMapper.selectById(id);
+        if (wo == null) throw new RuntimeException("Work order not found: " + id);
+        wo.setAssigneeId(assigneeId);
+        wo.setAssigneeName(assigneeName);
+        wo.setStatus("assigned");
+        wo.setUpdatedAt(LocalDateTime.now());
+        woMapper.updateById(wo);
+        log.info("Work order {} assigned to {}", id, assigneeName);
+    }
+
+    public void startProcess(Long id) {
+        PatrolWorkOrder wo = woMapper.selectById(id);
+        if (wo == null) throw new RuntimeException("Work order not found: " + id);
+        wo.setStatus("in_progress");
+        wo.setUpdatedAt(LocalDateTime.now());
+        woMapper.updateById(wo);
+        log.info("Work order {} started", id);
+    }
+
+    public void resolve(Long id, String resolution) {
+        PatrolWorkOrder wo = woMapper.selectById(id);
+        if (wo == null) throw new RuntimeException("Work order not found: " + id);
+        wo.setStatus("resolved");
+        wo.setResolution(resolution);
+        wo.setResolvedAt(LocalDateTime.now());
+        wo.setUpdatedAt(LocalDateTime.now());
+        woMapper.updateById(wo);
+        log.info("Work order {} resolved", id);
+    }
+
+    public void close(Long id) {
+        PatrolWorkOrder wo = woMapper.selectById(id);
+        if (wo == null) throw new RuntimeException("Work order not found: " + id);
+        wo.setStatus("closed");
+        wo.setUpdatedAt(LocalDateTime.now());
+        woMapper.updateById(wo);
+        log.info("Work order {} closed", id);
+    }
+
+    public Map<String, Object> getStats() {
+        Map<String, Object> r = new LinkedHashMap<>();
+        Long total = woMapper.selectCount(new LambdaQueryWrapper<>());
+        r.put("total", total);
+
+        for (String s : List.of("pending", "assigned", "in_progress", "resolved", "closed")) {
+            LambdaQueryWrapper<PatrolWorkOrder> w = new LambdaQueryWrapper<PatrolWorkOrder>()
+                .eq(PatrolWorkOrder::getStatus, s);
+            r.put(s, woMapper.selectCount(w));
+        }
+        return r;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/WorkOrderService.java

@@ -0,0 +1,100 @@
+package com.water.patrol.service;
+
+import com.water.patrol.entity.WorkOrder;
+import java.util.List;
+
+public interface WorkOrderService {
+    
+    /**
+     * 从巡检问题创建工单
+     */
+    boolean createFromProblem(PatrolProblem problem);
+    
+    /**
+     * 根据ID查询工单
+     */
+    WorkOrder getWorkOrderById(Long id);
+    
+    /**
+     * 根据工单编号查询
+     */
+    WorkOrder getWorkOrderByOrderNo(String orderNo);
+    
+    /**
+     * 根据问题ID查询工单
+     */
+    WorkOrder getWorkOrderByProblemId(Long problemId);
+    
+    /**
+     * 根据状态查询工单列表
+     */
+    List<WorkOrder> getWorkOrdersByStatus(String status);
+    
+    /**
+     * 根据处理人查询工单列表
+     */
+    List<WorkOrder> getWorkOrdersByAssigneeId(Long assigneeId);
+    
+    /**
+     * 根据处理状态查询工单列表
+     */
+    List<WorkOrder> getWorkOrdersByProcessStatus(String processStatus);
+    
+    /**
+     * 更新工单信息
+     */
+    WorkOrder updateWorkOrder(WorkOrder workOrder);
+    
+    /**
+     * 更新工单状态
+     */
+    boolean updateWorkOrderStatus(Long id, String status, String processStatus);
+    
+    /**
+     * 分派工单
+     */
+    boolean assignWorkOrder(Long id, Long assigneeId, String assigneeName);
+    
+    /**
+     * 开始处理工单
+     */
+    boolean startWorkOrder(Long id);
+    
+    /**
+     * 完成工单
+     */
+    boolean completeWorkOrder(Long id, String solutionResult);
+    
+    /**
+     * 删除工单
+     */
+    boolean deleteWorkOrder(Long id);
+    
+    /**
+     * 获取工单统计信息
+     */
+    WorkOrderStatistics getWorkOrderStatistics();
+    
+    class WorkOrderStatistics {
+        private int totalOrders;
+        private int pendingCount;
+        private int assignedCount;
+        private int processingCount;
+        private int completedCount;
+        private int cancelledCount;
+        
+        // Getters and setters
+        public int getTotalOrders() { return totalOrders; }
+        public void setTotalOrders(int totalOrders) { this.totalOrders = totalOrders; }
+        public int getPendingCount() { return pendingCount; }
+        public void setPendingCount(int pendingCount) { this.pendingCount = pendingCount; }
+        public int getAssignedCount() { return assignedCount; }
+        public void setAssignedCount(int assignedCount) { this.assignedCount = assignedCount; }
+        public int getProcessingCount() { return processingCount; }
+        public void setProcessingCount(int processingCount) { this.processingCount = processingCount; }
+        public int getCompletedCount() { return completedCount; }
+        public void setCompletedCount(int completedCount) { this.completedCount = completedCount; }
+        public int getCancelledCount() { return cancelledCount; }
+        public void setCancelledCount(int cancelledCount) { this.cancelledCount = cancelledCount; }
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/impl/PatrolProblemServiceImpl.java

@@ -0,0 +1,109 @@
+package com.water.patrol.service.impl;
+
+import com.water.patrol.entity.PatrolProblem;
+import com.water.patrol.mapper.PatrolProblemMapper;
+import com.water.patrol.service.PatrolProblemService;
+import com.water.patrol.service.WorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class PatrolProblemServiceImpl implements PatrolProblemService {
+
+    @Autowired
+    private PatrolProblemMapper patrolProblemMapper;
+    
+    @Autowired
+    private WorkOrderService workOrderService;
+
+    @Override
+    @Transactional
+    public PatrolProblem createProblem(PatrolProblem patrolProblem) {
+        // 生成问题编号
+        String problemNo = patrolProblemMapper.generateProblemNo();
+        patrolProblem.setProblemNo(problemNo);
+        patrolProblem.setReportTime(LocalDateTime.now());
+        patrolProblem.setStatus("reported");
+        patrolProblem.setCreatedAt(LocalDateTime.now());
+        patrolProblem.setUpdatedAt(LocalDateTime.now());
+        
+        patrolProblemMapper.insert(patrolProblem);
+        
+        // 自动创建工单
+        autoCreateWorkOrder(patrolProblem.getId());
+        
+        return patrolProblem;
+    }
+
+    @Override
+    public PatrolProblem getProblemById(Long id) {
+        return patrolProblemMapper.selectById(id);
+    }
+
+    @Override
+    public PatrolProblem getProblemByProblemNo(String problemNo) {
+        return patrolProblemMapper.selectByProblemNo(problemNo);
+    }
+
+    @Override
+    public List<PatrolProblem> getProblemsByTaskId(Long taskId) {
+        return patrolProblemMapper.selectByTaskId(taskId);
+    }
+
+    @Override
+    public List<PatrolProblem> getProblemsByStatus(String status) {
+        return patrolProblemMapper.selectByStatus(status);
+    }
+
+    @Override
+    public List<PatrolProblem> getProblemsByDeviceId(Long deviceId) {
+        return patrolProblemMapper.selectByDeviceId(deviceId);
+    }
+
+    @Override
+    @Transactional
+    public PatrolProblem updateProblem(PatrolProblem patrolProblem) {
+        patrolProblem.setUpdatedAt(LocalDateTime.now());
+        patrolProblemMapper.update(patrolProblem);
+        return patrolProblem;
+    }
+
+    @Override
+    @Transactional
+    public boolean updateProblemStatus(Long id, String status, Long workOrderId) {
+        LocalDateTime now = LocalDateTime.now();
+        return patrolProblemMapper.updateStatus(id, status, workOrderId) > 0;
+    }
+
+    @Override
+    @Transactional
+    public boolean deleteProblem(Long id) {
+        return patrolProblemMapper.deleteById(id) > 0;
+    }
+
+    @Override
+    @Transactional
+    public boolean autoCreateWorkOrder(Long problemId) {
+        PatrolProblem problem = getProblemById(problemId);
+        if (problem == null) {
+            return false;
+        }
+        
+        return workOrderService.createFromProblem(problem);
+    }
+
+    @Override
+    public ProblemStatistics getProblemStatistics() {
+        ProblemStatistics statistics = new ProblemStatistics();
+        statistics.setTotalProblems(patrolProblemMapper.countAll());
+        statistics.setReportedCount(patrolProblemMapper.countByStatus("reported"));
+        statistics.setProcessingCount(patrolProblemMapper.countByStatus("processing"));
+        statistics.setCompletedCount(patrolProblemMapper.countByStatus("completed"));
+        statistics.setClosedCount(patrolProblemMapper.countByStatus("closed"));
+        return statistics;
+    }
+}

wm-patrol/src/main/java/com/water/patrol/service/impl/WorkOrderServiceImpl.java

@@ -0,0 +1,241 @@
+package com.water.patrol.service.impl;
+
+import com.water.patrol.entity.PatrolProblem;
+import com.water.patrol.entity.WorkOrder;
+import com.water.patrol.entity.WorkOrderProcess;
+import com.water.patrol.mapper.WorkOrderMapper;
+import com.water.patrol.mapper.WorkOrderProcessMapper;
+import com.water.patrol.service.WorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class WorkOrderServiceImpl implements WorkOrderService {
+
+    @Autowired
+    private WorkOrderMapper workOrderMapper;
+    
+    @Autowired
+    private WorkOrderProcessMapper workOrderProcessMapper;
+
+    @Override
+    @Transactional
+    public boolean createFromProblem(PatrolProblem problem) {
+        WorkOrder workOrder = new WorkOrder();
+        workOrder.setOrderNo(workOrderMapper.generateOrderNo());
+        workOrder.setProblemId(problem.getId());
+        workOrder.setOrderType(determineOrderType(problem.getProblemType()));
+        workOrder.setPriority(determinePriority(problem.getProblemLevel()));
+        workOrder.setTitle(problem.getProblemTitle());
+        workOrder.setDescription(problem.getProblemDescription());
+        workOrder.setLocation(problem.getLocation());
+        workOrder.setReporterId(problem.getReporterId());
+        workOrder.setReporterName(problem.getReporterName());
+        workOrder.setStatus("pending");
+        workOrder.setProcessStatus("created");
+        workOrder.setEstimatedDuration(30); // 默认30分钟
+        workOrder.setCreatedAt(LocalDateTime.now());
+        workOrder.setUpdatedAt(LocalDateTime.now());
+        
+        int result = workOrderMapper.insert(workOrder);
+        
+        if (result > 0) {
+            // 创建处理记录
+            WorkOrderProcess process = new WorkOrderProcess();
+            process.setWorkOrderId(workOrder.getId());
+            process.setProcessStep("created");
+            process.setProcessorId(problem.getReporterId());
+            process.setProcessorName(problem.getReporterName());
+            process.setAction("create");
+            process.setComment("工单自动创建");
+            process.setCreatedAt(LocalDateTime.now());
+            workOrderProcessMapper.insert(process);
+            
+            // 更新问题状态
+            workOrderMapper.selectByProblemId(problem.getId()).setWorkOrderId(workOrder.getId());
+            return true;
+        }
+        
+        return false;
+    }
+
+    @Override
+    public WorkOrder getWorkOrderById(Long id) {
+        return workOrderMapper.selectById(id);
+    }
+
+    @Override
+    public WorkOrder getWorkOrderByOrderNo(String orderNo) {
+        return workOrderMapper.selectByOrderNo(orderNo);
+    }
+
+    @Override
+    public WorkOrder getWorkOrderByProblemId(Long problemId) {
+        return workOrderMapper.selectByProblemId(problemId);
+    }
+
+    @Override
+    public List<WorkOrder> getWorkOrdersByStatus(String status) {
+        return workOrderMapper.selectByStatus(status);
+    }
+
+    @Override
+    public List<WorkOrder> getWorkOrdersByAssigneeId(Long assigneeId) {
+        return workOrderMapper.selectByAssigneeId(assigneeId);
+    }
+
+    @Override
+    public List<WorkOrder> getWorkOrdersByProcessStatus(String processStatus) {
+        return workOrderMapper.selectByProcessStatus(processStatus);
+    }
+
+    @Override
+    @Transactional
+    public WorkOrder updateWorkOrder(WorkOrder workOrder) {
+        workOrder.setUpdatedAt(LocalDateTime.now());
+        workOrderMapper.update(workOrder);
+        return workOrder;
+    }
+
+    @Override
+    @Transactional
+    public boolean updateWorkOrderStatus(Long id, String status, String processStatus) {
+        LocalDateTime now = LocalDateTime.now();
+        return workOrderMapper.updateStatus(id, status, processStatus) > 0;
+    }
+
+    @Override
+    @Transactional
+    public boolean assignWorkOrder(Long id, Long assigneeId, String assigneeName) {
+        LocalDateTime now = LocalDateTime.now();
+        
+        // 更新工单
+        boolean updated = workOrderMapper.updateAssignee(id, assigneeId, assigneeName) > 0;
+        
+        if (updated) {
+            // 创建处理记录
+            WorkOrder workOrder = getWorkOrderById(id);
+            WorkOrderProcess process = new WorkOrderProcess();
+            process.setWorkOrderId(id);
+            process.setProcessStep("accepted");
+            process.setProcessorId(assigneeId);
+            process.setProcessorName(assigneeName);
+            process.setAction("assign");
+            process.setComment("工单已分配");
+            process.setCreatedAt(now);
+            workOrderProcessMapper.insert(process);
+            
+            // 更新工单状态
+            updateWorkOrderStatus(id, "assigned", "accepted");
+        }
+        
+        return updated;
+    }
+
+    @Override
+    @Transactional
+    public boolean startWorkOrder(Long id) {
+        LocalDateTime now = LocalDateTime.now();
+        
+        // 更新工单
+        boolean updated = workOrderMapper.updateStatus(id, "processing", "in_progress") > 0;
+        
+        if (updated) {
+            // 创建处理记录
+            WorkOrder workOrder = getWorkOrderById(id);
+            WorkOrderProcess process = new WorkOrderProcess();
+            process.setWorkOrderId(id);
+            process.setProcessStep("in_progress");
+            process.setProcessorId(workOrder.getAssigneeId());
+            process.setProcessorName(workOrder.getAssigneeName());
+            process.setAction("start");
+            process.setComment("开始处理工单");
+            process.setCreatedAt(now);
+            workOrderProcessMapper.insert(process);
+        }
+        
+        return updated;
+    }
+
+    @Override
+    @Transactional
+    public boolean completeWorkOrder(Long id, String solutionResult) {
+        LocalDateTime now = LocalDateTime.now();
+        
+        // 更新工单
+        boolean updated = workOrderMapper.updateCompletion(id, now, now, solutionResult) > 0;
+        
+        if (updated) {
+            // 创建处理记录
+            WorkOrder workOrder = getWorkOrderById(id);
+            WorkOrderProcess process = new WorkOrderProcess();
+            process.setWorkOrderId(id);
+            process.setProcessStep("completed");
+            process.setProcessorId(workOrder.getAssigneeId());
+            process.setProcessorName(workOrder.getAssigneeName());
+            process.setAction("complete");
+            process.setComment("工单已完成");
+            process.setCreatedAt(now);
+            workOrderProcessMapper.insert(process);
+            
+            // 更新工单状态
+            updateWorkOrderStatus(id, "completed", "completed");
+        }
+        
+        return updated;
+    }
+
+    @Override
+    @Transactional
+    public boolean deleteWorkOrder(Long id) {
+        return workOrderMapper.deleteById(id) > 0;
+    }
+
+    @Override
+    public WorkOrderStatistics getWorkOrderStatistics() {
+        WorkOrderStatistics statistics = new WorkOrderStatistics();
+        statistics.setTotalOrders(workOrderMapper.countAll());
+        statistics.setPendingCount(workOrderMapper.countByStatus("pending"));
+        statistics.setAssignedCount(workOrderMapper.countByStatus("assigned"));
+        statistics.setProcessingCount(workOrderMapper.countByStatus("processing"));
+        statistics.setCompletedCount(workOrderMapper.countByStatus("completed"));
+        statistics.setCancelledCount(workOrderMapper.countByStatus("cancelled"));
+        return statistics;
+    }
+    
+    /**
+     * 根据问题类型确定工单类型
+     */
+    private String determineOrderType(String problemType) {
+        if (problemType.contains("设备")) {
+            return "设备维修";
+        } else if (problemType.contains("水质")) {
+            return "水质处理";
+        } else if (problemType.contains("安全")) {
+            return "安全隐患处理";
+        } else if (problemType.contains("环境")) {
+            return "清洁";
+        } else {
+            return "其他";
+        }
+    }
+    
+    /**
+     * 根据问题级别确定优先级
+     */
+    private String determinePriority(String problemLevel) {
+        if (problemLevel.equals("critical")) {
+            return "critical";
+        } else if (problemLevel.equals("high")) {
+            return "high";
+        } else if (problemLevel.equals("normal")) {
+            return "normal";
+        } else {
+            return "low";
+        }
+    }
+}

wm-patrol/src/main/resources/application.yml

@@ -0,0 +1,17 @@
+server:
+  port: 8087
+
+spring:
+  application:
+    name: wm-patrol
+  datasource:
+    url: jdbc:postgresql://${PG_HOST:127.0.0.1}:5432/water_management
+    username: ${PG_USER:water}
+    password: ${PG_PASS:water123}
+  cloud:
+    nacos:
+      discovery:
+        server-addr: ${NACOS_HOST:127.0.0.1}:8848
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**/*.xml

wm-patrol/src/main/resources/mapper/PatrolProblemMapper.xml

@@ -0,0 +1,103 @@
+<?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="com.water.patrol.mapper.PatrolProblemMapper">
+
+    <resultMap id="BaseResultMap" type="com.water.patrol.entity.PatrolProblem">
+        <id column="id" property="id" />
+        <result column="problem_no" property="problemNo" />
+        <result column="task_id" property="taskId" />
+        <result column="point_seq" property="pointSeq" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_name" property="deviceName" />
+        <result column="problem_type" property="problemType" />
+        <result column="problem_level" property="problemLevel" />
+        <result column="problem_title" property="problemTitle" />
+        <result column="problem_description" property="problemDescription" />
+        <result column="location" property="location" />
+        <result column="lng" property="lng" />
+        <result column="lat" property="lat" />
+        <result column="photo_urls" property="photoUrls" typeHandler="com.water.common.handler.JsonListTypeHandler" />
+        <result column="reporter_id" property="reporterId" />
+        <result column="reporter_name" property="reporterName" />
+        <result column="report_time" property="reportTime" />
+        <result column="status" property="status" />
+        <result column="work_order_id" property="workOrderId" />
+        <result column="created_at" property="createdAt" />
+        <result column="updated_at" property="updatedAt" />
+    </resultMap>
+
+    <insert id="insert" parameterType="com.water.patrol.entity.PatrolProblem">
+        INSERT INTO patrol_problem (
+            problem_no, task_id, point_seq, device_id, device_name,
+            problem_type, problem_level, problem_title, problem_description,
+            location, lng, lat, photo_urls, reporter_id, reporter_name,
+            report_time, status, work_order_id, created_at, updated_at
+        ) VALUES (
+            #{problemNo}, #{taskId}, #{pointSeq}, #{deviceId}, #{deviceName},
+            #{problemType}, #{problemLevel}, #{problemTitle}, #{problemDescription},
+            #{location}, #{lng}, #{lat}, #{photoUrls}, #{reporterId}, #{reporterName},
+            #{reportTime}, #{status}, #{workOrderId}, #{createdAt}, #{updatedAt}
+        )
+    </insert>
+
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT * FROM patrol_problem WHERE id = #{id}
+    </select>
+
+    <select id="selectByProblemNo" resultMap="BaseResultMap">
+        SELECT * FROM patrol_problem WHERE problem_no = #{problemNo}
+    </select>
+
+    <select id="selectByTaskId" resultMap="BaseResultMap">
+        SELECT * FROM patrol_problem WHERE task_id = #{taskId} ORDER BY created_at DESC
+    </select>
+
+    <select id="selectByStatus" resultMap="BaseResultMap">
+        SELECT * FROM patrol_problem WHERE status = #{status} ORDER BY created_at DESC
+    </select>
+
+    <select id="selectByDeviceId" resultMap="BaseResultMap">
+        SELECT * FROM patrol_problem WHERE device_id = #{deviceId} ORDER BY created_at DESC
+    </select>
+
+    <update id="update" parameterType="com.water.patrol.entity.PatrolProblem">
+        UPDATE patrol_problem SET
+            problem_type = #{problemType},
+            problem_level = #{problemLevel},
+            problem_title = #{problemTitle},
+            problem_description = #{problemDescription},
+            location = #{location},
+            lng = #{lng},
+            lat = #{lat},
+            photo_urls = #{photoUrls},
+            status = #{status},
+            work_order_id = #{workOrderId},
+            updated_at = #{updatedAt}
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateStatus">
+        UPDATE patrol_problem SET
+            status = #{status},
+            work_order_id = #{workOrderId},
+            updated_at = #{updatedAt}
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteById">
+        DELETE FROM patrol_problem WHERE id = #{id}
+    </delete>
+
+    <select id="generateProblemNo" resultType="string">
+        SELECT 'WQ' || to_char(NOW(), 'YYYY') || '-' || LPAD(nextval('seq_patrol_problem')::text, 3, '0')
+    </select>
+
+    <select id="countAll" resultType="int">
+        SELECT COUNT(*) FROM patrol_problem
+    </select>
+
+    <select id="countByStatus" resultType="int">
+        SELECT COUNT(*) FROM patrol_problem WHERE status = #{status}
+    </select>
+
+</mapper>

wm-patrol/src/main/resources/mapper/WorkOrderMapper.xml

@@ -0,0 +1,148 @@
+<?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="com.water.patrol.mapper.WorkOrderMapper">
+
+    <resultMap id="BaseResultMap" type="com.water.patrol.entity.WorkOrder">
+        <id column="id" property="id" />
+        <result column="order_no" property="orderNo" />
+        <result column="problem_id" property="problemId" />
+        <result column="order_type" property="orderType" />
+        <result column="priority" property="priority" />
+        <result column="title" property="title" />
+        <result column="description" property="description" />
+        <result column="location" property="location" />
+        <result column="contact_person" property="contactPerson" />
+        <result column="contact_phone" property="contactPhone" />
+        <result column="reporter_id" property="reporterId" />
+        <result column="reporter_name" property="reporterName" />
+        <result column="assignee_id" property="assigneeId" />
+        <result column="assignee_name" property="assigneeName" />
+        <result column="status" property="status" />
+        <result column="process_status" property="processStatus" />
+        <result column="estimated_duration" property="estimatedDuration" />
+        <result column="actual_start_time" property="actualStartTime" />
+        <result column="actual_end_time" property="actualEndTime" />
+        <result column="completion_time" property="completionTime" />
+        <result column="photos_before" property="photosBefore" typeHandler="com.water.common.handler.JsonListTypeHandler" />
+        <result column="photos_after" property="photosAfter" typeHandler="com.water.common.handler.JsonListTypeHandler" />
+        <result column="solution_description" property="solutionDescription" />
+        <result column="solution_result" property="solutionResult" />
+        <result column="customer_feedback" property="customerFeedback" />
+        <result column="created_at" property="createdAt" />
+        <result column="updated_at" property="updatedAt" />
+    </resultMap>
+
+    <insert id="insert" parameterType="com.water.patrol.entity.WorkOrder">
+        INSERT INTO work_order (
+            order_no, problem_id, order_type, priority, title, description,
+            location, contact_person, contact_phone, reporter_id, reporter_name,
+            assignee_id, assignee_name, status, process_status,
+            estimated_duration, actual_start_time, actual_end_time, completion_time,
+            photos_before, photos_after, solution_description, solution_result,
+            customer_feedback, created_at, updated_at
+        ) VALUES (
+            #{orderNo}, #{problemId}, #{orderType}, #{priority}, #{title}, #{description},
+            #{location}, #{contactPerson}, #{contactPhone}, #{reporterId}, #{reporterName},
+            #{assigneeId}, #{assigneeName}, #{status}, #{processStatus},
+            #{estimatedDuration}, #{actualStartTime}, #{actualEndTime}, #{completionTime},
+            #{photosBefore}, #{photosAfter}, #{solutionDescription}, #{solutionResult},
+            #{customerFeedback}, #{createdAt}, #{updatedAt}
+        )
+    </insert>
+
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT * FROM work_order WHERE id = #{id}
+    </select>
+
+    <select id="selectByOrderNo" resultMap="BaseResultMap">
+        SELECT * FROM work_order WHERE order_no = #{orderNo}
+    </select>
+
+    <select id="selectByProblemId" resultMap="BaseResultMap">
+        SELECT * FROM work_order WHERE problem_id = #{problemId}
+    </select>
+
+    <select id="selectByStatus" resultMap="BaseResultMap">
+        SELECT * FROM work_order WHERE status = #{status} ORDER BY created_at DESC
+    </select>
+
+    <select id="selectByAssigneeId" resultMap="BaseResultMap">
+        SELECT * FROM work_order WHERE assignee_id = #{assigneeId} ORDER BY created_at DESC
+    </select>
+
+    <select id="selectByProcessStatus" resultMap="BaseResultMap">
+        SELECT * FROM work_order WHERE process_status = #{processStatus} ORDER BY created_at DESC
+    </select>
+
+    <update id="update" parameterType="com.water.patrol.entity.WorkOrder">
+        UPDATE work_order SET
+            order_type = #{orderType},
+            priority = #{priority},
+            title = #{title},
+            description = #{description},
+            location = #{location},
+            contact_person = #{contactPerson},
+            contact_phone = #{contactPhone},
+            assignee_id = #{assigneeId},
+            assignee_name = #{assigneeName},
+            status = #{status},
+            process_status = #{processStatus},
+            estimated_duration = #{estimatedDuration},
+            actual_start_time = #{actualStartTime},
+            actual_end_time = #{actualEndTime},
+            completion_time = #{completionTime},
+            photos_before = #{photosBefore},
+            photos_after = #{photosAfter},
+            solution_description = #{solutionDescription},
+            solution_result = #{solutionResult},
+            customer_feedback = #{customerFeedback},
+            updated_at = #{updatedAt}
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateStatus">
+        UPDATE work_order SET
+            status = #{status},
+            process_status = #{processStatus},
+            updated_at = #{updatedAt}
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateAssignee">
+        UPDATE work_order SET
+            assignee_id = #{assigneeId},
+            assignee_name = #{assigneeName},
+            updated_at = #{updatedAt}
+        WHERE id = #{id}
+    </update>
+
+    <update id="updateCompletion">
+        UPDATE work_order SET
+            actual_end_time = #{actualEndTime},
+            completion_time = #{completionTime},
+            solution_result = #{solutionResult},
+            updated_at = #{updatedAt}
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteById">
+        DELETE FROM work_order WHERE id = #{id}
+    </delete>
+
+    <select id="generateOrderNo" resultType="string">
+        SELECT 'WO' || to_char(NOW(), 'YYYY') || '-' || LPAD(nextval('seq_work_order')::text, 3, '0')
+    </select>
+
+    <select id="countAll" resultType="int">
+        SELECT COUNT(*) FROM work_order
+    </select>
+
+    <select id="countByStatus" resultType="int">
+        SELECT COUNT(*) FROM work_order WHERE status = #{status}
+    </select>
+
+    <select id="countByProcessStatus" resultType="int">
+        SELECT COUNT(*) FROM work_order WHERE process_status = #{processStatus}
+    </select>
+
+</mapper>

wm-patrol/src/main/resources/mapper/WorkOrderProcessMapper.xml

@@ -0,0 +1,45 @@
+<?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="com.water.patrol.mapper.WorkOrderProcessMapper">
+
+    <resultMap id="BaseResultMap" type="com.water.patrol.entity.WorkOrderProcess">
+        <id column="id" property="id" />
+        <result column="work_order_id" property="workOrderId" />
+        <result column="process_step" property="processStep" />
+        <result column="processor_id" property="processorId" />
+        <result column="processor_name" property="processorName" />
+        <result column="action" property="action" />
+        <result column="comment" property="comment" />
+        <result column="photos" property="photos" typeHandler="com.water.common.handler.JsonListTypeHandler" />
+        <result column="created_at" property="createdAt" />
+    </resultMap>
+
+    <insert id="insert" parameterType="com.water.patrol.entity.WorkOrderProcess">
+        INSERT INTO work_order_process (
+            work_order_id, process_step, processor_id, processor_name,
+            action, comment, photos, created_at
+        ) VALUES (
+            #{workOrderId}, #{processStep}, #{processorId}, #{processorName},
+            #{action}, #{comment}, #{photos}, #{createdAt}
+        )
+    </insert>
+
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT * FROM work_order_process WHERE id = #{id}
+    </select>
+
+    <select id="selectByWorkOrderId" resultMap="BaseResultMap">
+        SELECT * FROM work_order_process WHERE work_order_id = #{workOrderId} ORDER BY created_at DESC
+    </select>
+
+    <select id="selectLatestByWorkOrderId" resultMap="BaseResultMap">
+        SELECT * FROM work_order_process 
+        WHERE work_order_id = #{workOrderId} 
+        ORDER BY created_at DESC LIMIT 1
+    </select>
+
+    <delete id="deleteById">
+        DELETE FROM work_order_process WHERE id = #{id}
+    </delete>
+
+</mapper>

wm-patrol/src/main/resources/sql/V86__patrol_core.sql

@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS pat_track_point (
+    id BIGSERIAL PRIMARY KEY, task_id BIGINT NOT NULL, worker_id BIGINT,
+    lng NUMERIC(10,6), lat NUMERIC(10,6), speed NUMERIC(8,2), accuracy NUMERIC(8,2),
+    address VARCHAR(200), timestamp TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_pat_track_task ON pat_track_point(task_id);
+
+CREATE TABLE IF NOT EXISTS pat_task (
+    id BIGSERIAL PRIMARY KEY, task_no VARCHAR(32) UNIQUE NOT NULL, task_name VARCHAR(100),
+    route_id BIGINT, worker_id BIGINT, worker_name VARCHAR(50), status VARCHAR(20) DEFAULT 'pending',
+    start_time TIMESTAMPTZ, end_time TIMESTAMPTZ, checkpoints INT DEFAULT 0,
+    completed_checkpoints INT DEFAULT 0, abnormal_count INT DEFAULT 0,
+    distance DOUBLE PRECISION DEFAULT 0, remark VARCHAR(500),
+    created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_pat_task_status ON pat_task(status);
+CREATE INDEX IF NOT EXISTS idx_pat_task_worker ON pat_task(worker_id);
+
+CREATE TABLE IF NOT EXISTS pat_device (
+    id BIGSERIAL PRIMARY KEY, device_no VARCHAR(32) UNIQUE NOT NULL, device_name VARCHAR(100),
+    device_type VARCHAR(30), location VARCHAR(200), lng NUMERIC(10,6), lat NUMERIC(10,6),
+    status VARCHAR(20) DEFAULT 'normal', last_maintenance_date DATE, next_maintenance_date DATE,
+    remark VARCHAR(500), created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_pat_device_type ON pat_device(device_type);
+CREATE INDEX IF NOT EXISTS idx_pat_device_status ON pat_device(status);
+
+CREATE TABLE IF NOT EXISTS pat_work_order (
+    id BIGSERIAL PRIMARY KEY, order_no VARCHAR(32) UNIQUE NOT NULL, task_id BIGINT,
+    issue_type VARCHAR(30), description TEXT, photos TEXT, severity VARCHAR(20) DEFAULT 'medium',
+    assignee_id BIGINT, assignee_name VARCHAR(50), status VARCHAR(20) DEFAULT 'pending',
+    resolution TEXT, resolved_at TIMESTAMPTZ, created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_pat_wo_status ON pat_work_order(status);
+CREATE INDEX IF NOT EXISTS idx_pat_wo_task ON pat_work_order(task_id);

wm-patrol/src/main/resources/sql/V87__patrol_setup.sql

@@ -0,0 +1,24 @@
+CREATE TABLE IF NOT EXISTS pat_area (
+    id BIGSERIAL PRIMARY KEY, area_name VARCHAR(100), area_code VARCHAR(32) UNIQUE,
+    description VARCHAR(500), center_lng NUMERIC(10,6), center_lat NUMERIC(10,6),
+    boundary TEXT, radius DOUBLE PRECISION, status VARCHAR(20) DEFAULT 'active',
+    created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+CREATE TABLE IF NOT EXISTS pat_route_setup (
+    id BIGSERIAL PRIMARY KEY, route_name VARCHAR(100), route_code VARCHAR(32) UNIQUE,
+    area_id BIGINT, area_name VARCHAR(100), checkpoint_count INT DEFAULT 0,
+    checkpoint_list TEXT, total_distance DOUBLE PRECISION, estimated_minutes INT,
+    status VARCHAR(20) DEFAULT 'active', remark VARCHAR(500),
+    created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+CREATE TABLE IF NOT EXISTS pat_form (
+    id BIGSERIAL PRIMARY KEY, form_name VARCHAR(100), form_code VARCHAR(32) UNIQUE,
+    form_type VARCHAR(30), field_config TEXT, status VARCHAR(20) DEFAULT 'active',
+    remark VARCHAR(500), created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+CREATE TABLE IF NOT EXISTS pat_template (
+    id BIGSERIAL PRIMARY KEY, template_name VARCHAR(100), template_code VARCHAR(32) UNIQUE,
+    route_id BIGINT, route_name VARCHAR(100), form_id BIGINT, form_name VARCHAR(100),
+    schedule_type VARCHAR(20), schedule_config TEXT, status VARCHAR(20) DEFAULT 'active',
+    remark VARCHAR(500), created_at TIMESTAMPTZ DEFAULT NOW(), updated_at TIMESTAMPTZ DEFAULT NOW()
+);

wm-patrol/src/main/resources/sql/V88__patrol_app.sql

@@ -0,0 +1,23 @@
+-- V88: 巡查APP相关表 - Issue #88
+-- PAT-21~PAT-29
+
+-- 用户巡检统计（按月汇总）
+CREATE TABLE IF NOT EXISTS patrol_user_stats_monthly (
+    id              BIGSERIAL PRIMARY KEY,
+    user_id         BIGINT NOT NULL,
+    year_month      VARCHAR(7) NOT NULL,  -- '2026-06'
+    completed_tasks INT DEFAULT 0,
+    total_distance  DOUBLE PRECISION DEFAULT 0,
+    issue_count     INT DEFAULT 0,
+    patrol_hours    DOUBLE PRECISION DEFAULT 0,
+    created_at      TIMESTAMPTZ DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ DEFAULT NOW(),
+    UNIQUE(user_id, year_month)
+);
+CREATE INDEX IF NOT EXISTS idx_patrol_stats_user ON patrol_user_stats_monthly(user_id, year_month);
+
+-- 问题上报表加 voice_url 字段（patrol_problem 已在 problem_reporting.sql 创建）
+ALTER TABLE patrol_problem ADD COLUMN IF NOT EXISTS voice_url VARCHAR(500);
+
+-- 用户头像（如果 sys_user 表无 avatar 字段则添加）
+ALTER TABLE sys_user ADD COLUMN IF NOT EXISTS avatar VARCHAR(500);

wm-patrol/src/test/java/com/water/patrol/PatrolAppTest.java

@@ -0,0 +1,24 @@
+package com.water.patrol;
+import com.water.patrol.entity.*; import com.water.patrol.mapper.*; import com.water.patrol.service.*;
+import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension;
+import java.math.BigDecimal; import java.util.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+@ExtendWith(MockitoExtension.class)
+class PatrolAppTest {
+    @Mock PatrolTaskMapper taskMapper; @Mock PatrolWorkOrderMapper woMapper; @Mock PatrolIssueReportMapper irMapper;
+    @InjectMocks PatrolAppTaskService taskSvc; @InjectMocks PatrolAppWorkOrderService woSvc;
+    @InjectMocks PatrolAppIssueService issueSvc; @InjectMocks PatrolAppProfileService profileSvc;
+
+    @Test void testMyTasks() { when(taskMapper.selectList(any())).thenReturn(Collections.emptyList()); when(taskMapper.selectCount(any())).thenReturn(0L); Map<String,Object> r=taskSvc.myTasks(100L,null); assertNotNull(r); assertEquals(0,r.get("totalCount")); }
+    @Test void testAcceptTask() { PatrolTask t=new PatrolTask(); t.setId(1L); t.setStatus("pending"); when(taskMapper.selectById(1L)).thenReturn(t); when(taskMapper.updateById(any())).thenReturn(1); taskSvc.accept(1L); assertEquals("in_progress",t.getStatus()); assertNotNull(t.getStartTime()); }
+    @Test void testCompleteTask() { PatrolTask t=new PatrolTask(); t.setId(1L); t.setStatus("in_progress"); when(taskMapper.selectById(1L)).thenReturn(t); when(taskMapper.updateById(any())).thenReturn(1); taskSvc.complete(1L,5,2000.0,"完成"); assertEquals("completed",t.getStatus()); assertEquals(5,(int)t.getCompletedCheckpoints()); }
+    @Test void testMyWorkOrders() { when(woMapper.selectList(any())).thenReturn(Collections.emptyList()); when(woMapper.selectCount(any())).thenReturn(0L); Map<String,Object> r=woSvc.myWorkOrders(100L,null); assertNotNull(r); }
+    @Test void testAcceptWO() { PatrolWorkOrder wo=new PatrolWorkOrder(); wo.setId(1L); wo.setStatus("assigned"); when(woMapper.selectById(1L)).thenReturn(wo); when(woMapper.updateById(any())).thenReturn(1); woSvc.accept(1L); assertEquals("in_progress",wo.getStatus()); }
+    @Test void testResolveWO() { PatrolWorkOrder wo=new PatrolWorkOrder(); wo.setId(1L); wo.setStatus("in_progress"); when(woMapper.selectById(1L)).thenReturn(wo); when(woMapper.updateById(any())).thenReturn(1); woSvc.resolve(1L,"已修复",null); assertEquals("resolved",wo.getStatus()); assertNotNull(wo.getResolvedAt()); }
+    @Test void testSubmitIssue() { when(irMapper.insert(any())).thenReturn(1); PatrolIssueReport r=issueSvc.submit(1L,100L,"张三","leak","管道漏水",null,null,new BigDecimal("116"),new BigDecimal("39"),"A路","high"); assertTrue(r.getReportNo().startsWith("PIR-")); assertEquals("submitted",r.getStatus()); }
+    @Test void testMyReports() { when(irMapper.selectList(any())).thenReturn(Collections.emptyList()); when(irMapper.selectCount(any())).thenReturn(0L); Map<String,Object> r=issueSvc.myReports(100L); assertNotNull(r); assertEquals(0,r.get("totalCount")); }
+    @Test void testProfile() { when(taskMapper.selectCount(any())).thenReturn(10L); when(woMapper.selectCount(any())).thenReturn(5L); Map<String,Object> r=profileSvc.getProfile(100L); assertEquals(100L,r.get("workerId")); }
+    @Test void testMyStats() { when(taskMapper.selectCount(any())).thenReturn(5L); Map<String,Object> r=taskSvc.myStats(100L); assertNotNull(r); }
+}

wm-patrol/src/test/java/com/water/patrol/PatrolCoreTest.java

@@ -0,0 +1,27 @@
+package com.water.patrol;
+import com.water.patrol.entity.*; import com.water.patrol.mapper.*; import com.water.patrol.service.*;
+import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.jdbc.core.JdbcTemplate;
+import java.math.BigDecimal; import java.util.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+@ExtendWith(MockitoExtension.class)
+class PatrolCoreTest {
+    @Mock JdbcTemplate jdbc; @Mock PatrolTaskMapper taskMapper; @Mock PatrolTrackPointMapper trackMapper;
+    @Mock PatrolDeviceMapper deviceMapper; @Mock PatrolWorkOrderMapper woMapper;
+    @InjectMocks PatrolOverviewService overviewSvc; @InjectMocks PatrolLedgerService ledgerSvc;
+    @InjectMocks PatrolTrackService trackSvc; @InjectMocks PatrolDeviceService deviceSvc;
+    @InjectMocks PatrolWorkOrderService woSvc;
+
+    @Test void testOverview() { when(jdbc.queryForObject(anyString(),eq(Integer.class),any())).thenReturn(10); when(jdbc.queryForObject(anyString(),eq(Double.class),any())).thenReturn(5000.0); assertNotNull(overviewSvc.getOverview()); }
+    @Test void testCreateTask() { when(taskMapper.insert(any())).thenReturn(1); PatrolTask t=ledgerSvc.createTask("巡检",1L,100L,"张三"); assertTrue(t.getTaskNo().startsWith("PAT-")); assertEquals("pending",t.getStatus()); }
+    @Test void testStartTask() { PatrolTask t=new PatrolTask(); t.setId(1L); t.setStatus("pending"); when(taskMapper.selectById(1L)).thenReturn(t); when(taskMapper.updateById(any())).thenReturn(1); ledgerSvc.startTask(1L); assertEquals("in_progress",t.getStatus()); }
+    @Test void testRecordGps() { when(trackMapper.insert(any())).thenReturn(1); PatrolTrackPoint p=trackSvc.recordPoint(1L,100L,new BigDecimal("116.4"),new BigDecimal("39.9"),null,null,"test"); assertNotNull(p); assertEquals(1L,p.getTaskId()); }
+    @Test void testCreateDevice() { when(deviceMapper.insert(any())).thenReturn(1); PatrolDevice d=deviceSvc.create("DEV-001","阀门A","valve","A区",new BigDecimal("116"),new BigDecimal("39")); assertEquals("normal",d.getStatus()); }
+    @Test void testDeviceStatus() { PatrolDevice d=new PatrolDevice(); d.setId(1L); d.setStatus("normal"); when(deviceMapper.selectById(1L)).thenReturn(d); when(deviceMapper.updateById(any())).thenReturn(1); deviceSvc.updateStatus(1L,"fault"); assertEquals("fault",d.getStatus()); }
+    @Test void testCreateWO() { when(woMapper.insert(any())).thenReturn(1); PatrolWorkOrder wo=woSvc.create(1L,"leak","管道漏水",null,"high"); assertTrue(wo.getOrderNo().startsWith("PWO-")); assertEquals("high",wo.getSeverity()); }
+    @Test void testAssignWO() { PatrolWorkOrder wo=new PatrolWorkOrder(); wo.setId(1L); wo.setStatus("pending"); when(woMapper.selectById(1L)).thenReturn(wo); when(woMapper.updateById(any())).thenReturn(1); woSvc.assign(1L,200L,"李四"); assertEquals("assigned",wo.getStatus()); }
+    @Test void testResolveWO() { PatrolWorkOrder wo=new PatrolWorkOrder(); wo.setId(1L); wo.setStatus("in_progress"); when(woMapper.selectById(1L)).thenReturn(wo); when(woMapper.updateById(any())).thenReturn(1); woSvc.resolve(1L,"已修复"); assertEquals("resolved",wo.getStatus()); assertNotNull(wo.getResolvedAt()); }
+    @Test void testCloseWO() { PatrolWorkOrder wo=new PatrolWorkOrder(); wo.setId(1L); wo.setStatus("resolved"); when(woMapper.selectById(1L)).thenReturn(wo); when(woMapper.updateById(any())).thenReturn(1); woSvc.close(1L); assertEquals("closed",wo.getStatus()); }
+}

wm-patrol/src/test/java/com/water/patrol/PatrolSetupTest.java

@@ -0,0 +1,25 @@
+package com.water.patrol;
+import com.water.patrol.entity.*; import com.water.patrol.mapper.*; import com.water.patrol.service.*;
+import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension;
+import java.math.BigDecimal; import java.util.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+@ExtendWith(MockitoExtension.class)
+class PatrolSetupTest {
+    @Mock PatrolAreaMapper areaMapper; @Mock PatrolRouteSetupMapper routeMapper;
+    @Mock PatrolFormMapper formMapper; @Mock PatrolTemplateMapper tplMapper;
+    @InjectMocks PatrolAreaService areaSvc; @InjectMocks PatrolRouteSetupService routeSvc;
+    @InjectMocks PatrolFormService formSvc; @InjectMocks PatrolTemplateService tplSvc;
+
+    @Test void testCreateArea() { when(areaMapper.insert(any())).thenReturn(1); PatrolArea a=areaSvc.create("A区","AREA-001","供水主管",new BigDecimal("116"),new BigDecimal("39"),null,500.0); assertEquals("active",a.getStatus()); assertEquals("A区",a.getAreaName()); }
+    @Test void testUpdateArea() { PatrolArea a=new PatrolArea(); a.setId(1L); a.setAreaName("A区"); a.setStatus("active"); when(areaMapper.selectById(1L)).thenReturn(a); when(areaMapper.updateById(any())).thenReturn(1); PatrolArea p=new PatrolArea(); p.setAreaName("B区"); assertEquals("B区",areaSvc.update(1L,p).getAreaName()); }
+    @Test void testAreaStatus() { PatrolArea a=new PatrolArea(); a.setId(1L); a.setStatus("active"); when(areaMapper.selectById(1L)).thenReturn(a); when(areaMapper.updateById(any())).thenReturn(1); areaSvc.updateStatus(1L,"inactive"); assertEquals("inactive",a.getStatus()); }
+    @Test void testCreateRoute() { when(routeMapper.insert(any())).thenReturn(1); PatrolRouteSetup r=routeSvc.create("主管线","ROUTE-001",1L,"A区",5,null,2000.0,60); assertEquals("active",r.getStatus()); assertEquals(5,(int)r.getCheckpointCount()); }
+    @Test void testUpdateRoute() { PatrolRouteSetup r=new PatrolRouteSetup(); r.setId(1L); r.setRouteName("R1"); when(routeMapper.selectById(1L)).thenReturn(r); when(routeMapper.updateById(any())).thenReturn(1); PatrolRouteSetup p=new PatrolRouteSetup(); p.setRouteName("R2"); assertEquals("R2",routeSvc.update(1L,p).getRouteName()); }
+    @Test void testRouteStatus() { PatrolRouteSetup r=new PatrolRouteSetup(); r.setId(1L); r.setStatus("active"); when(routeMapper.selectById(1L)).thenReturn(r); when(routeMapper.updateById(any())).thenReturn(1); routeSvc.updateStatus(1L,"inactive"); assertEquals("inactive",r.getStatus()); }
+    @Test void testCreateForm() { when(formMapper.insert(any())).thenReturn(1); PatrolForm f=formSvc.create("日常巡检表","FORM-001","checklist","{\"fields\":[]}"); assertEquals("active",f.getStatus()); assertEquals("checklist",f.getFormType()); }
+    @Test void testUpdateForm() { PatrolForm f=new PatrolForm(); f.setId(1L); f.setFormName("F1"); when(formMapper.selectById(1L)).thenReturn(f); when(formMapper.updateById(any())).thenReturn(1); PatrolForm p=new PatrolForm(); p.setFormName("F2"); assertEquals("F2",formSvc.update(1L,p).getFormName()); }
+    @Test void testCreateTemplate() { when(tplMapper.insert(any())).thenReturn(1); PatrolTemplate t=tplSvc.create("日常模板","TPL-001",1L,"主管线",1L,"日常巡检表","daily","08:00"); assertEquals("active",t.getStatus()); assertEquals("daily",t.getScheduleType()); }
+    @Test void testUpdateTemplate() { PatrolTemplate t=new PatrolTemplate(); t.setId(1L); t.setTemplateName("T1"); when(tplMapper.selectById(1L)).thenReturn(t); when(tplMapper.updateById(any())).thenReturn(1); PatrolTemplate p=new PatrolTemplate(); p.setTemplateName("T2"); assertEquals("T2",tplSvc.update(1L,p).getTemplateName()); }
+}