【fix】修复更新报错

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

@@ -78,25 +78,38 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
     @Override
     public Result update(Map<String, String> maps) {
-        String id = maps.get("id");
 
-        String chipId = maps.get("chipId");
-        String deviceCode = maps.get("deviceCode");
-        String deviceAlias = maps.get("deviceAlias");
-        String activeStatus = maps.get("activeStatus");
-        String deviceStatus = maps.get("deviceStatus");
-
-        String remark = maps.get("remark");
         String deviceType = maps.get("deviceType");
-        EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
-        eartagDeviceRegister.setChipId(chipId);
-        eartagDeviceRegister.setDeviceAlias(deviceAlias);
-        eartagDeviceRegister.setDeviceCode(deviceCode);
-        eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
-        eartagDeviceRegister.setRemark(remark);
-        eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
-        eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
-        return resultUtil.result(eartagDeviceRegisterMapper.updateById(eartagDeviceRegister));
+        if ("1".equals(deviceType)){
+            String id = maps.get("id");
+            String chipId = maps.get("chipId");
+            String deviceCode = maps.get("deviceCode");
+            String deviceAlias = maps.get("deviceAlias");
+            String activeStatus = maps.get("activeStatus");
+            String deviceStatus = maps.get("deviceStatus");
+
+            String remark = maps.get("remark");
+            EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
+            eartagDeviceRegister.setChipId(chipId);
+            eartagDeviceRegister.setDeviceAlias(deviceAlias);
+            eartagDeviceRegister.setDeviceCode(deviceCode);
+            eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
+            eartagDeviceRegister.setRemark(remark);
+            eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
+            eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
+            eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
+        }else {
+            String id = maps.get("id");
+            String chipId = maps.get("chipId");
+            String remark = maps.get("remark");
+            String deviceCode = maps.get("deviceCode");
+            EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
+            eartagDeviceRegister.setChipId(chipId);
+            eartagDeviceRegister.setRemark(remark);
+            eartagDeviceRegister.setDeviceCode(deviceCode);
+            eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
+        }
+        return resultUtil.result(1);
     }
 
     @Override