相机导入修改

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

@@ -64,19 +64,19 @@ public class BaseCameraManagementVos implements Serializable {
      * 监控相机安装里程位置
      */
     @Excel(name = "监控相机安装里程位置")
-    private Integer installMile;
+    private String installMiles;
 
     /**
      * 监控范围开始里程位置
      */
     @Excel(name = "监控范围开始里程位置")
-    private Integer beginMile;
+    private String beginMiles;
 
     /**
      * 监控范围结束里程位置
      */
     @Excel(name = "监控范围结束里程位置")
-    private Integer endMile;
+    private String endMiles;
 
     /**
      * 线路名称

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

@@ -88,6 +88,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             try {
                 BaseCameraManagement accountManagement = new BaseCameraManagement();
                 BeanUtils.copyProperties(cameraManagementVos, accountManagement);
+                accountManagement.setBeginMile(AppendUtils.stringSplit(accountManagement.getBeginMiles()));
+                accountManagement.setEndMile(AppendUtils.stringSplit(accountManagement.getEndMiles()));
+                accountManagement.setInstallMile(AppendUtils.stringSplit(accountManagement.getInstallMiles()));
                 // 判断相机编码是否存在
                 LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!StringUtils.isEmptySunhh(accountManagement.getCameraCode())) {
@@ -156,8 +159,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
 //                                accountManagement.setInstallMile(accountManagement.getInstallMileBD() * 1000);
 //                                accountManagement.setEndMile(accountManagement.getEndMile() * 1000);
 //                                accountManagement.setBeginMile(accountManagement.getBeginMile() * 1000);
-                            if (accountManagement.getLineDir() == 1) {
-                                if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                if (accountManagement.getBeginMile() <= accountManagement.getEndMile()) {
                                     if (!StringUtils.isEmpty(cameraManagementVos.getMonitoringDirectionName())) {
                                         List<SysDictData> data = dictTypeService.selectDictDataByType("monitoring_direction");
                                         for (SysDictData datum : data) {
@@ -181,33 +183,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                                     failureNum++;
                                     failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
                                 }
-                            }
-                            if (accountManagement.getLineDir() == 2) {
-                                if (accountManagement.getBeginMile() > accountManagement.getEndMile()) {
-                                    if (!StringUtils.isEmpty(cameraManagementVos.getMonitoringDirectionName())) {
-                                        List<SysDictData> data = dictTypeService.selectDictDataByType("monitoring_direction");
-                                        for (SysDictData datum : data) {
-                                            if (datum.getDictLabel().equals(cameraManagementVos.getMonitoringDirectionName())) {
-                                                accountManagement.setMonitoringDirection(Integer.valueOf(datum.getDictValue()));
-                                            }
-                                        }
-                                    }
-                                    if (!StringUtils.isEmpty(cameraManagementVos.getEnableOrNotName())) {
-                                        accountManagement.setEnableOrNot(cameraManagementVos.getEnableOrNotName().equals("启用") ? 1 : 2);
-                                    }
-                                    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 {
                         failureNum++;