diff --git a/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go b/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go index d1bec939..34ac2105 100644 --- a/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go +++ b/dsDataex/MyService/DataEX/DataexDAO/DataexDAO.go @@ -303,15 +303,63 @@ func SaveDataError(fails []MySwagger.FailResult,datas []MySwagger.Data ,SystemId var sqls []string var sql string - for no:=1;no< len(fails);no++{ + //for no:=1;no< len(fails);no++{ + // + // sql="insert into t_dataex_error (id,system_id,datasource_id,create_time,delete_flag,enable_flag) values ('"+strings.ToLower(uuid.NewV4().String())+"','"+SystemId+"','"+DatasourceId+"','"+createTime.Format("2006-01-02 15:04:05")+"',-1,1)" + // + // sqls=append(sqls,sql) + //} - sql="insert into t_dataex_error (id,system_id,datasource_id,create_time,delete_flag,enable_flag) values ('"+strings.ToLower(uuid.NewV4().String())+"','"+SystemId+"','"+DatasourceId+"','"+createTime.Format("2006-01-02 15:04:05")+"',-1,1)" + for no:=0;no< len(datas);no++{ + for no2:=1;no2< len(fails);no2++{ + if datas[no].DataID == fails[no2].FailID{ - sqls=append(sqls,sql) + sql="insert into t_dataex_error (id,system_id,datasource_id,org_id,data_id,error_info,create_time,delete_flag,enable_flag) values ('"+strings.ToLower(uuid.NewV4().String())+"','"+SystemId+"','"+DatasourceId+"','"+datas[no].OrgID+"','"+datas[no].DataID+"','"+fails[no2].FailReason+"','"+createTime.Format("2006-01-02 15:04:05")+"',-1,1)" + + sqls=append(sqls,sql) + + continue + } + } } DbUtil.Engine.Sqls(sqls).Execute() } + return true, "数据添加成功", nil +} + +func SaveDataError2(fails []MySwagger.FailResult,datas []MySwagger.Data ,SystemId string,DatasourceId string) (bool, string, error) { + + var sqls []string + var sql string + var createTime =time.Now() + + for no:=0;no< len(datas);no++{ + for no2:=0;no2< len(fails);no2++{ + if datas[no].DataID == fails[no2].FailID{ + + bytes, _ := json.Marshal(datas[no].Data) + + sql="insert into t_dataex_error (id,system_id,datasource_id,org_id,data_id,data_content,create_time,delete_flag,enable_flag) values ('"+strings.ToLower(uuid.NewV4().String())+"','"+SystemId+"','"+DatasourceId+"','"+datas[no].OrgID+"','"+datas[no].DataID+"','"+string(bytes)+"','"+createTime.Format("2006-01-02 15:04:05")+"',-1,1)" + + sqls=append(sqls,sql) + + fmt.Println("[DataexDAO] ES Error :", fails[0].FailReason) + + continue + } + } + } + + _,_,err:=DbUtil.Engine.Sqls(sqls).Execute() + + if err != nil { + + fmt.Println("[DataexDAO] MySQL Error :", err) + + LogUtil.Error(ErrorConst.SqlUpdateError, "SaveDataError,数据库操作发生严重错误:"+err.Error()) + } + return true, "数据添加成功", nil } \ No newline at end of file diff --git a/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go b/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go index 2e38d870..04896ab9 100644 --- a/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go +++ b/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go @@ -278,7 +278,7 @@ func OrgtreeProcBatch(datas []MySwagger.Data) { sql = "update t_dataex_orgtree set org_name = '" + jsonData["org_name"].(string)+"',org_type="+ orgType +",school_type='"+schoolType+"',parent_id ='" + parentID + "',province_id='"+provinceId+"',city_id='"+cityId+"',area_id='"+areaId+"',change_time='"+time.Now().Format("2006-01-02 15:04:05")+"' where id='" + IDs[no] + "'" }else { - sql = "insert into t_dataex_orgtree (id,org_name,org_type,school_type,parent_id,province_id,city_id,area_id,create_time,delete_flag,enable_flag) values ('"+jsonData["org_id"].(string)+"','"+jsonData["org_name"].(string)+"',"+orgType+",'"+schoolType+"','"+parentID+"','"+provinceId+"','"+cityId+"','"+areaId+"','"+time.Now().Format("2006-01-02 15:04:05")+"',-1,1)" + sql = "insert into t_dataex_orgtree (id,org_name,org_type,school_type,parent_id,province_id,city_id,area_id,create_time,delete_flag,enable_flag) values ('"+strings.ToLower(jsonData["org_id"].(string))+"','"+jsonData["org_name"].(string)+"',"+orgType+",'"+schoolType+"','"+parentID+"','"+provinceId+"','"+cityId+"','"+areaId+"','"+time.Now().Format("2006-01-02 15:04:05")+"',-1,1)" } sqls=append(sqls,sql)