Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -374,12 +374,12 @@ public class BaseCameraManagementController extends BaseController {
 //        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
 //        baseCameraManagement.setDeptName(sysDept.getDeptName());
         baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
-//        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-//        baseCameraManagement.setInstallMiles(mils);
-//        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-//        baseCameraManagement.setEndMiles(end);
-//        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-//        baseCameraManagement.setBeginMiles(begin);
+        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+        baseCameraManagement.setInstallMiles(mils);
+        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+        baseCameraManagement.setEndMiles(end);
+        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+        baseCameraManagement.setBeginMiles(begin);
         if (!StringUtils.isEmptySunhh(baseCameraManagement.getInstallMile())) {
             baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile()/1000);
         }
@@ -390,7 +390,7 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setEndMile(baseCameraManagement.getEndMile()/1000);
         }
         baseCameraManagement.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
-//        baseCameraManagement.setMilesRange(begin + "-" + end);
+        baseCameraManagement.setMilesRange(begin + "-" + end);
         baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
         return AjaxResult.success(baseCameraManagement);
     }