【fix】采集器注册返回值添加id

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BasePigpenController.java

@@ -27,8 +27,8 @@ public class BasePigpenController {
     public Result list(@RequestBody Map<String, Object> paramsMap) {
         System.out.println("paramsMap>>"+paramsMap.toString());
         String farmCode = "";
-        if (paramsMap.get("farmCode") != null) {
-            farmCode = paramsMap.get("farmCode")+"";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
         }
         String stageCode = "";
         if (paramsMap.get("stageCode") != null) {
@@ -57,7 +57,7 @@ public class BasePigpenController {
     @RequestMapping(value = "/addBuilding",method = RequestMethod.POST)
     public Result addBuilding(@RequestBody Map<String, Object> paramsMap){
         // 牧场名称
-        String farmCode = paramsMap.get("farmCode")+"";
+        String farmCode = paramsMap.get("farmId")+"";
         // 栋名称
         String buildingName = paramsMap.get("buildingName")+"";
         // 栋编码
@@ -107,7 +107,7 @@ public class BasePigpenController {
     @RequestMapping(value = "/addUnit",method = RequestMethod.POST)
     public Result addUnit(@RequestBody Map<String, Object> paramsMap){
         // 牧场名称
-        String farmCode = paramsMap.get("farmCode")+"";
+        String farmCode = paramsMap.get("farmId")+"";
         // 栋
         String parentId = paramsMap.get("parentId")+"";
         // 单元

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagDeviceRegisterController.java

@@ -3,11 +3,8 @@ package com.huimv.eartag2.manage2.controller;
 
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -85,5 +82,14 @@ public class EartagDeviceRegisterController {
     public Result cancelPigpen(@RequestBody String ids){
         return eartagDeviceRegisterService.cancel(ids);
     }
+
+    /**
+     * @description: 【查询】根据farmID获取设备编码
+     * @author: 静静
+     **/
+    @GetMapping("/getDeviceCode")
+    public Result getDeviceCode(@RequestParam(name = "farmId") String farmCode){
+        return eartagDeviceRegisterService.getDeviceCode(farmCode);
+    }
 }
 

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

@@ -28,4 +28,6 @@ public interface EartagDeviceRegisterService extends IService<EartagDeviceRegist
     Result add(Map<String, String> mapList);
 
     Result cancel(String ids);
+
+    Result getDeviceCode(String farmCode);
 }

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -184,4 +185,20 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         eartagDeviceRegister.setUnitId(null);
         return resultUtil.result(eartagDeviceRegisterMapper.update(eartagDeviceRegister,updateWrapper));
     }
+
+    @Override
+    public Result getDeviceCode(String farmCode) {
+        QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code",farmCode);
+        List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(queryWrapper);
+        if (null == eartagDeviceRegisters || eartagDeviceRegisters.size() == 0){
+            return new Result(ResultCode.SUCCESS,farmCode+"000001");
+        }else {
+            String maxDeviceCode = eartagDeviceRegisters.stream().max(Comparator.comparing(EartagDeviceRegister::getDeviceCode)).get().getDeviceCode();
+            String substring = maxDeviceCode.substring(maxDeviceCode.length() - 6);
+            int code = Integer.parseInt(substring)+1;
+            String format = String.format("%6d", code);
+            return new Result(ResultCode.SUCCESS,farmCode+format);
+        }
+    }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/vo/EartagDeviceRegisterVo.java

@@ -20,6 +20,8 @@ public class EartagDeviceRegisterVo implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    private Integer id;
+
     private String chipId;
 
     private String deviceCode;