From 6597287fc412ce914aba41fe571ed05817cf371c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 27 五月 2024 11:34:58 +0800
Subject: [PATCH] fix script
---
task/service.go | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/task/service.go b/task/service.go
index 2f807ad..dbc89b7 100644
--- a/task/service.go
+++ b/task/service.go
@@ -2,20 +2,16 @@
import (
"basic.com/valib/logger.git"
- "fmt"
- "ruleModelEngine/cache"
+ "ruleModelEngine/config"
"ruleModelEngine/db"
+ "strconv"
"time"
)
-type alarmRule struct {
- ruleId int
- ruleText string
-}
-
func TaskAnalysisService(id string) {
- alarmRules := make([]alarmRule, 0)
- time.Sleep(time.Second * 2)
+ //fmt.Println("甯冩帶鍏ュ彛")
+ alarmRules := make([]db.AlarmRule, 0)
+ time.Sleep(time.Millisecond * 1)
var taskPerson db.TaskPerson
var err error
for i := 0; i <= 2; i++ {
@@ -26,47 +22,66 @@
if taskPerson.Id != "" {
break
}
- time.Sleep(time.Second * 15)
+ time.Sleep(time.Second * 1)
}
- fmt.Println("personInfo: ", taskPerson)
- fmt.Println("device: ", cache.Device)
+ //fmt.Println("personInfo: ", taskPerson)
+ //fmt.Println("device: ", cache.Device)
tasks, err := db.GetAllTaskData()
if err != nil {
logger.Error("GetAllTaskData Error", err)
}
- fmt.Println(tasks)
+ //fmt.Println(tasks)
for _, task := range tasks {
switch task.Name {
case "鏈垚骞村嚭椤舵ゼ":
flag := UnderageClimbingToRooftop(taskPerson)
if flag == true {
- alarmRules = append(alarmRules, alarmRule{ruleId: task.Id, ruleText: task.Name})
+ alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(task.Id), RuleText: task.Name, AlarmLevel: "0"})
}
case "鏈垚骞村叆鍟嗕綇妤�":
flag := UnderageEnteringCommercialBuilding(taskPerson)
if flag == true {
- alarmRules = append(alarmRules, alarmRule{ruleId: task.Id, ruleText: task.Name})
+ alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(task.Id), RuleText: task.Name, AlarmLevel: "0"})
}
case "绐滄ゼ":
- flag := ClimbingFloorsIllegally(taskPerson)
+ flag := ClimbingFloorsIllegally(taskPerson, config.Api.CsHours, config.Api.CsTimes)
if flag == true {
- alarmRules = append(alarmRules, alarmRule{ruleId: task.Id, ruleText: task.Name})
+ alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(task.Id), RuleText: task.Name, AlarmLevel: "0"})
}
- case "鍙繘涓嶅嚭":
- flag := EnteringButNotLeaving(taskPerson)
- if flag == true {
- alarmRules = append(alarmRules, alarmRule{ruleId: task.Id, ruleText: task.Name})
- }
+ case "杩涘嚭寮傚父":
+ continue
+ //days := config.Api.AInterval
+ //docNumIdMap, err := db.QueryLastIdByDayRange(days, days-1)
+ //if err != nil {
+ // logger.Error("QueryByDayRange err: ", err)
+ //}
+ //
+ //for docNumber, id := range docNumIdMap {
+ // flag := EnteringButNotLeaving(docNumber, id, days)
+ // alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(task.Id), RuleText: task.Name, AlarmLevel: "0"})
+ //
+ // if flag == true {
+ // alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(task.Id), RuleText: task.Name, AlarmLevel: "0"})
+ // }
+ //}
+
case "鐢充綇涓嶄竴":
flag := registeredAddressNotMatchActualResidence(taskPerson)
if flag == true {
- alarmRules = append(alarmRules, alarmRule{ruleId: task.Id, ruleText: task.Name})
+ alarmRules = append(alarmRules, db.AlarmRule{RuleId: strconv.Itoa(task.Id), RuleText: task.Name, AlarmLevel: "0"})
}
default:
continue
}
}
+ addFlag, err := db.AddAlarmRules(alarmRules, id)
+ if err != nil {
+ logger.Error("AddAlarmRules err: ", err)
+ }
+ if addFlag == true {
+ logger.Info("AddAlarmRules success: ", id)
+ }
}
--
Gitblit v1.8.0