Merge branch 'dev_wh' of ApplicationCenter/publicService into master

rpc/pb/publicservice.pb.go

@@ -373,6 +373,7 @@ type DatasmtRespDetail struct {
 	FieldIllustrate *Field `protobuf:"bytes,5,opt,name=field_illustrate,json=fieldIllustrate,proto3" json:"field_illustrate,omitempty"` //包含字段说明
 	DataExample     string `protobuf:"bytes,6,opt,name=data_example,json=dataExample,proto3" json:"data_example,omitempty"`             //数据示例图片路径
 	Introduce       string `protobuf:"bytes,7,opt,name=introduce,proto3" json:"introduce,omitempty"`
+	Keyword         string `protobuf:"bytes,8,opt,name=keyword,proto3" json:"keyword,omitempty"`
 }
 
 func (x *DatasmtRespDetail) Reset() {
@@ -456,6 +457,13 @@ func (x *DatasmtRespDetail) GetIntroduce() string {
 	return ""
 }
 
+func (x *DatasmtRespDetail) GetKeyword() string {
+	if x != nil {
+		return x.Keyword
+	}
+	return ""
+}
+
 var File_publicservice_proto protoreflect.FileDescriptor
 
 var file_publicservice_proto_rawDesc = []byte{
@@ -497,7 +505,7 @@ var file_publicservice_proto_rawDesc = []byte{
 	0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
 	0x22, 0x22, 0x0a, 0x10, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74, 0x52, 0x65, 0x71, 0x44, 0x65,
 	0x74, 0x61, 0x69, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0xf3, 0x01, 0x0a, 0x11, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74,
+	0x52, 0x02, 0x69, 0x64, 0x22, 0x8d, 0x02, 0x0a, 0x11, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74,
 	0x52, 0x65, 0x73, 0x70, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
 	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b,
 	0x0a, 0x09, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
@@ -512,15 +520,16 @@ var file_publicservice_proto_rawDesc = []byte{
 	0x61, 0x5f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x0b, 0x64, 0x61, 0x74, 0x61, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09,
 	0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x32, 0x65, 0x0a, 0x07, 0x64, 0x61,
-	0x74, 0x61, 0x73, 0x6d, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0f, 0x2e,
-	0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74, 0x52, 0x65, 0x71, 0x4c, 0x69, 0x73, 0x74, 0x1a, 0x10,
-	0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x4c, 0x69, 0x73, 0x74,
-	0x12, 0x2f, 0x0a, 0x06, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x11, 0x2e, 0x44, 0x61, 0x74,
-	0x61, 0x73, 0x6d, 0x74, 0x52, 0x65, 0x71, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x1a, 0x12, 0x2e,
-	0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x44, 0x65, 0x74, 0x61, 0x69,
-	0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x09, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65,
+	0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79,
+	0x77, 0x6f, 0x72, 0x64, 0x32, 0x65, 0x0a, 0x07, 0x64, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74, 0x12,
+	0x29, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0f, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d,
+	0x74, 0x52, 0x65, 0x71, 0x4c, 0x69, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73,
+	0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x44, 0x65,
+	0x74, 0x61, 0x69, 0x6c, 0x12, 0x11, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d, 0x74, 0x52, 0x65,
+	0x71, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x1a, 0x12, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6d,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

rpc/publicservice.proto

@@ -43,6 +43,7 @@ message DatasmtRespDetail {
   Field field_illustrate = 5;  //包含字段说明
   string data_example = 6;      //数据示例图片路径
   string introduce=7;
+  string keyword=8;
 }
 
 

rpc/service/datasmt.go

@@ -83,7 +83,7 @@ func (d *DataSmt) List(searchValue, dataType string, pageNum, pageSize int64) *p
 // 详情
 func (d *DataSmt) Detail(id string) *pb.DatasmtRespDetail {
 	result := &pb.DatasmtRespDetail{}
-	querySql := fmt.Sprintf("select  id,name,data_type,format,clear_status,data_example,introduce from   %s where id =%s", DATA_SUPERMARKET, id)
+	querySql := fmt.Sprintf("select  id,name,data_type,format,clear_status,data_example,introduce,keyword from   %s where id =%s", DATA_SUPERMARKET, id)
 	data := db.Mysql_BaseService.SelectBySql(querySql)
 	if data != nil && len(*data) > 0 {
 		//数据处理