【fix】获取设备编码

registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisterController.java

@@ -112,12 +112,14 @@ public class BizDeviceRegisterController {
     public Result getDeviceCode(@RequestBody String farmCode){
         //查询牧场表  获取行政编码 牧场编码
         BizFarm bizFarmByFarmCode = bizFarmService.getBizFarmByFarmCode(farmCode);
-        String areaCode = bizFarmByFarmCode.getAreaCode();
+        //String areaCode = bizFarmByFarmCode.getAreaCode();
         //查询基站顺序码
         String subFarmCode = bizDeviceRegisterService.getBizDeviceRegisterByFarmCode(farmCode);
+
+        System.out.println(subFarmCode);
         //拼接返回
-        String resultDeviceCode = areaCode.concat(farmCode).concat(subFarmCode);
-        return new Result(ResultCode.SUCCESS,resultDeviceCode);
+       // String resultDeviceCode = areaCode.concat(farmCode).concat(subFarmCode);
+        return null;
     }
 }
 

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

@@ -71,7 +71,6 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
      * @return
      */
     private List<BaseAreaVo> parseBizBaseArea(List<BizBaseArea> bizBaseAreas){
-        System.out.println("----------------"+bizBaseAreas);
         //构建需要展示的树形节点结构
         Map<String, BaseAreaVo> cityNodeMap = bizBaseAreas.stream().map(biZBaseAreasDo -> {
             BaseAreaVo baseAreaVo = new BaseAreaVo();
@@ -81,7 +80,6 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
             baseAreaVo.setParentCode(biZBaseAreasDo.getParentCode());
             return baseAreaVo;
         }).collect(Collectors.toMap(BaseAreaVo::getCode, b -> b,(k1,k2)->k1));
-        System.out.println("----------------"+cityNodeMap);
         //创建数组存父亲节点
         ArrayList<BaseAreaVo> roots = new ArrayList<>();
         //构建树形

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

@@ -1,10 +1,12 @@
 package com.huimv.center.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.center.mapper.BizDeviceRegisterMapper;
 import com.huimv.center.pojo.BizDeviceRegister;
+import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.huimv.center.producer.Producer;
 import com.huimv.center.service.BizDeviceRegisterService;
 import com.huimv.center.utils.IDUtil;
@@ -242,9 +244,12 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
 
     @Override
     public String getBizDeviceRegisterByFarmCode(String farmCode) {
+
         QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
         List<BizDeviceRegister> deviceRegisters = bizDeviceRegisterMapper.selectList(queryWrapper);
+
+        System.out.println(deviceRegisters);
         String code = builderBaseStationCode(deviceRegisters);
         return  code;
     }

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

@@ -141,13 +141,13 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
 
     @Override
     public BizFarm getBizFarmByFarmCode(String farmCode) {
+        System.out.println("farmCode");
         QueryWrapper<BizFarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
         List<BizFarm> bizFarms = BizFarmMapper.selectList(queryWrapper);
-        BizFarm bizFarm = new BizFarm();
-        if (bizFarms != null){
-             bizFarm = bizFarms.get(0);
+        if (bizFarms == null){
+            System.out.println("----------------牧场表里面查不到这条数据");
         }
-        return bizFarm;
+        return null;
     }
 }