提交全图监控

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfTruckAxleNumRepository.java

@@ -24,7 +24,7 @@ public class KwfTruckAxleNumRepository extends ServiceImpl<KwTruckAxleNumMapper,
                 .last("limit 1"));
     }
 
-    public List<TmsTruckAxleNum> queryByIds(Set<String> carAxisIds) {
+    public List<TmsTruckAxleNum> queryByIds(Set<Integer> carAxisIds) {
         return  list(Wrappers.<TmsTruckAxleNum>lambdaQuery()
                 .eq(TmsTruckAxleNum::getStatus,1)
                 .in(TmsTruckAxleNum::getId, carAxisIds));

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -1862,8 +1862,9 @@ public class KwfTruckService {
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( records)){
             return PageDataResult.empty(req.getPageNum(),req.getPageSize());
         }
-        Set<String> carAxisIds = records.stream()
-                .map(KwfTruck::getCarAxis)
+        Set<Integer> carAxisIds = records.stream()
+                .filter(x-> StringUtils.isNotBlank(x.getCarAxis()))
+                .map(x->Integer.parseInt(x.getCarAxis()))
                 .collect(Collectors.toSet());
         Map<Integer, TmsTruckAxleNum> truckAxleNumMap = Maps.newHashMap();
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(carAxisIds)){
@@ -1880,7 +1881,8 @@ public class KwfTruckService {
             truckInfoVo.setId(truck.getId());
             truckInfoVo.setTruckNo(truck.getTruckNo());
             truckInfoVo.setBusinessStatus(truck.getBusinessStatus());
-            TmsTruckAxleNum tmsTruckAxleNum = finalTruckAxleNumMap.getOrDefault(truck.getCarAxis(), new TmsTruckAxleNum());
+            Integer carAxisId = StringUtils.isNotBlank(truck.getCarAxis()) ? Integer.parseInt(truck.getCarAxis()) : null;
+            TmsTruckAxleNum tmsTruckAxleNum = finalTruckAxleNumMap.getOrDefault(carAxisId, new TmsTruckAxleNum());
             truckInfoVo.setCarAxis(tmsTruckAxleNum.getName());
             return truckInfoVo;
         }).collect(Collectors.toList());