采集器添加修改

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

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -214,10 +215,20 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
             eartagDeviceRegister.setFarmId(farmId);
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
-            eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
-            //{设置芯片ID和设备编码缓存}
-            cacheService.setDeviceCodeByChipId(chipId,deviceCode);
-            System.out.println("1 设置芯片和设备编码缓存,chipId="+chipId+",deviceCode="+deviceCode);
+
+            QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("chip_id", chipId);
+            EartagDeviceRegister eartagDeviceRegister1 = eartagDeviceRegisterMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(eartagDeviceRegister1)) {
+                eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
+                //{设置芯片ID和设备编码缓存}
+                cacheService.setDeviceCodeByChipId(chipId, deviceCode);
+                System.out.println("1 设置芯片和设备编码缓存,chipId=" + chipId + ",deviceCode=" + deviceCode);
+                return resultUtil.result(1);
+            } else {
+                return resultUtil.result(0);
+            }
+
         }else {
             //配标器
             String farmId = mapList.get("farmId");
@@ -230,12 +241,20 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
             eartagDeviceRegister.setRemark(remark);
             eartagDeviceRegister.setChipId(chipId);
-            eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
-            //{设置芯片ID和设备编码}
-            cacheService.setDeviceCodeByChipId(chipId,deviceCode);
-            System.out.println("2 设置芯片和设备编码缓存,chipId="+chipId+",deviceCode="+deviceCode);
+            QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("chip_id", chipId);
+            EartagDeviceRegister eartagDeviceRegister1 = eartagDeviceRegisterMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(eartagDeviceRegister1)) {
+                eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
+                //{设置芯片ID和设备编码}
+                cacheService.setDeviceCodeByChipId(chipId, deviceCode);
+                System.out.println("2 设置芯片和设备编码缓存,chipId=" + chipId + ",deviceCode=" + deviceCode);
+                return resultUtil.result(1);
+            } else {
+                return resultUtil.result(0);
+            }
+
         }
-        return resultUtil.result(1);
     }
 
     @Override