【feat】取消栋舍单设置

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

@@ -82,8 +82,8 @@ public class EartagDeviceRegisterController {
      * @author: 静静
      **/
     @PostMapping("/cancel")
-    public Result cancelPigpen(){
-        return eartagDeviceRegisterService.cancel();
+    public Result cancelPigpen(@RequestBody String ids){
+        return eartagDeviceRegisterService.cancel(ids);
     }
 }
 

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

@@ -27,5 +27,5 @@ public interface EartagDeviceRegisterService extends IService<EartagDeviceRegist
 
     Result add(Map<String, String> mapList);
 
-    Result cancel();
+    Result cancel(String ids);
 }

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

@@ -56,13 +56,6 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         }
         String pigpenId = mapList.get(0).get("pigpenId");
         String unitId = mapList.get(0).get("unitId");
-
-       //查询栋舍和单元放入位置字段
-       List<EartagDeviceRegister> eartagDeviceRegister = eartagDeviceRegisterMapper.selectBatchIds(ids);
-        for (EartagDeviceRegister deviceRegister : eartagDeviceRegister) {
-            deviceRegister.setPigpenId(Integer.valueOf(pigpenId));
-            deviceRegister.setChipId(unitId);
-        }
         //批量更新
         UpdateWrapper<EartagDeviceRegister> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().in(EartagDeviceRegister::getUnitId,ids);
@@ -138,7 +131,14 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
     }
 
     @Override
-    public Result cancel() {
-        return null;
+    public Result cancel(String ids) {
+        List<Integer> convert = idUtil.convert(ids);
+
+        UpdateWrapper<EartagDeviceRegister> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().in(EartagDeviceRegister::getUnitId,convert);
+        EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
+        eartagDeviceRegister.setPigpenId(null);
+        eartagDeviceRegister.setUnitId(null);
+        return resultUtil.result(eartagDeviceRegisterMapper.update(eartagDeviceRegister,updateWrapper));
     }
 }