'commit'

Logs/dsSupport.log

@@ -30,3 +30,26 @@
 [Error]2020/09/01 10:08:28 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
 [Error]2020/09/01 10:11:52 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
 [Error]2020/09/01 10:11:52 SqlQueryError 	 sql: expected 16 destination arguments in Scan, not 1
+[Error]2020/09/01 11:37:06 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 11:41:00 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 11:41:00 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:39:52 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:39:52 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:41:51 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:41:51 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:42:31 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:42:31 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:55:41 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:55:41 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:58:23 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:58:23 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:58:58 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 13:58:58 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:00:13 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:00:13 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:01:35 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:01:35 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:03:23 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:03:23 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:13:59 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 14:13:59 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'

dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go

@@ -3,10 +3,12 @@ package DataaccessDAO
 import (
 	"dsSupport/MyModel/MySwagger"
 	"dsSupport/Utils/CacheUtil"
+	"dsSupport/Utils/CommonUtil"
 	"dsSupport/Utils/DbUtil"
 	"dsSupport/Utils/ErrorConst"
 	"dsSupport/Utils/LogUtil"
 	"dsSupport/models"
+	"encoding/json"
 	"fmt"
 )
 
@@ -20,9 +22,35 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32,
 
 	//通过SQL获取带缓存的数据
 	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)
+
+	mergedList := CommonUtil.ListMerge(string(listJson), string(joinListJson), "datasource_id", "id", "source_systemid", "system_id")
+
+	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), "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)
+
+	var datas []map[string]interface{}
+
+	json.Unmarshal([]byte(mergedList), &datas)
+	fmt.Println(datas)
+
 
 	if count > 0 {
-		return true, "数据获取成功", count, list, nil
+		return true, "数据获取成功", count, datas, nil
 	} else {
 		return false, "数据获取失败，数据不存在", count, nil, nil
 	}

dsSupport/Utils/CacheUtil/DaoCache.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"github.com/go-redis/redis/v7"
 	"reflect"
-	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -144,15 +143,8 @@ func batchReadRedis(ids []string, prefix string) ([]map[string]interface{}, []st
 */
 func count(baseSql string, pkField string, args []interface{}) (int32, error) {
 	//替换掉分页代码，获取数据量总数
-<<<<<<< HEAD
 	countSql := strings.Replace(baseSql, "SELECT "+pkField+" ", "SELECT count(*) as count ", -1)
 
-=======
-	reg := regexp.MustCompile(`SELECT ` + pkField + ` `)
-	//countSql := strings.Replace(baseSql, "SELECT "+pkField+" ", "SELECT count(*) as count ", -1)
-	countSql := reg.ReplaceAllString(baseSql, "SELECT count(*) as count ")
-		fmt.Println("countSql==", countSql)
->>>>>>> 95579714412c143215c3682114f3a381c87654f0
 	var count int32
 	//去掉最后的limit+offset
 	args = args[0 : len(args)-2]
@@ -186,7 +178,6 @@ func Page(baseSql string, args ...interface{}) ([]map[string]interface{}, int32,
 	conditionSql := fmt.Sprintf("%s", " limit ? offset ? ")
 	//分页的语句
 	pageSql := fmt.Sprintf("%s %s", baseSql, conditionSql)
-	fmt.Println("pageSql=", pageSql)
 	//分页数据
 	list, err := DbUtil.Engine.SQL(pageSql, args...).Query().List()