相机模板和上传下载修改

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

@@ -91,45 +91,42 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setUpdateBy(userId);
                     accountManagement.setCreateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
-                    accountManagement.setDeptId(deptId);
-                    LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-                    if (!ObjectUtils.isEmpty(accountManagement.getRailwayName())) {
-                        queryWrapper.eq(BaseRailwayManagement::getRailwayName, accountManagement.getRailwayName());
-                    }
-                    BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                    accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
-                    Integer mils = AppendUtils.stringSplit(accountManagement.getInstallMiles());
-                    accountManagement.setInstallMile(mils);
-                    Integer end = AppendUtils.stringSplit(accountManagement.getEndMiles());
-                    accountManagement.setEndMile(end);
-                    Integer begin = AppendUtils.stringSplit(accountManagement.getBeginMiles());
-                    accountManagement.setBeginMile(begin);
-                    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() + " 导入成功");
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
                     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 {
+                        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                        if (!ObjectUtils.isEmpty(accountManagement.getRailwayName())) {
+                            queryWrapper.eq(BaseRailwayManagement::getRailwayName, accountManagement.getRailwayName());
+                        }
+                        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                        if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
+                            accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
+                            Integer mils = AppendUtils.stringSplit(accountManagement.getInstallMiles());
+                            accountManagement.setInstallMile(mils);
+                            Integer end = AppendUtils.stringSplit(accountManagement.getEndMiles());
+                            accountManagement.setEndMile(end);
+                            Integer begin = AppendUtils.stringSplit(accountManagement.getBeginMiles());
+                            accountManagement.setBeginMile(begin);
+                            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.getRailwayName() + "不存在， 导入失败：";
+                            failureMsg.append(msg);
+                            log.error(msg);  
+                        }
+                    }else {
                         failureNum++;
                         String msg = "<br/>" + failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
                         failureMsg.append(msg);
                         log.error(msg);
                     }
-
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);