【fix】返回设备编码修改

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.java

@@ -254,7 +254,7 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
     private String builderBaseStationCode(List<BizDeviceRegister> deviceRegisters){
         if (CollectionUtils.isEmpty(deviceRegisters)){
             //说明没有注册过，直接返回六位顺序码
-            return "000000";
+            return "000001";
         }else {
             //说明注册过、获取列表中最大的数据截取后六位+1f进行返回
             String deviceCode = deviceRegisters.stream().max(Comparator.comparing(BizDeviceRegister::getDeviceCode)).get().getDeviceCode();

registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java

@@ -154,7 +154,7 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
         if (bizFarms == null || bizFarms.size()==0){
             System.out.println("----------------牧场表里面查不到这条数据");
         }else{
-            return bizFarms.get(0).getFarmCode();
+            return bizFarms.get(0).getAreaCode();
         }
         return "";
     }

registration-center/src/test/java/com/huimv/center/service/BizFarmServiceTest.java

@@ -42,7 +42,8 @@ public class BizFarmServiceTest {
         String linkman = "张经理2";
         String phone = "133123456782";
         String remark = "备注2";
-        Result result = farmService.edit(1,farmName,farmCode,linkman,phone,remark);
+        String areaName = "余杭区";
+        Result result = farmService.edit(1,farmName,farmCode,linkman,phone,remark,areaName);
         System.out.println("result>>"+result.toString());
     }