Merge remote-tracking branch 'origin/master'

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

@@ -58,7 +58,7 @@ public class EartagDeviceRegisterController {
         return eartagDeviceRegisterService.update(maps);
     }
     /**
-     * @description: 【查询】 分页查询配置表
+     * @description: 【查询】 分页查询
      * @author: 静静
      * @param: paramsMap
      **/
@@ -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

@@ -60,13 +60,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);
@@ -158,11 +151,37 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
     @Override
     public Result add(Map<String, String> mapList) {
-        return null;
+        String pigpenId = mapList.get("pigpenId");
+        String unitId = mapList.get("unitId");
+
+        String chipId = mapList.get("chipId");
+        String deviceCode = mapList.get("deviceCode");
+        String deviceAlias = mapList.get("deviceAlias");
+        String activeStatus = mapList.get("activeStatus");
+        String deviceStatus = mapList.get("deviceStatus");
+        String remark = mapList.get("remark");
+
+        EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
+        eartagDeviceRegister.setPigpenId(Integer.valueOf(pigpenId));
+        eartagDeviceRegister.setUnitId(Integer.valueOf(unitId));
+        eartagDeviceRegister.setChipId(chipId);
+        eartagDeviceRegister.setDeviceAlias(deviceAlias);
+        eartagDeviceRegister.setDeviceCode(deviceCode);
+        eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
+        eartagDeviceRegister.setRemark(remark);
+        eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
+        return resultUtil.result(eartagDeviceRegisterMapper.insert(eartagDeviceRegister));
     }
 
     @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));
     }
 }

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

@@ -32,10 +32,14 @@ public class EartagDeviceRegisterVo implements Serializable {
 
     private String remark;
 
+    private String syncTime;
+
     //单元名称
     private String unitName;
 
     //栋舍名称
     private String pigpenName;
 
+
+
 }