|
@@ -313,7 +313,7 @@ func (c *TaskDataController) TaskData_AddS_Excel() {
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
- var T_Data_list_x = 0
|
|
|
+ var T_Data_list_x int
|
|
|
snMaps := make(map[string]string)
|
|
|
var valueStrings []string
|
|
|
for k, val := range rows {
|
|
@@ -336,8 +336,8 @@ func (c *TaskDataController) TaskData_AddS_Excel() {
|
|
|
return
|
|
|
}
|
|
|
t, _ := lib.ReplaceSeconds(val[4])
|
|
|
- valueStrings = append(valueStrings, fmt.Sprintf("('%s','%s',%v,%v,'%v')", val[0], val[1], val[2], val[3], t))
|
|
|
- T_Data_list_x += 1
|
|
|
+ valueStrings = append(valueStrings, fmt.Sprintf("('%s','%s',%v,%v,'%s')", val[0], val[1], val[2], val[3], t))
|
|
|
+ //T_Data_list_x += 1
|
|
|
}
|
|
|
|
|
|
for T_id, T_sn := range snMaps {
|
|
@@ -365,14 +365,56 @@ func (c *TaskDataController) TaskData_AddS_Excel() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- _, is := Task.Adds_TaskData(Task_r.T_task_id, valueStrings)
|
|
|
- if !is {
|
|
|
- c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: 0}
|
|
|
+ // 删除重复数据
|
|
|
+ err = Task.DeleteDeduplicate(T_task_id)
|
|
|
+ if err != nil {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: "导入失败"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
+ // 创建唯一缩影
|
|
|
+ err = Task.Create_Unique_Index(T_task_id)
|
|
|
+ if err != nil {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: "导入失败"}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ pageSize := 10000 // 每页的条数
|
|
|
+ totalPages := len(valueStrings) / pageSize // 总页数
|
|
|
+
|
|
|
+ // 遍历每一页
|
|
|
+ for page := 1; page <= totalPages+1; page++ {
|
|
|
+
|
|
|
+ // 计算当前页的起始索引和结束索引
|
|
|
+ startIndex := (page - 1) * pageSize
|
|
|
+ if startIndex > len(valueStrings) {
|
|
|
+ startIndex = len(valueStrings)
|
|
|
+ }
|
|
|
+ endIndex := page * pageSize
|
|
|
+
|
|
|
+ // 边界判断,如果结束索引超过列表长度,则将结束索引设置为列表最后一个元素的索引加一
|
|
|
+ if endIndex > len(valueStrings) {
|
|
|
+ endIndex = len(valueStrings)
|
|
|
+ }
|
|
|
+
|
|
|
+ fmt.Printf("startIndex %d endIndex %d\n", startIndex, endIndex)
|
|
|
+
|
|
|
+ // 获取当前页的数据
|
|
|
+ currentList := valueStrings[startIndex:endIndex]
|
|
|
+ err = Task.Adds_TaskData(T_task_id, currentList)
|
|
|
+ if err == nil {
|
|
|
+ T_Data_list_x += len(currentList)
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ //err = Task.Adds_TaskData(T_task_id, valueStrings)
|
|
|
+
|
|
|
+ // 删除唯一索引
|
|
|
+ Task.Delete_Unique_Index(T_task_id)
|
|
|
|
|
|
- System.Add_UserLogs_T(T_uuid, "本地版-任务数据", "添加数据"+Task_r.T_name, Task_r.T_task_id+"结果:"+string(T_Data_list_x))
|
|
|
+ System.Add_UserLogs_T(T_uuid, "本地版-任务数据", "添加数据"+Task_r.T_name, Task_r.T_task_id+"结果:"+strconv.Itoa(T_Data_list_x))
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: strconv.Itoa(T_Data_list_x)}
|
|
|
c.ServeJSON()
|