相机导入修改

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

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

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

@@ -42,7 +42,7 @@ import java.util.*;
  */
 @Service
 public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManagementMapper, BaseCameraManagement> implements BaseCameraManagementService {
-    public static final String PATTERN = "^[0-9]*$";
+    public static final String PATTERN = "^(\\d+.\\d{1,3}|\\d+)$";
     @Autowired
     protected Validator validator;
     @Autowired
@@ -100,14 +100,17 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                         }
                         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                         if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
-                            if (!accountManagement.getBeginMile().toString().matches(PATTERN) || !accountManagement.getInstallMile().toString().matches(PATTERN) || !accountManagement.getEndMile().toString().matches(PATTERN)) {
+                            if (!accountManagement.getBeginMiles().matches(PATTERN) || !accountManagement.getInstallMiles().matches(PATTERN) || !accountManagement.getEndMiles().matches(PATTERN)) {
                                 failureNum++;
                                 failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,里程位置填写格式不正确,请填写数字");
                             } else {
+                                Double install =Double.valueOf(accountManagement.getInstallMiles());
+                                Double end = Double.valueOf( accountManagement.getEndMiles());
+                                Double begin = Double.valueOf(accountManagement.getBeginMiles());
                                 accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
-                                accountManagement.setInstallMile(accountManagement.getInstallMile() * 1000);
-                                accountManagement.setEndMile(accountManagement.getEndMile() * 1000);
-                                accountManagement.setBeginMile(accountManagement.getBeginMile() * 1000);
+                                accountManagement.setInstallMile((int) (install * 1000));
+                                accountManagement.setEndMile((int) (end * 1000));
+                                accountManagement.setBeginMile((int) (begin * 1000));
                                 if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
                                     baseCameraManagementMapper.insert(accountManagement);
                                     BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();