From 4a7128321eb71e43b9d62b41c61a964df39ccfad Mon Sep 17 00:00:00 2001 From: lzh Date: Wed, 11 Mar 2026 17:33:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(ops):=20=E5=AE=89=E4=BF=9D=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=E4=B8=8E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - security-biz pom 新增 ops-biz、iot-api 依赖 - ops-server pom 引入 security-biz 模块 - 新增 SECURITY_GUARD 操作人类型、ALARM 来源类型 - 新增安保相关错误码 - dev/local 配置新增安保数据源 Co-Authored-By: Claude Opus 4.6 --- .../module/ops/enums/ErrorCodeConstants.java | 6 ++++ .../module/ops/enums/OperatorTypeEnum.java | 3 +- .../module/ops/enums/SourceTypeEnum.java | 3 +- .../viewsh-module-ops-server/pom.xml | 28 +++++++++++-------- .../src/main/resources/application-dev.yaml | 5 ++++ .../src/main/resources/application-local.yaml | 5 ++++ .../viewsh-module-security-biz/pom.xml | 7 +++++ 7 files changed, 44 insertions(+), 13 deletions(-) diff --git a/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/ErrorCodeConstants.java b/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/ErrorCodeConstants.java index ca60e2c..c6e7341 100644 --- a/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/ErrorCodeConstants.java +++ b/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/ErrorCodeConstants.java @@ -16,6 +16,12 @@ public interface ErrorCodeConstants { ErrorCode AREA_PARENT_LOOP = new ErrorCode(1_020_001_003, "不能将父级设置为自己或子孙节点"); ErrorCode AREA_CODE_EXISTS = new ErrorCode(1_020_001_004, "区域编码已存在"); + // ========== 安保工单 1-020-003-000 ============ + ErrorCode SECURITY_ORDER_NOT_FOUND = new ErrorCode(1_020_003_000, "工单不存在"); + ErrorCode SECURITY_ORDER_TYPE_MISMATCH = new ErrorCode(1_020_003_001, "工单类型不匹配，期望安保工单"); + ErrorCode SECURITY_AREA_USER_DUPLICATE = new ErrorCode(1_020_003_002, "该安保人员已绑定到此区域"); + ErrorCode SECURITY_AREA_USER_NOT_FOUND = new ErrorCode(1_020_003_003, "绑定记录不存在"); + // ========== 区域设备关联 1-020-002-000 ============ ErrorCode DEVICE_NOT_FOUND = new ErrorCode(1_020_002_000, "设备不存在"); ErrorCode DEVICE_ALREADY_BOUND = new ErrorCode(1_020_002_001, "该工牌已绑定至此区域"); diff --git a/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/OperatorTypeEnum.java b/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/OperatorTypeEnum.java index 740d3cb..9736241 100644 --- a/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/OperatorTypeEnum.java +++ b/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/OperatorTypeEnum.java @@ -18,7 +18,8 @@ public enum OperatorTypeEnum implements ArrayValuable { SYSTEM("SYSTEM", "系统"), CLEANER("CLEANER", "保洁员"), INSPECTOR("INSPECTOR", "巡检员"), - ADMIN("ADMIN", "管理员"); + ADMIN("ADMIN", "管理员"), + SECURITY_GUARD("SECURITY_GUARD", "安保员"); public static final String[] ARRAYS = Arrays.stream(values()).map(OperatorTypeEnum::getType).toArray(String[]::new); diff --git a/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/SourceTypeEnum.java b/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/SourceTypeEnum.java index a358e8b..bd7b013 100644 --- a/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/SourceTypeEnum.java +++ b/viewsh-module-ops/viewsh-module-ops-api/src/main/java/com/viewsh/module/ops/enums/SourceTypeEnum.java @@ -18,7 +18,8 @@ public enum SourceTypeEnum implements ArrayValuable { TRAFFIC("TRAFFIC", "系统触发"), INSPECTION("INSPECTION", "巡检发现"), MANUAL("MANUAL", "手动创建"), - SCHEDULE("SCHEDULE", "定时排班"); + SCHEDULE("SCHEDULE", "定时排班"), + ALARM("ALARM", "告警触发"); public static final String[] ARRAYS = Arrays.stream(values()).map(SourceTypeEnum::getType).toArray(String[]::new); diff --git a/viewsh-module-ops/viewsh-module-ops-server/pom.xml b/viewsh-module-ops/viewsh-module-ops-server/pom.xml index 1ec8495..716a022 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/pom.xml +++ b/viewsh-module-ops/viewsh-module-ops-server/pom.xml @@ -91,6 +91,12 @@ viewsh-spring-boot-starter-security + + + com.viewsh + viewsh-spring-boot-starter-protection + + com.viewsh @@ -126,17 +132,17 @@ viewsh-spring-boot-starter-job - - - com.viewsh - viewsh-spring-boot-starter-mq - - - org.apache.rocketmq - rocketmq-spring-boot-starter - - - + + + com.viewsh + viewsh-spring-boot-starter-mq + + + org.apache.rocketmq + rocketmq-spring-boot-starter + + + com.viewsh viewsh-spring-boot-starter-test diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-dev.yaml b/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-dev.yaml index acc3c5d..451f5f4 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-dev.yaml +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-dev.yaml @@ -164,6 +164,11 @@ wx: # 芋道配置项，设置当前项目所有自定义的配置 viewsh: demo: true # 开启演示模式 + # API 签名配置：外部系统调用开放接口时使用（如安保工单的告警系统） + signature: + apps: + # 告警系统 - 用于安保工单的创建和自动完单接口 + alarm-system: "tQ3v5q1z2ZLu7hrU1yseaHwg1wJUcmF1" justauth: enabled: true diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-local.yaml b/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-local.yaml index 63f45f8..d1e926f 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-local.yaml +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/resources/application-local.yaml @@ -152,3 +152,8 @@ viewsh: mock-enable: true access-log: # 访问日志的配置项 enable: false + # API 签名配置：外部系统调用开放接口时使用（如安保工单的告警系统） + signature: + apps: + # 告警系统 - 用于安保工单的创建和自动完单接口 + alarm-system: "tQ3v5q1z2ZLu7hrU1yseaHwg1wJUcmF1" diff --git a/viewsh-module-ops/viewsh-module-security-biz/pom.xml b/viewsh-module-ops/viewsh-module-security-biz/pom.xml index b24d752..4203daf 100644 --- a/viewsh-module-ops/viewsh-module-security-biz/pom.xml +++ b/viewsh-module-ops/viewsh-module-security-biz/pom.xml @@ -48,5 +48,12 @@ com.viewsh viewsh-spring-boot-starter-biz-tenant + + + + com.viewsh + viewsh-spring-boot-starter-test + test +