|
@@ -6,6 +6,7 @@ import (
|
|
|
"github.com/beego/beego/v2/adapter/orm"
|
|
|
orm2 "github.com/beego/beego/v2/client/orm"
|
|
|
_ "github.com/go-sql-driver/mysql"
|
|
|
+ "strings"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
@@ -93,11 +94,34 @@ func VerifyTemplateMapDataToVerifyTemplateMapData_R(T VerifyTemplateMap, VerifyT
|
|
|
T_r.T_value = ""
|
|
|
if v, ok := VerifyTemplateMapData[T.T_id]; ok {
|
|
|
T_r.T_value = v.T_value
|
|
|
+ if T.T_label == 3 {
|
|
|
+ T_r.T_value = DeleteDeduplicateValue(v.T_value)
|
|
|
+ }
|
|
|
T_r.T_start_time = v.T_start_time
|
|
|
}
|
|
|
return T_r
|
|
|
}
|
|
|
|
|
|
+// 去掉重复测点
|
|
|
+func DeleteDeduplicateValue(input string) (output string) {
|
|
|
+ // 分割字符串
|
|
|
+ parts := lib.SplitStringSeparator(input, "|")
|
|
|
+
|
|
|
+ // 使用map去重
|
|
|
+ seen := make(map[string]bool)
|
|
|
+ var result []string
|
|
|
+
|
|
|
+ for _, part := range parts {
|
|
|
+ if !seen[part] {
|
|
|
+ seen[part] = true
|
|
|
+ result = append(result, part)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 重新拼接
|
|
|
+ return strings.Join(result, "|")
|
|
|
+}
|
|
|
+
|
|
|
// 添加或更新模版数据 并添加历史数据
|
|
|
func AddOrUpdate_VerifyTemplateMapData_ADD_History(List []VerifyTemplateMapData, T_source int, T_uuid string) (ids []int64, is bool) {
|
|
|
o := orm.NewOrm()
|