|
@@ -184,12 +184,18 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
String mils = AppendUtils.stringAppend(o.getInstallMile());
|
|
|
o.setInstallMiles(mils);
|
|
|
o.setInstallMileBD(new BigDecimal(o.getInstallMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
|
|
|
- String end = AppendUtils.stringAppend(o.getEndMile());
|
|
|
- o.setEndMiles(end);
|
|
|
- o.setEndMileBD(new BigDecimal(o.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
|
|
|
- String begin = AppendUtils.stringAppend(o.getBeginMile());
|
|
|
- o.setBeginMiles(begin);
|
|
|
- o.setBeginMileBD(new BigDecimal(o.getBeginMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
|
|
|
+ String end = "";
|
|
|
+ if(!StringUtils.isEmptySunhh(o.getEndMile())) {
|
|
|
+ end = AppendUtils.stringAppend(o.getEndMile());
|
|
|
+ o.setEndMiles(end);
|
|
|
+ o.setEndMileBD(new BigDecimal(o.getEndMile()).divide(new BigDecimal(1000)).setScale(3, RoundingMode.HALF_UP));
|
|
|
+ }
|
|
|
+ String begin = "";
|
|
|
+ if(!StringUtils.isEmptySunhh(o.getBeginMile())) {
|
|
|
+ begin = AppendUtils.stringAppend(o.getBeginMile());
|
|
|
+ o.setBeginMiles(begin);
|
|
|
+ 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.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
|