wwh hai 1 ano
pai
achega
cf87f3a4f3

+ 6 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagDeviceRegisterController.java

@@ -95,5 +95,11 @@ public class EartagDeviceRegisterController {
     public Result getDeviceCode(@RequestParam(name = "farmId") String farmCode){
         return eartagDeviceRegisterService.getDeviceCode(farmCode);
     }
+
+    @PostMapping("/updateFarm")
+    public Result updateFarm(@RequestBody Map<String, String> maps){
+        return eartagDeviceRegisterService.updateFarm(maps);
+    }
+
 }
 

+ 1 - 1
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagDeviceRegister.java

@@ -80,7 +80,7 @@ public class EartagDeviceRegister implements Serializable {
 
     private String imei;
     private Integer upgrade;
-    private Integer farmerId;
+    private String farmerId;
     private String farmerName;
 //    private String iphone;
 

+ 2 - 0
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/EartagDeviceRegisterService.java

@@ -32,4 +32,6 @@ public interface EartagDeviceRegisterService extends IService<EartagDeviceRegist
     Result getDeviceCode(String farmCode);
 
     Result setFarmer(List<Map<String, Integer>> maps);
+
+    Result updateFarm(Map<String,String> paramsMap);
 }

+ 15 - 1
huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDeviceRegisterServiceImpl.java

@@ -81,7 +81,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
             EartagDeviceRegister deviceRegister = new EartagDeviceRegister();
             deviceRegister.setId(id);
-            deviceRegister.setFarmerId(farmerId);
+            deviceRegister.setFarmerId(farmerId.toString());
             deviceRegister.setFarmerName(baseFarmer.getFarmer());
             eartagDeviceRegisterMapper.updateById(deviceRegister);
         }
@@ -90,6 +90,20 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
     }
 
     @Override
+    public Result updateFarm(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String id = paramsMap.get("id");//设备id
+        String pigpenId = paramsMap.get("pigpenId");
+        String unitId = paramsMap.get("unitId");
+        EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
+        eartagDeviceRegister.setFarmerId(farmId);
+        eartagDeviceRegister.setUnitId(Integer.parseInt(unitId));
+        eartagDeviceRegister.setPigpenId(Integer.parseInt(pigpenId));
+        eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
+        return resultUtil.result(1);
+    }
+
+    @Override
     public Result remove(String ids) {
         List<Integer> convertList = idUtil.convert(ids);
         //{删除芯片id缓存}