|
@@ -35,7 +35,7 @@ func (t *TaskData) TableName() string {
|
|
var redisCache_TaskData cache.Cache
|
|
var redisCache_TaskData cache.Cache
|
|
|
|
|
|
func init() {
|
|
func init() {
|
|
- orm2.Debug = true
|
|
|
|
|
|
+ //orm2.Debug = true
|
|
config := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
|
|
config := fmt.Sprintf(`{"key":"%s","conn":"%s","dbNum":"%s","password":"%s"}`,
|
|
"redis_"+"TaskData", conf.Redis_address, conf.Redis_dbNum, conf.Redis_password)
|
|
"redis_"+"TaskData", conf.Redis_address, conf.Redis_dbNum, conf.Redis_password)
|
|
logs.Println(config)
|
|
logs.Println(config)
|
|
@@ -398,49 +398,52 @@ func Add_TaskData(T_task_id string, T_sn string, T_id string, T_t string, T_rh s
|
|
return true
|
|
return true
|
|
}
|
|
}
|
|
|
|
|
|
-func Adds_TaskData(T_task_id string, valueStrings []string) (int64, bool) {
|
|
|
|
-
|
|
|
|
|
|
+// 创建唯一索引
|
|
|
|
+func Create_Unique_Index(T_task_id string) error {
|
|
|
|
+ // 创建索引
|
|
o := orm.NewOrm()
|
|
o := orm.NewOrm()
|
|
-
|
|
|
|
- // 删除重复数据
|
|
|
|
- err := DeleteDeduplicate(T_task_id)
|
|
|
|
- if err != nil {
|
|
|
|
|
|
+ createIndexSql := "ALTER TABLE z_task_data_" + T_task_id + " ADD CONSTRAINT unique_index_t_sn_t_id_t_time UNIQUE (t_sn, t_id, t_time);"
|
|
|
|
+ //fmt.Println(sql)
|
|
|
|
+ _, err := o.Raw(createIndexSql).Exec()
|
|
|
|
+ if err != nil && !strings.Contains(err.Error(), "Duplicate key name 'unique_index_t_sn_t_id_t_time'") {
|
|
logs.Error(lib.FuncName(), err)
|
|
logs.Error(lib.FuncName(), err)
|
|
- return 0, false
|
|
|
|
|
|
+ return err
|
|
}
|
|
}
|
|
|
|
+ return nil
|
|
|
|
+}
|
|
|
|
|
|
|
|
+// 删除唯一索引
|
|
|
|
+func Delete_Unique_Index(T_task_id string) error {
|
|
// 创建索引
|
|
// 创建索引
|
|
- createIndexSql := "ALTER TABLE z_task_data_" + T_task_id + " ADD CONSTRAINT unique_index_t_sn_t_id_t_time UNIQUE (t_sn, t_id, t_time);"
|
|
|
|
|
|
+ o := orm.NewOrm()
|
|
|
|
+ // 删除索引
|
|
|
|
+ deleteIndexSql := "ALTER TABLE z_task_data_" + T_task_id + " DROP INDEX unique_index_t_sn_t_id_t_time;"
|
|
//fmt.Println(sql)
|
|
//fmt.Println(sql)
|
|
- _, err = o.Raw(createIndexSql).Exec()
|
|
|
|
- if err != nil && !strings.Contains(err.Error(), "Duplicate key name 'unique_index_t_sn_t_id_t_time'") {
|
|
|
|
|
|
+ _, err := o.Raw(deleteIndexSql).Exec()
|
|
|
|
+ if err != nil {
|
|
logs.Error(lib.FuncName(), err)
|
|
logs.Error(lib.FuncName(), err)
|
|
- return 0, false
|
|
|
|
|
|
+ return err
|
|
}
|
|
}
|
|
|
|
+ return nil
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+func Adds_TaskData(T_task_id string, valueStrings []string) error {
|
|
|
|
+
|
|
|
|
+ o := orm.NewOrm()
|
|
|
|
|
|
// 插入数据
|
|
// 插入数据
|
|
sql := "INSERT INTO z_task_data_" + T_task_id + " (`t_sn`, `t_id`, `t_t`, `t_rh`, `t_time`) VALUES"
|
|
sql := "INSERT INTO z_task_data_" + T_task_id + " (`t_sn`, `t_id`, `t_t`, `t_rh`, `t_time`) VALUES"
|
|
sql += strings.Join(valueStrings, ",")
|
|
sql += strings.Join(valueStrings, ",")
|
|
sql += " ON DUPLICATE KEY UPDATE t_t = VALUES(t_t), t_rh = VALUES(t_rh)"
|
|
sql += " ON DUPLICATE KEY UPDATE t_t = VALUES(t_t), t_rh = VALUES(t_rh)"
|
|
//fmt.Println(sql)
|
|
//fmt.Println(sql)
|
|
- res, err := o.Raw(sql).Exec()
|
|
|
|
- if err != nil {
|
|
|
|
- logs.Error(lib.FuncName(), err)
|
|
|
|
- return 0, false
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- // 删除索引
|
|
|
|
- deleteIndexSql := "ALTER TABLE z_task_data_" + T_task_id + " DROP INDEX unique_index_t_sn_t_id_t_time;"
|
|
|
|
- //fmt.Println(sql)
|
|
|
|
- _, err = o.Raw(deleteIndexSql).Exec()
|
|
|
|
|
|
+ _, err := o.Raw(sql).Exec()
|
|
if err != nil {
|
|
if err != nil {
|
|
logs.Error(lib.FuncName(), err)
|
|
logs.Error(lib.FuncName(), err)
|
|
- return 0, false
|
|
|
|
|
|
+ return err
|
|
}
|
|
}
|
|
- num, _ := res.RowsAffected()
|
|
|
|
|
|
|
|
//fmt.Println("mysql row affected nums: ", num)
|
|
//fmt.Println("mysql row affected nums: ", num)
|
|
- return num, true
|
|
|
|
|
|
+ return nil
|
|
}
|
|
}
|
|
|
|
|
|
// 修改
|
|
// 修改
|