attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
attiya 2025-05-07 18:03:50 +08:00
commit 749672efff
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
View File

@ -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);
}
}

7
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java
View File

@ -297,4 +297,11 @@ public interface EbikeBikeInfoService extends IService<EbikeBikeInfo> {
* @return 返回工单列表数据
*/
JsonResult<?> getWorkOrderList(Map<String,Object> param);
/**
*根据regin_id 获取车辆详情和EcuId
* @param regionId
* @return
*/
JsonResult<?> getVehicleDetailsByRegionId(String regionId);
}

28
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -1353,10 +1353,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
List<Map<String,Object>> fileLists = (List<Map<String,Object>>) 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<String,Object> fileList : fileLists) {
EbikeVehicleDispatchFile ebikeVehicleDispatchFile = new EbikeVehicleDispatchFile();
@ -1441,4 +1443,30 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
// 返回获取到的 StaffFeign 数据
return result.getData();
}
/**
*根据regin_id 获取车辆详情和EcuId
* @param regionId
* @return
*/
public JsonResult<?> 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<ResEbikeInfoReginIdDto> resEbikeInfoReginIdDtos = ebikeBikeInfoMapper.selectListByQueryAs(query, ResEbikeInfoReginIdDto.class);
// 返回查询结果
if (resEbikeInfoReginIdDtos.isEmpty()) {
// 如果查询结果为空，返回一个提示信息
return JsonResult.failed("未找到相关电动车信息");
}
return JsonResult.success(resEbikeInfoReginIdDtos);
}
}