【fix】广播形式 同步注册设备信息

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

@@ -34,7 +34,5 @@ public interface EartagDeviceRegisterRepo extends JpaRepository<EartagDeviceRegi
     @Query(nativeQuery = true,value = "SELECT * FROM eartag_device_register WHERE chip_id=?1")
     EartagDeviceRegisterEntity getByChipId(String chipId);
 
-    @Query(nativeQuery = true, value = "INSERT INTO eartag_device_register(deviceCode,chipId,farmCode,farmName,registerDate) values (?,?,?,?,?)")
-    Boolean fanoutSyncRegisterDevice(String deviceCode, String chipId, String farmCode, String farmName, Timestamp registerDate);
 
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/DeviceRegisterServiceImpl.java

@@ -317,14 +317,18 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
     public void fanoutSyncDevice(Map<String,String> map) throws ParseException {
         if ( "101".equals(map.get("farmCode"))){
             //说明消息中的数据是该业务平台的，进行数据持久化
-            String deviceCode = map.get("deviceCode");
-            String chipId = map.get("chipId");
-            String farmCode = map.get("farmCode");
-            String farmName = map.get("farmName");
 
-            DateUtil dateUtil = new DateUtil();
-            Timestamp timestamp = dateUtil.getTimestamp();
-            deviceRegisterRepo.fanoutSyncRegisterDevice(deviceCode,chipId,farmCode,farmName,timestamp);
+            EartagDeviceRegisterEntity deviceRegisterEntity = new EartagDeviceRegisterEntity();
+            deviceRegisterEntity.setChipId(map.get("chipId").trim());
+            deviceRegisterEntity.setDeviceCode(map.get("deviceCode").trim());
+            deviceRegisterEntity.setFarmId(map.get("farmCode").trim());
+            deviceRegisterEntity.setRegisterTime(new DateUtil().getTimestamp());
+            deviceRegisterEntity.setFarmName( map.get("farmName"));
+            //默认设备状态未激活
+            deviceRegisterEntity.setDeviceStatus(2);
+            deviceRegisterRepo.saveAndFlush(deviceRegisterEntity);
+        }else {
+            System.out.println("不是该牧场的设备");
         }
     }
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/resources/application-dev.yml

@@ -14,9 +14,11 @@ spring:
     database: mysql
     hibernate:
       ddl-auto: update
+
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     open-in-view: true
 
+
   #配置rabbitMq 服务器
 #  rabbitmq:
 #    host: 10.0.0.4