Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/scala/com/winhc/bigdata/spark/jobs/chance/CompanyChangeHandle.scala

src/main/scala/com/winhc/bigdata/spark/jobs/chance/CompanyChangeHandle.scala

@@ -76,8 +76,10 @@ trait CompanyChangeHandle extends Serializable with Logging {
 //土地公示
 case class company_land_publicity(equCols: Seq[String]) extends CompanyChangeHandle with Serializable {
 
-  override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = "1"
-
+  override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = {
+    val str = ChangeExtractUtils.getTags(newMap, "地块公示", Array("project_name", "location", "application_name", "area", "final_price", "land_num"))
+    str
+  }
   override def getBizTime(newMap: Map[String, String]): String = "业务时间"
 
   override def getUpdateTitle(newMap: Map[String, String]): String = "更新某地块公示"
@@ -98,7 +100,6 @@ case class company(equCols: Seq[String]) extends CompanyChangeHandle with Serial
   override def getInsertTitle(newMap: Map[String, String]): String = "新增一家公司"
 }
 
-//商标
 case class company_tm(equCols: Seq[String]) extends CompanyChangeHandle {
   override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("tm_name"), s"${newMap("tm_name")}商标发生变更")
 

src/main/scala/com/winhc/bigdata/spark/utils/ChangeExtractUtils.scala

@@ -12,6 +12,15 @@ object ChangeExtractUtils {
   def get_ip_tags(type_val: String, name: String, date: String, no: String): String = {
     s"""{"type":${getValueOrNull(type_val)},"name":${getValueOrNull(name)},"date":${getValueOrNull(date)},"no":${getValueOrNull(no)}}""".trim
   }
+  //获取指定字段集的标签Json
+  def getTags(fldMap: Map[String, String], type_val: String, fields: Array[String]): String = {
+    var json:StringBuilder = new StringBuilder(s"""{"type":${getValueOrNull(type_val)},""")
+    fields.map {item=>
+      json.append(s"${getValueOrNull(item)}")
+      json.append(s":${getValueOrNull(fldMap(item))},")
+    }
+    json.deleteCharAt(json.lastIndexOf(",")).append("}").toString.trim
+  }
 
   //获取指定字段集的标签Json
   def getTags(fldMap: Map[String, String], type_val: String, fields: Array[String]): String = {