diff --git a/Logs/dsSupport.log b/Logs/dsSupport.log index 7a258f98..54bd6aad 100644 --- a/Logs/dsSupport.log +++ b/Logs/dsSupport.log @@ -77,3 +77,50 @@ [Error]2020/09/01 15:42:42 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value [Error]2020/09/01 15:44:09 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value [Error]2020/09/01 15:45:10 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value +[Error]2020/09/01 15:52:04 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:52:04 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:57:41 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:57:41 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:59:41 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:59:41 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 16:04:12 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 16:04:12 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 16:04:41 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 16:04:41 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 16:18:54 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:18:54 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:18:54 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:20:53 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:20:53 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:20:53 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:22:44 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:22:44 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:22:44 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:23:26 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 16:26:09 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:26:09 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:26:09 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:26:34 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:26:34 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:26:34 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:31:48 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:31:48 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:31:48 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:32:06 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:32:06 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:32:06 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:33:57 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:33:57 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:33:57 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:35:37 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:35:37 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:35:37 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:36:00 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:36:00 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:36:00 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:38:16 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:38:16 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:38:16 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:38:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:38:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value +[Error]2020/09/01 16:38:24 SqlQueryError WRONGTYPE Operation against a key holding the wrong kind of value diff --git a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go index 55a5c188..cb390c9a 100644 --- a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go +++ b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go @@ -24,28 +24,26 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32, list, count, _ := CacheUtil.Page(sql, 100, query.Page) listJson, _ :=json.Marshal(list) - sql = "SELECT id FROM t_dataex_datasource WHERE 1 = 1" - joinList, _, _ := CacheUtil.Page(sql, 10000, 1) - joinListJson, _ := json.Marshal(joinList) + sql1 := "SELECT id FROM t_dataex_datasource WHERE 1 = 1" + joinList1, _, _ := CacheUtil.Page(sql1, 10000, 0) + joinListJson1, _ := json.Marshal(joinList1) + mergedList1 := CommonUtil.ListMerge(string(listJson), string(joinListJson1), "datasource_id", "id", "source_systemid", "system_id") - mergedList := CommonUtil.ListMerge(string(listJson), string(joinListJson), "datasource_id", "id", "source_systemid", "system_id") + sql2 := "SELECT app_id FROM t_app_base WHERE 1 = 1" + joinList2, _, _ := CacheUtil.Page(sql2, 10000, 0) + joinListJson2, _ := json.Marshal(joinList2) + mergedList2 := CommonUtil.ListMerge(mergedList1, string(joinListJson2), "source_systemid", "app_id", "source_systemname", "app_name") - sql = "SELECT id FROM t_app_base WHERE 1 = 1" - joinList, _, _ = CacheUtil.Page(sql, 10000, 1) - joinListJson, _ = json.Marshal(joinList) + sql3 := "SELECT app_id FROM t_app_base WHERE 1 = 1" + joinList3, _, _ := CacheUtil.Page(sql3, 10000, 0) + joinListJson3, _ := json.Marshal(joinList3) + mergedList3 := CommonUtil.ListMerge(mergedList2, string(joinListJson3), "consume_systemid", "app_id", "consume_systemname", "app_name") - mergedList = CommonUtil.ListMerge(mergedList, string(joinListJson), "system_id", "app_id", "source_systemname", "app_name") - - sql = "SELECT id FROM t_app_base WHERE 1 = 1" - joinList, _, _ = CacheUtil.Page(sql, 10000, 1) - joinListJson, _ = json.Marshal(joinList) - - mergedList = CommonUtil.ListMerge(mergedList, string(joinListJson), "consume_systemid", "app_id", "consume_systemname", "app_name") - fmt.Println(mergedList) + fmt.Println(mergedList3) var datas []map[string]interface{} - json.Unmarshal([]byte(mergedList), &datas) + json.Unmarshal([]byte(mergedList3), &datas) fmt.Println(datas)