新建设备注册管理功能

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/DeviceRegisterController.java

@@ -64,11 +64,15 @@ public class DeviceRegisterController {
     public Result remove(String ids){
         //{移除设备}
 //        return deviceRegisterService.removeDevice(ids);
-        return deviceRegisterService.deleteBatch(ids);
+//        return deviceRegisterService.removeDevice(ids);
+        return deviceRegisterService.removeBatchDevice(ids);
     }
 
     @GetMapping("/listDevice")
     public Result listDevice(String farmId,String deviceCode,Integer deviceStatus,Integer activeStatus,String deviceAlias,String location,Integer pageNo,Integer pageSize){
+        if(pageNo == null || pageNo.toString().length()==0 || pageSize == null || pageSize.toString().length() == 0){
+            return new Result(10010,"页码或页码尺寸不能为空.",false);
+        }
         //{展示设备列表}
         return deviceRegisterService.listDevice(farmId,deviceCode,deviceStatus,activeStatus,deviceAlias,location,pageNo,pageSize);
     }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/IDeviceRegisterService.java

@@ -17,6 +17,6 @@ public interface IDeviceRegisterService {
     //展示设备注册列表
     Result listDevice(String farmId, String deviceCode, Integer deviceStatus, Integer activeStatus, String deviceAlias, String location, Integer pageNo, Integer pageSize);
 
-
-    Result deleteBatch(String ids);
+    //批量删除
+    Result removeBatchDevice(String ids);
 }

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/DeviceRegisterServiceImpl.java

@@ -79,21 +79,21 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
         return new Result(ResultCode.SUCCESS);
     }
 
-    @Override
-    public Result removeDevice(String ids) {
-        String[] idsArray = ids.split(",");
-        List<Integer> idList = new ArrayList();
-//        for(int a=0;a<idsArray.length;a++){
-//            idList.add(Integer.parseInt(idsArray[a]));
-//        }
-//        deviceRegisterRepo.removeDevice(idList);
-//        List<EartagDeviceRegisterEntity> deviceRegisterEntityList = deviceRegisterRepo.getDeviceRegisterByIds(idList);
-//        deviceRegisterRepo.deleteAll(deviceRegisterEntityList);
-//        deviceRegisterRepo.removeDevice();
-
-//        EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(ids);
-        return new Result(ResultCode.SUCCESS);
-    }
+//    @Override
+//    public Result removeDevice(String ids) {
+//        String[] idsArray = ids.split(",");
+//        List<Integer> idList = new ArrayList();
+////        for(int a=0;a<idsArray.length;a++){
+////            idList.add(Integer.parseInt(idsArray[a]));
+////        }
+////        deviceRegisterRepo.removeDevice(idList);
+////        List<EartagDeviceRegisterEntity> deviceRegisterEntityList = deviceRegisterRepo.getDeviceRegisterByIds(idList);
+////        deviceRegisterRepo.deleteAll(deviceRegisterEntityList);
+////        deviceRegisterRepo.removeDevice();
+//
+////        EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(ids);
+//        return new Result(ResultCode.SUCCESS);
+//    }
 
     @Override
     public Result listDevice(String farmId, String deviceCode, Integer deviceStatus, Integer activeStatus, String deviceAlias, String location, Integer pageNo, Integer pageSize) {
@@ -147,10 +147,21 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
     }
 
     @Override
-    public Result deleteBatch(String ids) {
-        int id = 1;
-        EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(ids);
-        deviceRegisterRepo.delete(deviceRegisterEntity);
+    public Result removeBatchDevice(String ids) {
+        String id = "1";
+        Integer id2 = 1;
+
+        deviceRegisterRepo.getById(id2);
+
+        return null;
+    }
+
+    @Override
+    public Result removeDevice(String ids) {
+        String[] idArray = ids.split(",");
+        for(int a=0;a<idArray.length;a++){
+            deviceRegisterRepo.delete(deviceRegisterRepo.getById(Integer.parseInt(idArray[a])));
+        }
         return new Result(ResultCode.SUCCESS);
     }
 

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/service/impl/DeviceServiceImpl.java

@@ -215,6 +215,15 @@ public class DeviceServiceImpl implements IDeviceService {
      */
     @Override
     public Result listDeviceRegisterInPager(String farmId, String deviceCode, String alias, String startDate, String endDate, Integer activeStatus, Integer liveStatus, Integer pageNo, Integer pageSize) throws ParseException {
+//        System.out.println("# farmId>>"+farmId);
+//        System.out.println("# deviceCode>>"+deviceCode);
+//        System.out.println("# alias>>"+alias);
+//        System.out.println("# startDate>>"+startDate);
+//        System.out.println("# endDate>>"+endDate);
+//        System.out.println("# activeStatus>>"+activeStatus);
+//        System.out.println("# liveStatus>>"+liveStatus);
+//        System.out.println("# pageNo>>"+pageNo);
+//        System.out.println("# pageSize>>"+pageSize);
         //
         Specification<EartagDeviceRegisterEntity> sf = (Specification<EartagDeviceRegisterEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
@@ -228,7 +237,7 @@ public class DeviceServiceImpl implements IDeviceService {
                 predList.add(criteriaBuilder.equal(root.get("deviceCode").as(String.class), deviceCode));
             }
             //alias
-            if (null != alias) {
+            if (null != alias && alias.trim().length()>0) {
                 predList.add(criteriaBuilder.like(root.get("deviceAlias").as(String.class), alias));
             }
             //startDate
@@ -280,6 +289,7 @@ public class DeviceServiceImpl implements IDeviceService {
         outDataJo.put("empty",pageDeviceRegister.isEmpty());
 
         List<EartagDeviceRegisterEntity> deviceRegisterEntityList = pageDeviceRegister.getContent();
+//        System.out.println("## deviceRegisterEntityList.size>>"+deviceRegisterEntityList.size());
         JSONArray outJa = new JSONArray();
         outDataJo.put("content",outJa);
         for(EartagDeviceRegisterEntity deviceRegisterEntity:deviceRegisterEntityList){