【fix】添加牧场测试修改

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

@@ -7,11 +7,7 @@ import com.huimv.center.service.BizFarmService;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
@@ -108,18 +104,18 @@ public class BizDeviceRegisterController {
         return bizDeviceRegisterService.synchronizationData(paramsMap);
     }
 
-    @PostMapping("/getDeviceCode")
+    @GetMapping("/getDeviceCode")
     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 null;
+        String resultDeviceCode = areaCode.concat(farmCode).concat(subFarmCode);
+        return new Result(ResultCode.SUCCESS,resultDeviceCode);
     }
 }
 

registration-center/src/main/java/com/huimv/center/pojo/BizBaseArea.java

@@ -3,13 +3,17 @@ package com.huimv.center.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
 public class BizBaseArea implements Serializable {
 
     private static final long serialVersionUID=1L;

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

@@ -62,7 +62,13 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
 
     @Override
     public BizBaseArea queryAreaCodeByAreaName(String areaName) {
-        return null;
+        QueryWrapper<BizBaseArea> bizBaseAreaQueryWrapper = new QueryWrapper<>();
+        bizBaseAreaQueryWrapper.eq("area_name",areaName);
+        List<BizBaseArea> bizBaseAreas = bizBaseAreaMapper.selectList(bizBaseAreaQueryWrapper);
+        if (bizBaseAreas == null ||bizBaseAreas.size()==0){
+            return new BizBaseArea();
+        }
+        return bizBaseAreas.get(0);
     }
 
     /**

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

@@ -244,12 +244,9 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
 
     @Override
     public String getBizDeviceRegisterByFarmCode(String farmCode) {
-
         QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        queryWrapper.eq("farm_code", farmCode);
         List<BizDeviceRegister> deviceRegisters = bizDeviceRegisterMapper.selectList(queryWrapper);
-
-        System.out.println(deviceRegisters);
         String code = builderBaseStationCode(deviceRegisters);
         return  code;
     }
@@ -260,8 +257,8 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
             return "000000";
         }else {
             //说明注册过、获取列表中最大的数据截取后六位+1f进行返回
-            List<BizDeviceRegister>  sortList= deviceRegisters.stream().sorted(Comparator.comparing(BizDeviceRegister::getDeviceCode).reversed()).collect(Collectors.toList());
-            String maxCode = sortList.get(0).getDeviceCode().substring(sortList.get(0).getDeviceCode().length() - 6);
+            String deviceCode = deviceRegisters.stream().max(Comparator.comparing(BizDeviceRegister::getDeviceCode)).get().getDeviceCode();
+            String maxCode = deviceCode.substring(deviceCode.length() - 6);
             return  Integer.parseInt(maxCode)+1+"";
         }
     }

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

@@ -3,6 +3,7 @@ package com.huimv.center.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizBaseArea;
+import com.huimv.center.pojo.BizDeviceRegister;
 import com.huimv.center.pojo.BizFarm;
 import com.huimv.center.mapper.BizFarmMapper;
 import com.huimv.center.pojo.BizRawData;
@@ -66,9 +67,9 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
         //根据区域名称查询区域编码
         BizBaseArea bizBaseArea = bizBaseAreaService.queryAreaCodeByAreaName(areaName);
         if (Objects.nonNull(bizBaseArea)){
-            farm.setFarmCode(bizBaseArea.getAreaCode());
+            farm.setAreaCode(bizBaseArea.getAreaCode());
         }
-        farm.setFarmName(farmName);
+        farm.setAreaName(areaName);
         return ResultUtil.result(BizFarmMapper.insert(farm));
     }
 
@@ -141,13 +142,14 @@ 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);
+        queryWrapper.eq("farm_code", farmCode);
         List<BizFarm> bizFarms = BizFarmMapper.selectList(queryWrapper);
-        if (bizFarms == null){
+        if (bizFarms == null || bizFarms.size()==0){
             System.out.println("----------------牧场表里面查不到这条数据");
         }
-        return null;
+        return bizFarms.get(0);
     }
 }