环境设备新增

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -116,14 +116,17 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
 
     @Override
     public Result add(HttpServletRequest httpServletRequest, EnvDevice envDevice) {
-        QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_name", envDevice.getDeviceName()).eq("farm_id", envDevice.getFarmId());
-        EnvDevice device = envDeviceMapper.selectOne(queryWrapper);
-        if (ObjectUtil.isEmpty(device)) {
-            envDeviceMapper.insert(envDevice);
-        } else {
+        System.out.println(envDevice.getDeviceName());
+        if (envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("device_name", envDevice.getDeviceName()).eq("farm_id", envDevice.getFarmId())) != 0) {
             return new Result(ResultCode.FAIL, "设备名称已存在");
         }
+        if (envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("device_code",envDevice.getDeviceCode())) != 0) {
+            return new Result(ResultCode.FAIL, "设备编码已存在");
+        }
+        if (envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().eq("unit_id",envDevice.getUnitId()).eq("farm_id",envDevice.getFarmId())) != 0) {
+            return new Result(ResultCode.FAIL, "该单元已有设备");
+        }
+        envDeviceMapper.insert(envDevice);
         return new Result(ResultCode.SUCCESS, "添加成功");
     }