导入导出模板修改

business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraManagementVos.java

@@ -98,4 +98,16 @@ public class BaseCameraManagementVos implements Serializable {
     @Excel(name = "备注")
     private String remark;
 
+    /**
+     * 相机序列号
+     */
+    @Excel(name = "序列号")
+    private String cameraSn;
+
+    /**
+     * 测点名称
+     */
+    @Excel(name = "测点名称")
+    private String measurePointName;
+
 }

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

@@ -100,18 +100,37 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                         }
                         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                         if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
-                            if (!accountManagement.getBeginMiles().matches(PATTERN) || !accountManagement.getInstallMiles().matches(PATTERN) || !accountManagement.getEndMiles().matches(PATTERN)) {
+                            if (!accountManagement.getInstallMiles().matches(PATTERN)) {
                                 failureNum++;
-                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,里程位置填写格式不正确,请填写数字");
+                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,安装里程位置填写格式不正确,请填写数字");
                             } else {
-                                Double install =Double.valueOf(accountManagement.getInstallMiles());
-                                Double end = Double.valueOf( accountManagement.getEndMiles());
-                                Double begin = Double.valueOf(accountManagement.getBeginMiles());
+                                Double install = Double.valueOf(accountManagement.getInstallMiles());
                                 accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
                                 accountManagement.setInstallMile((int) (install * 1000));
-                                accountManagement.setEndMile((int) (end * 1000));
-                                accountManagement.setBeginMile((int) (begin * 1000));
-                                if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                if (!ObjectUtils.isEmpty(accountManagement.getBeginMiles()) && !ObjectUtils.isEmpty(accountManagement.getEndMiles())) {
+                                    Double end = Double.valueOf(accountManagement.getEndMiles());
+                                    Double begin = Double.valueOf(accountManagement.getBeginMiles());
+                                    accountManagement.setEndMile((int) (end * 1000));
+                                    accountManagement.setBeginMile((int) (begin * 1000));
+                                    if (!accountManagement.getBeginMiles().matches(PATTERN) || !accountManagement.getEndMiles().matches(PATTERN)) {
+                                        failureNum++;
+                                        failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围里程位置填写格式不正确,请填写数字");
+                                    } else {
+                                        if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                            baseCameraManagementMapper.insert(accountManagement);
+                                            BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                                            baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                                            baseDeviceDynamicManagement.setUpdateBy(userId);
+                                            baseDeviceDynamicManagement.setCreateBy(userId);
+                                            baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                                            successNum++;
+                                            successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                                        } else {
+                                            failureNum++;
+                                            failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
+                                        }
+                                    }
+                                } else {
                                     baseCameraManagementMapper.insert(accountManagement);
                                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
                                     baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
@@ -120,9 +139,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                                     baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
                                     successNum++;
                                     successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
-                                } else {
-                                    failureNum++;
-                                    failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
                                 }
                             }
                         } else {
@@ -174,7 +190,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉!需导入数据共有"+accountManageList.size()+"条。数据导入成功共 " + successNum + " 条。数据导入失败共 " + failureNum + " 条。错误如下：");
+            failureMsg.insert(0, "很抱歉!需导入数据共有" + accountManageList.size() + "条。数据导入成功共 " + successNum + " 条。数据导入失败共 " + failureNum + " 条。错误如下：");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "恭喜您!数据已全部导入成功！共 " + successNum + " 条。");