|
@@ -12,13 +12,13 @@ import com.huimv.eartag2.eartag.service.IEartagService;
|
|
|
//import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
|
|
|
//import com.huimv.eartag2.manage2.pojo.EartagData2;
|
|
|
//import com.huimv.eartag2.manage2.service.IEartagData2Service;
|
|
|
-import javafx.beans.binding.BooleanBinding;
|
|
|
+import com.huimv.eartag2.eartag.vo.EartagVo;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.domain.Example;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.sql.Timestamp;
|
|
@@ -92,6 +92,11 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
private BasePigpenEntityRepo basePigpenRepo;
|
|
|
@Autowired
|
|
|
private BizBaseStageEntityRepo bizBaseStageRepo;
|
|
|
+ @Autowired
|
|
|
+ private BaseFarmRepo baseFarmRepo;
|
|
|
+ @Autowired
|
|
|
+ private RestTemplate restTemplate;
|
|
|
+
|
|
|
@Override
|
|
|
public void handleEartag(JSONObject dataJo) throws ParseException {
|
|
|
//设备编码
|
|
@@ -159,6 +164,38 @@ public class EartagServiceImpl implements IEartagService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void sendSowProvincePlatform(JSONObject dataJo, String askText) {
|
|
|
+ // =====================================================================
|
|
|
+ // 判断耳标-->采集器(基站)-->判断该牧场是否被允许发送耳标数据到省平台;
|
|
|
+ // 调用省平台接口,发送耳标数据;
|
|
|
+ // 省平台接口:接收数据并发送到耳标队列
|
|
|
+ // =====================================================================
|
|
|
+ System.out.println("处理发送到省平台的数据>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>="+dataJo);
|
|
|
+ String earmark = dataJo.getString("earmark");
|
|
|
+ System.out.println(">>>>>>>>>>>>>>>earmark="+earmark);
|
|
|
+ //根据耳标查询耳标注册表
|
|
|
+ EartagEartagRegister2Entity eartagRegister2Entity = eartagEartagRegister2EntityRepo.getOneByEarmark(earmark);
|
|
|
+ if(eartagRegister2Entity != null){
|
|
|
+ String farmId = eartagRegister2Entity.getFarmId();
|
|
|
+ System.out.println("farmId>>"+farmId);
|
|
|
+ BaseFarmEntity BaseFarmEntity = baseFarmRepo.getFarmByFarmId(farmId);
|
|
|
+ System.out.println("是否允许发送到省平台:"+BaseFarmEntity.getProvinceStatus());
|
|
|
+ //provinceStatus=1,表示允许将耳标数据同步到省平台
|
|
|
+ if(BaseFarmEntity.getProvinceStatus() == 1){
|
|
|
+ //调用省平台接口同步耳标数据过去
|
|
|
+ System.out.println("调用省平台接口同步耳标数据过去");
|
|
|
+ //////////////////////////////////////////////////////////////////////////////
|
|
|
+ String url = "http://122.112.224.199:9501/syncEartag";
|
|
|
+ System.out.println("## url>>"+url);
|
|
|
+ EartagVo eartagVo = new EartagVo();
|
|
|
+ eartagVo.setEartag(askText);
|
|
|
+ restTemplate.postForObject(url,eartagVo,String.class);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
//--农户耳标注册
|
|
|
private void updateEartagRegisterForFarmer(String earmark, String deviceCode, String bat, Timestamp nowTimestamp, java.sql.Date todayDate, String farmId, JSONObject eartagJo) {
|
|
|
System.out.println(" ============================ 更新农户耳标数据 ============================ ");
|