相机导入添加工务段判断

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -3,6 +3,7 @@ package com.ozs.service.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
+import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
@@ -85,31 +86,47 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setUpdateBy(userId);
                     accountManagement.setCreateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
-                    accountManagement.setDeptId(deptId);
-                    baseCameraManagementMapper.insert(accountManagement);
-                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
-                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                    baseDeviceDynamicManagement.setUpdateBy(userId);
-                    baseDeviceDynamicManagement.setCreateBy(userId);
-                    baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                    if (!ObjectUtils.isEmpty(deptId)) {
+                        accountManagement.setDeptId(deptId);
+                        baseCameraManagementMapper.insert(accountManagement);
+                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                        baseDeviceDynamicManagement.setUpdateBy(userId);
+                        baseDeviceDynamicManagement.setCreateBy(userId);
+                        baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                        successNum++;
+                        successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                    } else {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+                        failureMsg.append(msg);
+                        log.error(msg);
+                    }
+
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
-                    accountManagement.setDeptId(deptId);
-                    baseCameraManagementMapper.update(accountManagement, lw);
-                    LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
-                        wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
+                    if (ObjectUtils.isEmpty(deptId)) {
+                        accountManagement.setDeptId(deptId);
+                        baseCameraManagementMapper.update(accountManagement, lw);
+                        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+                        if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                            wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
+                        }
+                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
+                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                        baseDeviceDynamicManagement.setUpdateBy(userId);
+                        baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
+                        successNum++;
+                        successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+                    } else {
+                        failureNum++;
+                        String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+                        failureMsg.append(msg);
+                        log.error(msg);
                     }
-                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
-                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                    baseDeviceDynamicManagement.setUpdateBy(userId);
-                    baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+
                 } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");