diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java index 524c9168..604c6058 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java @@ -844,4 +844,14 @@ public class EbikeBikeInfoController { return ebikeBikeInfoService.getWorkOrderList(request); } + /** + *根据regin_id 获取车辆详情和EcuId + * @param regionId + * @return + */ + @GetMapping("getVehicleDetailsByRegionId") + public JsonResult getVehicleDetailsByRegionId(@RequestParam(name = "regionId") String regionId) { + // 调用服务层方法,获取工单列表数据 + return ebikeBikeInfoService.getVehicleDetailsByRegionId(regionId); + } } diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java index 736800e1..04220c28 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java @@ -297,4 +297,11 @@ public interface EbikeBikeInfoService extends IService { * @return 返回工单列表数据 */ JsonResult getWorkOrderList(Map param); + + /** + *根据regin_id 获取车辆详情和EcuId + * @param regionId + * @return + */ + JsonResult getVehicleDetailsByRegionId(String regionId); } diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index b9256d49..99d3f965 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -1353,10 +1353,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl> fileLists = (List>) param.get("fileLists"); //设置一个关联ID if(fileLists!=null && fileLists.size()>0){ + String siteId = MapUtil.getStr(param, "siteId"); String after_dispatch_photo=UUID.randomUUID().toString(); EbikeScheduleWorkOrderExtension ebikeScheduleWorkOrderExtension = new EbikeScheduleWorkOrderExtension(); ebikeScheduleWorkOrderExtension.setAfterDispatchPhoto(after_dispatch_photo); ebikeScheduleWorkOrderExtension.setId(orderId); + ebikeScheduleWorkOrderExtension.setSiteId(siteId); ebikeScheduleWorkOrderExtensionMapper.update(ebikeScheduleWorkOrderExtension); for (Map fileList : fileLists) { EbikeVehicleDispatchFile ebikeVehicleDispatchFile = new EbikeVehicleDispatchFile(); @@ -1441,4 +1443,30 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl getVehicleDetailsByRegionId(String regionId) { + // 创建查询条件 + QueryWrapper query = QueryWrapper.create(); + // 选择需要的字段,并进行表连接 + query.select(EBIKE_BIKE_INFO.ALL_COLUMNS,EBIKE_ECU_INFO.ECU_SN); + query.innerJoin(EBIKE_ECU_INFO) + .on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID)); + // 添加region_id条件 + query.eq(EBIKE_BIKE_INFO.REGIN_ID.getName(), regionId); + // 执行查询并将结果映射为ResEbikeInfoReginIdDto类型 + List resEbikeInfoReginIdDtos = ebikeBikeInfoMapper.selectListByQueryAs(query, ResEbikeInfoReginIdDto.class); + // 返回查询结果 + if (resEbikeInfoReginIdDtos.isEmpty()) { + // 如果查询结果为空,返回一个提示信息 + return JsonResult.failed("未找到相关电动车信息"); + } + return JsonResult.success(resEbikeInfoReginIdDtos); + } + }