From dfd68d7befce08863c33c20fb5d1e17f62d65e01 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 20 十二月 2024 02:44:37 +0800
Subject: [PATCH] 修改年龄段查询
---
models/disappear.go | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/models/disappear.go b/models/disappear.go
index e65907f..8ad5215 100644
--- a/models/disappear.go
+++ b/models/disappear.go
@@ -3,6 +3,7 @@
import (
"errors"
"fmt"
+ "strconv"
"strings"
"time"
@@ -21,7 +22,8 @@
DisappearTime int // 娑堝け鏃堕棿, 鍗曚綅灏忔椂
AlarmInterval int // 鎶ヨ鏃堕棿闂撮殧, 鍗曚綅澶�
LastDirection string // 鏈�鍚庝竴娆℃姄鎷�
- PersonAge int // 骞撮緞
+ MaxAge int // 骞撮緞
+ MinAge int // 骞撮緞
Task *db.ModelTask
}
@@ -52,8 +54,10 @@
}
if v.Alias == "age" {
- if val, ok := v.Value.(float64); ok {
- m.PersonAge = int(val)
+ if val, ok := v.Value.(string); ok {
+ ages := strings.Split(val, ",")
+ m.MinAge, _ = strconv.Atoi(ages[0])
+ m.MaxAge, _ = strconv.Atoi(ages[1])
}
}
@@ -90,7 +94,7 @@
results := make([]*db.ModelTaskResults, 0)
var ageFilter, labelFilter, keyFilter, lastFilter []PersonInfo
- if m.PersonAge > 0 {
+ if m.MinAge > 0 {
err := db.GetDB().Raw(`
SELECT
s.document_number,
@@ -110,15 +114,21 @@
AND TIMESTAMPDIFF(
YEAR,
STR_TO_DATE( CASE WHEN LENGTH( id_card ) = 18 THEN SUBSTRING( id_card, 7, 8 ) ELSE NULL END, '%Y%m%d' ),
- CURDATE( ) > ?
- `, m.PersonAge).Scan(&ageFilter).Error
+ CURDATE( ) >= ?
+ AND TIMESTAMPDIFF(
+ YEAR,
+ STR_TO_DATE( CASE WHEN LENGTH( id_card ) = 18 THEN SUBSTRING( id_card, 7, 8 ) ELSE NULL END, '%Y%m%d' ),
+ CURDATE( ) <= ?
+ `, m.MinAge, m.MaxAge).Scan(&ageFilter).Error
if err != nil {
logger.Warnf(err.Error())
}
if len(ageFilter) == 0 {
- return fmt.Errorf("no results found that match the age condition %d", m.PersonAge)
+ return fmt.Errorf("no results found that match the age condition %s - %s", m.MinAge, m.MaxAge)
}
+
+ logger.Debugf("match age result %d", len(ageFilter))
}
if m.PersonLabel != "" {
@@ -147,12 +157,14 @@
if len(labelFilter) == 0 {
return fmt.Errorf("no results found that match the label condition %s", m.PersonLabel)
}
+
+ logger.Debugf("match label result %d", len(labelFilter))
}
// 鍚堝苟涓�涓嬫潯浠�
- if m.PersonAge > 0 && m.PersonLabel != "" {
+ if m.MinAge > 0 && m.PersonLabel != "" {
lastFilter = intersectPersonInfo(ageFilter, labelFilter)
- } else if m.PersonAge > 0 {
+ } else if m.MinAge > 0 {
lastFilter = ageFilter
} else if m.PersonLabel != "" {
lastFilter = labelFilter
@@ -182,6 +194,8 @@
if err != nil {
logger.Warnf(err.Error())
}
+
+ logger.Debugf("match key person result %d", len(keyFilter))
}
if len(lastFilter) > 0 {
@@ -190,6 +204,7 @@
lastFilter = keyFilter
}
+ logger.Debugf("last result %d", len(lastFilter))
for _, p := range lastFilter {
if len(m.AreaIds) > 0 {
_, o1 := m.AreaIds[p.CommunityId]
--
Gitblit v1.8.0