设备

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -44,7 +44,7 @@ public class EnvDeviceController {
         Page<EnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
                     .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
-                    .eq("farm_id",farmId)));
+                    .eq("farm_id",farmId).orderByDesc("id")));
     }
 
     @PostMapping("/listH5Device")
@@ -57,11 +57,11 @@ public class EnvDeviceController {
         if (deviceType.equals("1")){
             return new Result(ResultCode.SUCCESS,envDeviceService.page(page, new QueryWrapper<EnvDevice>()
                     .eq(!StringUtils.isEmpty(deviceType),"device_type",deviceType)
-                    .eq("farm_id",farmId)));
+                    .eq("farm_id",farmId).orderByDesc("id")));
         }else {
             return new Result(ResultCode.SUCCESS, envDeviceService.page(page, new QueryWrapper<EnvDevice>()
                     .in("device_type", 2, 3)
-                    .eq("farm_id", farmId)));
+                    .eq("farm_id", farmId).orderByDesc("id")));
         }
     }
 
@@ -90,12 +90,20 @@ public class EnvDeviceController {
 //            case 3: deviceName += "固定电子秤";
 //            break;
 //        }
+        if (envDeviceService.count(new QueryWrapper<EnvDevice>().eq("device_code",deviceCode)) != 0){
+            return new Result(10001,"设备编码已存在!",false);
+        }
+        if (deviceType == 1){
+            if (envDeviceService.count(new QueryWrapper<EnvDevice>().eq("unitId",unitId).eq("device_type",1)) != 0){
+                return new Result(10001,"栋舍已存在环控设备!",false);
+            }
+        }
         EnvDevice envDevice = new EnvDevice();
         envDevice.setDeviceCode(deviceCode);
         envDevice.setDeviceName(deviceName);
         envDevice.setDeviceType(deviceType);
         envDevice.setBuildLocation(buildLocation);
-        if (deviceType != 3){
+        if (deviceType != 2){
             envDevice.setUnitName(unitName);
             envDevice.setUnitId(Integer.parseInt(unitId));
         }