【fix】防止查不到牧场空指针

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/SysBaseConfigServiceImpl.java

@@ -148,7 +148,6 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     }
 
     //同步牧场配置消息
-    public final static String QUEUE_SYNC_SYS_CONFIG = "topic.syncSysConfig.queue";
     public final static String EXCHANGE_SYNC_SYS_CONFIG = "topic.syncSysConfig.exchange";
     public final static String ROUTING_KEY_SYNC_SYS_CONFIG = "topic.syncSysConfig.routeKey";
 
@@ -159,7 +158,12 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         QueryWrapper<SysBaseConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(farmCode),"config_value", farmCode);
         List<SysBaseConfig> sysBaseConfigs = sysBaseConfigMapper.selectList(queryWrapper);
-        String rowId = sysBaseConfigs.get(0).getRowId();
+        String rowId = "";
+        if (null == sysBaseConfigs || sysBaseConfigs.size() == 0){
+            return new Result(ResultCode.FAIL);
+        }else {
+            rowId = sysBaseConfigs.get(0).getRowId();
+        }
         List<SysBaseConfig> syncDate = sysBaseConfigMapper.selectSysBaseConfig(rowId);
         SysBaseConfigVo sysBaseConfigVo = convertSysBaseConfigVo(syncDate);
         paramsMap.put("farmName",sysBaseConfigVo.getFarmName());
@@ -176,11 +180,11 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         Map<String, String> map = list.stream().collect(Collectors.toMap(SysBaseConfig::getConfigKey, SysBaseConfig::getConfigValue));
         SysBaseConfigVo sysBaseConfigVo = new SysBaseConfigVo();
         sysBaseConfigVo.setId(list.get(0).getRowId());
-        sysBaseConfigVo.setFarmCode(map.get("farm_code"));
-        sysBaseConfigVo.setFarmName(map.get("farm_name"));
+        sysBaseConfigVo.setFarmCode(map.get("farmCode"));
+        sysBaseConfigVo.setFarmName(map.get("farmName"));
         sysBaseConfigVo.setIp(map.get("ip"));
         sysBaseConfigVo.setPort(map.get("port"));
-        sysBaseConfigVo.setAreaName(map.get("area_name"));
+        sysBaseConfigVo.setAreaName(map.get("areaName"));
         return sysBaseConfigVo;
 
     }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev2.yml

@@ -18,13 +18,13 @@ spring:
     open-in-view: true
 
   rabbitmq:
-    host: 192.168.1.170
-#    host: 192.168.1.75
+    host: 121.36.134.218
+    #    host: 10.0.0.14
     port: 5672
     username: admin
     password: admin
     #虚拟host 可以不设置,使用server默认host
-    virtual-host: /
+    virtual-host: /registration_center
     listener:
       simple:
         acknowledge-mode: none