Browse Source

相机台账管理分页修改

gao.qiang 1 year ago
parent
commit
a86371a2da

+ 1 - 4
business-service/src/main/java/com/ozs/entity/vo/BaseCameraManagementVo.java

@@ -69,8 +69,5 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
     private Integer online;
     
     private Integer enableOrNot;
-
-    private  String  stationName;
-
-    private String cameraCode;
+    
 }

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

@@ -246,7 +246,7 @@ public class BaseCameraManagementController extends BaseController {
                     o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
                 }
                 o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
-                o.setMilesRange(begin + "-" + end);
+                o.setMilesRange(begin + "~" + end);
                 o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
                 if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
                     o.setIsStartRecording(1);

+ 1 - 1
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -131,7 +131,7 @@ public class BaseRailwayManagementController extends BaseController {
                 if (!StringUtils.isEmptySunhh(o.getEndMileage())) {
                     begin = AppendUtils.stringAppend(o.getEndMileage());
                 }
-                o.setMilesRange(end + "-" + begin);
+                o.setMilesRange(end + "~" + begin);
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);