车辆统计后端优化

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/CarExceptionDto.java

@@ -6,6 +6,6 @@ import lombok.Data;
 public class CarExceptionDto {
     private String carNumber;
     private String belongStation;
-    private String belongStation1="运行轨迹";
+    private String belongStation1="查看";
     private String carId;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -1796,6 +1796,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
         List<CarEquipAlarmInfoDto> list = carMapper.getCarEquipAlarmInfo(carEquipAlarmBatteryNumber);
         for (int i = 0; i < list.size(); i++) {
             list.get(i).setNo(i+1);
+            list.get(i).setAlarmMessage("该设备电量低于"+carEquipAlarmBatteryNumber+"%!");
         }
         page.setRecords(list);
         page.setTotal(list.size());
@@ -1874,6 +1875,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
                 mileageDtoList.add(mileageDto);
             }
         }
+        mileageDtoList = mileageDtoList.stream().sorted(Comparator.comparing(MileageDto::getTotalTravel).reversed()).collect(Collectors.toList());
         page.setRecords(mileageDtoList);
         page.setTotal(mileageDtoList.size());
         page.setCurrent(1);

amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml

@@ -707,6 +707,7 @@
     <select id="getCarEquipStateInfo" resultType="com.yeejoin.equipmanage.common.entity.dto.CarEquipStateInfoDto">
         SELECT car_num carNum,biz_org_name bizOrgName,extra2
         FROM `wl_car`
+        order by extra2+0 desc
     </select>
     <select id="getCarEquipAlarmInfo" resultType="com.yeejoin.equipmanage.common.entity.dto.CarEquipAlarmInfoDto">
         SELECT car_num carNum,extra2