Merge branch 'master' of http://139.224.213.4:3000/bigdata/Spark_Max

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

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

@@ -153,3 +153,15 @@ case class company_copyright_reg_list(equCols: Seq[String]) extends CompanyChang
   override def getBizTime(newMap: Map[String, String]): String = newMap("reg_time")
 }
 
+
+//购地信息
+case class company_land_announcement(equCols:Seq[String])extends CompanyChangeHandle{
+  override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("project_name"), s"${newMap("project_name")}购地信息发生变更")
+
+  override def getInsertTitle(newMap: Map[String, String]): String =  getValueOrNull(newMap("project_name"), s"新增${newMap("project_name")}购地信息")
+
+  override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap,"购地信息", Array("project_name","project_loc", "area", "tran_price", "e_number"))
+
+  override def getBizTime(newMap: Map[String, String]): String = newMap("contract_date")
+
+}

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

@@ -13,6 +13,17 @@ object ChangeExtractUtils {
     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
+  }
+
+
   private def getValueOrNull(value:String):String={
     if(StringUtils.isNotBlank(value)){
       "\""+value+"\""

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

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils
  * @Date: 2020/6/29 10:51
  * @Description:
  */
+@deprecated
 object CompanyEsUtils {
   val pattern = "[^\\u4e00-\\u9fa50-9a-zA-Z]".r