中台数据类型修改

go.sum

@@ -190,8 +190,8 @@ github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03D
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/garyburd/redigo v1.6.2 h1:yE/pwKCrbLpLpQICzYTeZ7JsTA/C53wFTJHaEtRqniM=
 github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -1265,8 +1265,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
@@ -1323,8 +1323,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230626055559-2b719f6c6602 h1:lZ0XCzRDSOBaoJczQudZ3KZhRs4zm5sjboDpwuYZUVM=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230626055559-2b719f6c6602/go.mod h1:Jjhym3U0MFdSgeafHPm758NefCPZpekg2sWPh6Gy6Jk=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230629015708-ea8cd287165b h1:A46qe11IogYGrVbwOp+6T1bW4BFGa8wVQx+ODpAc7WQ=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230629015708-ea8cd287165b/go.mod h1:wBxeFODhYtGenkxXJGThN/VrFaxPvvHMxzpS09pxApM=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

middleground/publicservice.go

@@ -1,6 +1,7 @@
 package middleground
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"jygit.jydev.jianyu360.cn/ApplicationCenter/publicService/rpc/datasmt"
 	"jygit.jydev.jianyu360.cn/ApplicationCenter/publicService/rpc/pb"
@@ -43,8 +44,8 @@ func (u *publicService) NewClient() zrpc.Client {
 	return client
 }
 
-//获取身份列表
-func (p *publicService) List(searchValue, dataType string, pageNum, pageSize int64) *pb.DatasmtRespList {
+//列表数据处理
+func (p *publicService) List(searchValue, dataType string, pageNum, pageSize int64) map[string]interface{} {
 	client := p.NewClient()
 	if client == nil {
 		return nil
@@ -59,5 +60,54 @@ func (p *publicService) List(searchValue, dataType string, pageNum, pageSize int
 		log.Println(err)
 		return nil
 	}
-	return resp
+	result := map[string]interface{}{}
+	result["PageCount"] = resp.PageCount
+	wordMap := map[string]string{}
+	wordArr := []map[string]interface{}{}
+	for _, v := range resp.FieldIllustrate {
+		wordArr = append(wordArr, map[string]interface{}{
+			"code":     v.Code,
+			"Name":     v.Name,
+			"describe": v.Describe,
+		})
+		wordMap[v.Code] = v.Name
+	}
+	arr := []map[string]interface{}{}
+	for _, v := range resp.List {
+		arr = append(arr, map[string]interface{}{
+			"id":             v.Id,
+			"name":           v.Name,
+			"format":         v.Format,
+			"clearStatus":    v.ClearStatus,
+			"clearStatusStr": common.If(v.ClearStatus == "0", "", "人工清洗"),
+			"dataType":       v.DataType,
+			"dataTypeStr":    wordMap[v.DataType],
+		})
+	}
+	result["wordMap"] = wordMap
+	result["FieldIllustrate"] = wordArr
+	result["hotKeys"] = resp.HotKeys
+	return result
+}
+func (p *publicService) Detail(id string) map[string]interface{} {
+	client := p.NewClient()
+	if client == nil {
+		return nil
+	}
+	resp, err := datasmt.NewDatasmt(client).Detail(context.Background(), &pb.DatasmtReqDetail{
+		Id: id})
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+	result := map[string]interface{}{}
+	result["name"] = resp.Name
+	result["dataTypeStr"] = resp.FieldIllustrate.Name
+	result["dataType"] = resp.FieldIllustrate.Code
+	result["describe"] = resp.FieldIllustrate.Describe
+	result["clearStatusStr"] = common.If(resp.ClearStatus == "0", "", "人工清洗")
+	result["clearStatus"] = resp.ClearStatus
+	result["dataExample"] = resp.DataExample
+	result["format"] = resp.Format
+	return result
 }