添加功能：调用省平台接口，把耳标数据同步过去。

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/BaseFarmEntity.java

@@ -32,6 +32,9 @@ public class BaseFarmEntity implements Serializable {
     @Column(name = "remark")
     private String remark;
 
+    @Column(name = "province_status")
+    private Integer provinceStatus;
+
     public void setId(Integer id) {
         this.id = id;
     }
@@ -88,16 +91,25 @@ public class BaseFarmEntity implements Serializable {
         return remark;
     }
 
+    public Integer getProvinceStatus() {
+        return provinceStatus;
+    }
+
+    public void setProvinceStatus(Integer provinceStatus) {
+        this.provinceStatus = provinceStatus;
+    }
+
     @Override
     public String toString() {
         return "BaseFarmEntity{" +
-                "id=" + id + '\'' +
-                "farmId=" + farmId + '\'' +
-                "farmName=" + farmName + '\'' +
-                "location=" + location + '\'' +
-                "leader=" + leader + '\'' +
-                "phone=" + phone + '\'' +
-                "remark=" + remark + '\'' +
+                "id=" + id +
+                ", farmId=" + farmId +
+                ", farmName='" + farmName + '\'' +
+                ", location='" + location + '\'' +
+                ", leader='" + leader + '\'' +
+                ", phone='" + phone + '\'' +
+                ", remark='" + remark + '\'' +
+                ", provinceStatus='" + provinceStatus + '\'' +
                 '}';
     }
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/BaseFarmRepo.java

@@ -3,7 +3,10 @@ package com.huimv.eartag2.common.dao.repo;
 import com.huimv.eartag2.common.dao.entity.BaseFarmEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 public interface BaseFarmRepo extends JpaRepository<BaseFarmEntity, Integer>, JpaSpecificationExecutor<BaseFarmEntity> {
 
+    @Query(nativeQuery=true, value="SELECT * FROM base_farm WHERE farm_code=?1")
+    BaseFarmEntity getFarmByFarmId(String farmId);
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagEartagRegister2EntityRepo.java

@@ -18,4 +18,7 @@ public interface EartagEartagRegister2EntityRepo extends JpaRepository<EartagEar
 
     @Query(nativeQuery=true, value="SELECT * FROM eartag_eartag_register2 WHERE farm_id='330112004'")
     List<EartagEartagRegister2Entity> getEartagRegisterByFarmCode(String farmCode);
+
+    @Query(nativeQuery=true, value="SELECT * FROM eartag_eartag_register2 WHERE earmark=?1")
+    EartagEartagRegister2Entity getOneByEarmark(String earmark);
 }

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -190,6 +190,7 @@ public class EartagServiceImpl implements IEartagService {
                 System.out.println("## url>>"+url);
                 EartagVo eartagVo = new EartagVo();
                 eartagVo.setEartag(askText);
+                eartagVo.setData(dataJo.toJSONString());
                 restTemplate.postForObject(url,eartagVo,String.class);
             }
         }

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/vo/EartagVo.java

@@ -10,6 +10,7 @@ package com.huimv.eartag2.eartag.vo;
  **/
 public class EartagVo {
     private String eartag;
+    private String data;
 
     public String getEartag() {
         return eartag;
@@ -19,10 +20,19 @@ public class EartagVo {
         this.eartag = eartag;
     }
 
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
     @Override
     public String toString() {
         return "EartagVo{" +
                 "eartag='" + eartag + '\'' +
+                ", data='" + data + '\'' +
                 '}';
     }
 }