diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index 466e99770e..adefcce4b1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java @@ -104,6 +104,6 @@ public interface BaseTrailerMapper extends BaseMapper { @Select("select * from base_trailer where vehSid = #{vehSid}") List getByVehSid(@Param("vehSid") String vehSid); - @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid}") + @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid} order by id desc limit 1") BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 6735557dc6..04753e457c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -2723,6 +2723,33 @@ public class FinBillApplicationService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List vehicleList = baseMapper.getSelectBySid(bv.getBusinessSid()); + vehicleList.removeAll(Collections.singleton(null)); + if (!vehicleList.isEmpty()) { + vehicleList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + //============================================================================ + } } else { //极光推送 finBillApplication = fetchBySid(businessSid); @@ -3563,6 +3590,32 @@ public class FinBillApplicationService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + Future future1 = pool.submit(() -> { + List dtoList = new ArrayList<>(); + List vehicleList = baseMapper.getSelectBySid(bv.getBusinessSid()); + vehicleList.removeAll(Collections.singleton(null)); + if (!vehicleList.isEmpty()) { + vehicleList.stream().forEach(v -> { + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey()); + baseVehicleStateDto.setBusSid(v); + dtoList.add(baseVehicleStateDto); + }); + ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + //============================================================================ } else { //极光推送 finBillApplication = fetchBySid(businessSid); @@ -3722,32 +3775,7 @@ public class FinBillApplicationService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - Future future1 = pool.submit(() -> { - List dtoList = new ArrayList<>(); - List vehicleList = baseMapper.getSelectBySid(bv.getBusinessSid()); -// List vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid()); - vehicleList.removeAll(Collections.singleton(null)); - if (!vehicleList.isEmpty()) { - vehicleList.stream().forEach(v -> { - BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); - baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey()); - baseVehicleStateDto.setBusSid(v); - dtoList.add(baseVehicleStateDto); - }); - ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - //============================================================================ + try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build();