feat: 建立可靠通知、吊销与跨实例状态

2026-08-14 01:41:14 +08:00
parent a6a996a518
commit a25bc7abc6
22 changed files with 1017 additions and 245 deletions
@@ -2,8 +2,8 @@ package handler

 import (
 	"bytes"
-	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
@@ -27,8 +27,8 @@ func isUUID(s string) bool {
 }

 // RegisterInspectionRoutes 注册 AI 巡检路由
-func RegisterInspectionRoutes(rg *gin.RouterGroup, db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageBucket string, wechat *service.WechatService, inspectionTemplateID string, appEnv string) {
-	rg.POST("/inspections", middleware.RequirePermission(db, "inspection:create"), createInspection(db, s3, ai, imageBucket, wechat, inspectionTemplateID, appEnv))
+func RegisterInspectionRoutes(rg *gin.RouterGroup, db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, imageBucket string, outbox *service.Outbox, inspectionTemplateID string, appEnv string) {
+	rg.POST("/inspections", middleware.RequirePermission(db, "inspection:create"), createInspection(db, s3, ai, imageBucket, outbox, inspectionTemplateID, appEnv))
 	rg.GET("/inspections", middleware.RequirePermission(db, "inspection:read"), listInspections(db))
 }

@@ -66,7 +66,7 @@ func buildRiskInput(detRes *service.AIDetectResponse) service.RiskInput {

 // createInspection 拍照巡检：图片存 S3 → 调 AI /detect → 写记录。
 // 幂等：客户端传 Idempotency-Key 头时，重复请求返回已有记录。
-func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, bucket string, wechat *service.WechatService, inspectionTemplateID string, appEnv string) gin.HandlerFunc {
+func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient, bucket string, outbox *service.Outbox, inspectionTemplateID string, appEnv string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		idemKey := strings.TrimSpace(c.GetHeader("Idempotency-Key"))
 		roomID := strings.TrimSpace(c.PostForm("roomId"))
@@ -155,38 +155,40 @@ func createInspection(db *gorm.DB, s3 *service.S3Service, ai *service.AIClient,
 				rawRisk, _ := json.Marshal(assessment)
 				rec.RiskAssessment = rawRisk

-				// 微信订阅消息（#11 骨架）：Mock 结果不进入告警，风险非绿且用户已授权时异步推送
-				if !isMock {
-					if key := service.WechatTemplateKey(assessment.Level); key != "" {
-						go func(uid *string, lv string, sc float64) {
-							if uid == nil || !wechat.Configured() || inspectionTemplateID == "" {
-								return
-							}
-							var binding model.WechatBinding
-							if db.Where("user_id = ?", *uid).First(&binding).Error != nil {
-								return
-							}
-							var authorized []string
-							if len(binding.AuthorizedTemplates) > 0 {
-								_ = json.Unmarshal(binding.AuthorizedTemplates, &authorized)
-							}
-							if !service.IsAuthorized(authorized, key) {
-								return
-							}
-							_ = wechat.SendSubscribe(
-								context.Background(),
-								binding.OpenID,
-								inspectionTemplateID,
-								service.BuildSubscribeData(lv, sc),
-								"pages/inspection/index",
-							)
-						}(rec.UserID, assessment.Level, assessment.Score)
-					}
-				}
 			}
 		}

-		if err := db.Create(&rec).Error; err != nil {
+		// 微信订阅消息（#11 骨架）：Mock 不进入告警；业务事务内写 outbox，重启后仍可重试
+		txErr := db.Transaction(func(tx *gorm.DB) error {
+			if err := tx.Create(&rec).Error; err != nil {
+				return err
+			}
+			if rec.AIStatus == "done" && rec.UserID != nil && rec.IsMock != nil && !*rec.IsMock {
+				if key := service.WechatTemplateKey(*rec.RiskLevel); key != "" {
+					payload, _ := json.Marshal(service.WechatSubscribePayload{
+						UserID:       *rec.UserID,
+						TemplateKey:  key,
+						TemplateID:   inspectionTemplateID,
+						Page:         "pages/inspection/index",
+						Title:        "巡检风险提醒",
+						Body:         fmt.Sprintf("风险等级 %s，风险分 %.0f", *rec.RiskLevel, *rec.RiskScore),
+						Data:         service.BuildSubscribeData(*rec.RiskLevel, *rec.RiskScore),
+						BusinessType: "inspection",
+						BusinessID:   rec.ID,
+					})
+					event := service.Event{
+						ID:            "inspection-" + rec.ID + "-" + *rec.RiskLevel,
+						Type:          service.OutboxEventWechatSubscribe,
+						AggregateType: "inspection",
+						AggregateID:   rec.ID,
+						Payload:       payload,
+					}
+					return outbox.PublishTx(tx, event)
+				}
+			}
+			return nil
+		})
+		if txErr != nil {
 			// 并发幂等：唯一索引冲突时返回已有记录
 			if idemKey != "" {
 				var exist model.InspectionRecord