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

整车绑定前部件出库接口对接

Browse Source
This commit is contained in:
dzl 2025-05-28 09:49:08 +08:00
parent 99a84b470b
commit 6721873233
6 changed files with 250 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ebike-common/src/main/java/com/cdzy/common/model/EbikeBatteryOutRecords.java Normal file
View File

@ -0,0 +1,27 @@
package com.cdzy.common.model;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
/**
* 电池出库记录 实体类。
*
* @author dingchao
* @since 2025-03-25
*/
@Data
public class EbikeBatteryOutRecords {
/**
* 电池编号
*/
private String batteryCode;
}

32
ebike-common/src/main/java/com/cdzy/common/model/EbikeEcuOutRecords.java Normal file
View File

@ -0,0 +1,32 @@
package com.cdzy.common.model;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
/**
* 实体类。
*
* @author zjd
* @since 2025-05-19
*/
@Data
public class EbikeEcuOutRecords {
/**
* 中控编码
*/
private String ecuCode;
/**
* 中控序列号
*/
private String ecuSn;
}

27
ebike-common/src/main/java/com/cdzy/common/model/EbikeHelmetOutRecords.java Normal file
View File

@ -0,0 +1,27 @@
package com.cdzy.common.model;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
/**
* 头盔出库记录 实体类。
*
* @author dingchao
* @since 2025-03-25
*/
@Data
public class EbikeHelmetOutRecords {
/**
* 头盔编号
*/
private String helmetCode;
}

72
ebike-common/src/main/java/com/cdzy/common/model/ReqComponentOutRecordDto.java Normal file
View File

@ -0,0 +1,72 @@
package com.cdzy.common.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 设备部件出库Dto
*
* @author zjd
* @date 2025/5/20
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ReqComponentOutRecordDto {
/**
* 部件记录主键。若存在记录ID则传递，若无则可不传。
*/
private String componentOutRecordId;
/**
* 所属区域，表示设备部件出库的区域。
*/
private String owningRegion;
/**
* 原部件处理方案
*/
private String oldComponentHandleOption;
/**
* 部件类型ID，表示部件的类别（如电池、ECU等，部件的编号）。
*/
private String componentType;
/**
* 出库数量，表示该批次部件的数量。
*/
private Integer outQuantity;
/**
* 入库数量
*/
private Integer enterQuantity;
/**
* 入库类型：0或空 表示暂存，1 表示出库。
*/
private Integer stockInType;
/**
* 是否为整车绑定出库
*/
private Boolean isWholeBinding;
/**
* 中控信息列表，包含所有ECU部件的出库记录。
*/
private List<EbikeEcuOutRecords> ebikeEcuOutRecords;
/**
* 头盔信息列表，包含所有头盔部件的出库记录。
*/
private List<EbikeHelmetOutRecords> ebikeHelmetOutRecords;
/**
* 电池信息列表，包含所有电池部件的出库记录。
*/
private List<EbikeBatteryOutRecords> ebikeBatteryOutRecords;
}

9
ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java
View File

@ -8,6 +8,7 @@ import com.ebike.feign.model.res.ReqEbikeTrackingDto;
import com.ebike.feign.model.res.ReqUserOperateDto;
import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetDto;
import com.ebike.feign.model.rsp.FeignEbikeRegionDto;
import com.cdzy.common.model.ReqComponentOutRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.GetMapping;
@ -163,4 +164,12 @@ public interface OperateFeignClient {
@PostMapping("ebikeTracking/querySite")
JsonResult<?> querySite(@RequestBody ReqEbikeSiteQuery siteQuery);
/**
* 部件出库
*
* @param reqComponentOutRecordDto 出库参数
* @return
*/
@PostMapping("ebikeComponent/ComponentInventoryOutbound")
JsonResult<?> componentInventoryOutbound(@RequestBody ReqComponentOutRecordDto reqComponentOutRecordDto);
}

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

@ -5,10 +5,8 @@ import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.cdzy.common.enums.Code;
import com.cdzy.common.model.CoreResult;
import com.cdzy.common.model.JsonResult;
import com.cdzy.common.model.PageParam;
import com.cdzy.common.model.ResGPSDto;
import com.cdzy.common.model.*;
import com.cdzy.common.utils.CoordinateUtil;
import com.cdzy.ebikemaintenance.controller.EbikeInfoCoreController;
import com.cdzy.ebikemaintenance.enums.EbikeStatus;
@ -21,6 +19,7 @@ import com.cdzy.ebikemaintenance.service.EbikeBikeOrderService;
import com.cdzy.ebikemaintenance.utils.GeoCodingUtil;
import com.cdzy.ebikemaintenance.utils.MinioUtil;
import com.cdzy.ebikemaintenance.utils.RedisUtil;
import com.ebike.feign.clients.OperateFeignClient;
import com.ebike.feign.clients.StaffFeignClient;
import com.ebike.feign.model.res.ReqEcuSnDto;
import com.ebike.feign.model.res.StaffIds;
@ -36,6 +35,7 @@ import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.common.errors.ResourceNotFoundException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@ -104,6 +104,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
private EbikeBatteryInfoServiceImpl ebikeBatteryInfoServiceImpl;
@Resource
private StaffFeignClient staffFeignClient;
@Autowired
private OperateFeignClient operateFeignClient;
@Resource
private EbikeBikeComMapper ebikeBikeComMapper;
@Resource
@ -122,11 +124,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
@Resource
private EbikeVehicleListingRecordsMapper ebikeVehicleListingRecordsMapper;
@Resource
private EbikeDispatchRecordsMapper ebikeDispatchRecordsMapper;
private EbikeDispatchRecordsMapper ebikeDispatchRecordsMapper;
@Resource
private EbikeScheduleWorkOrderExtensionMapper ebikeScheduleWorkOrderExtensionMapper;
@Resource
private EbikeVehicleDispatchFileMapper ebikeVehicleDispatchFileMapper;
@Override
public EbikeBikeInfo getByBikeCode(String bikeCode) {
QueryWrapper query = QueryWrapper.create();
@ -152,10 +155,42 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
BeanUtils.copyProperties(reqEbikeBikeInfoDto.getEbikeBatteryInfo(), ebikeBatteryInfo);
EbikeEcuInfo ebikeEcuInfo = new EbikeEcuInfo();
BeanUtils.copyProperties(reqEbikeBikeInfoDto.getEbikeEcuInfo(), ebikeEcuInfo);
//部件出库
ReqComponentOutRecordDto reqComponentOutRecordDto = new ReqComponentOutRecordDto();
reqComponentOutRecordDto.setOldComponentHandleOption("整车绑定出库");
reqComponentOutRecordDto.setStockInType(1);
reqComponentOutRecordDto.setOutQuantity(1);
reqComponentOutRecordDto.setIsWholeBinding(true);
List<EbikeEcuOutRecords> ebikeEcuOutRecords = new ArrayList<>();
EbikeEcuOutRecords ecuOutRecords = new EbikeEcuOutRecords();
BeanUtils.copyProperties(ebikeEcuInfo, ecuOutRecords);
ebikeEcuOutRecords.add(ecuOutRecords);
reqComponentOutRecordDto.setEbikeEcuOutRecords(ebikeEcuOutRecords);
reqComponentOutRecordDto.setComponentType("262711452730008");
//ecu出库
operateFeignClient.componentInventoryOutbound(reqComponentOutRecordDto);
ebikeEcuInfoMapper.insert(ebikeEcuInfo);
ebikeBikeInfo.setEcuId(ebikeEcuInfo.getEcuId());
List<EbikeHelmetOutRecords> ebikeHelmetOutRecords = new ArrayList<>();
EbikeHelmetOutRecords helmetOutRecords = new EbikeHelmetOutRecords();
BeanUtils.copyProperties(ebikeHelmetInfo, helmetOutRecords);
ebikeHelmetOutRecords.add(helmetOutRecords);
reqComponentOutRecordDto.setEbikeHelmetOutRecords(ebikeHelmetOutRecords);
reqComponentOutRecordDto.setComponentType("262711452730001");
//头盔出库
operateFeignClient.componentInventoryOutbound(reqComponentOutRecordDto);
ebikeHelmetInfoMapper.insert(ebikeHelmetInfo);
ebikeBikeInfo.setHelmetId(ebikeHelmetInfo.getHelmetId());
List<EbikeBatteryOutRecords> ebikeBatteryOutRecords = new ArrayList<>();
EbikeBatteryOutRecords batteryOutRecords = new EbikeBatteryOutRecords();
BeanUtils.copyProperties(ebikeBatteryInfo, batteryOutRecords);
ebikeBatteryOutRecords.add(batteryOutRecords);
reqComponentOutRecordDto.setEbikeBatteryOutRecords(ebikeBatteryOutRecords);
reqComponentOutRecordDto.setComponentType("262711452730000");
//电池出库
operateFeignClient.componentInventoryOutbound(reqComponentOutRecordDto);
ebikeBatteryInfoMapper.insert(ebikeBatteryInfo);
ebikeBikeInfo.setBatteryId(ebikeBatteryInfo.getBatteryId());
ebikeBikeInfoMapper.insert(ebikeBikeInfo);
@ -452,8 +487,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
BeanUtils.copyProperties(ebikeBikeFaultReportFile, resEbikeFaultReportFileDto);
//try {
String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultReportFile.getFileBucket(), ebikeBikeFaultReportFile.getFileUniqueKey());
resEbikeFaultReportFileDto.setUrl(faultReportBucket);
String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultReportFile.getFileBucket(), ebikeBikeFaultReportFile.getFileUniqueKey());
resEbikeFaultReportFileDto.setUrl(faultReportBucket);
//} catch (Exception e) {
// throw new RuntimeException(e);
//}
@ -856,13 +891,13 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
* @return
*/
@Override
public Boolean canCellWorkOrder(String orderId,String orderType) {
public Boolean canCellWorkOrder(String orderId, String orderType) {
try {
EbikeBikeOrder ebikeBikeOrder = ebikeBikeOrderMapper.selectOneById(orderId);
ebikeBikeOrder.setHandleState("2");
int b = ebikeBikeOrderMapper.update(ebikeBikeOrder);
QueryWrapper query = QueryWrapper.create();
switch (orderType){
switch (orderType) {
case "1":
EbikeBikeInfo ebikeBikeInfo = ebikeBikeInfoMapper.selectOneById(ebikeBikeOrder.getBikeId());
modifyMaintenanceStatus(ebikeBikeInfo.getBikeCode());
@ -1048,8 +1083,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ResEbikeFaultReportFileDto resEbikeFaultReportFileDto = new ResEbikeFaultReportFileDto();
BeanUtils.copyProperties(ebikeBikeFaultReport, resEbikeFaultReportFileDto);
//try {
String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultReportFile.getFileBucket(), ebikeBikeFaultReportFile.getFileUniqueKey());
resEbikeFaultReportFileDto.setUrl(faultReportBucket);
String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultReportFile.getFileBucket(), ebikeBikeFaultReportFile.getFileUniqueKey());
resEbikeFaultReportFileDto.setUrl(faultReportBucket);
//} catch (Exception e) {
// throw new RuntimeException(e);
//}
@ -1063,8 +1098,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ResEbikeFaultHandleFileDto resEbikeFaultHandleFileDto = new ResEbikeFaultHandleFileDto();
BeanUtils.copyProperties(ebikeBikeFaultHandleFile, resEbikeFaultHandleFileDto);
//try {
String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultHandleFile.getFileBucket(), ebikeBikeFaultHandleFile.getFileUniqueKey());
resEbikeFaultHandleFileDto.setUrl(faultReportBucket);
String faultReportBucket = minioUtil.getFileUrl2(ebikeBikeFaultHandleFile.getFileBucket(), ebikeBikeFaultHandleFile.getFileUniqueKey());
resEbikeFaultHandleFileDto.setUrl(faultReportBucket);
//} catch (Exception e) {
// throw new RuntimeException(e);
//}
@ -1117,6 +1152,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
}
return resEbikeBikeWorkOrderDto;
}
/**
* 批量记录车辆上架信息
*
@ -1155,6 +1191,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
/**
* 创建调度工单信息
*
* @param eqWorkOrderDispatchDto
* @return
*/
@ -1187,7 +1224,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
//获取经纬度
ResEbikeBikeAndEcuCodeDto bikeINfoData = getBikeINfoData(bikeCode);
ResGPSDto resGPSDto = bikeINfoData.getResGPSDto();
if(resGPSDto!=null){
if (resGPSDto != null) {
Double latitude = resGPSDto.getLatitude();
Double longitude = resGPSDto.getLongitude();
dispatchRecord.setStartVehicleLng(longitude);
@ -1217,11 +1254,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
/**
* 根据订单ID 获取车辆调度信息
*
* @param orderId
* @return
*/
public ResDispatchVehicleDto getDispatchVehicleByOrderId(String orderId){
ResDispatchVehicleDto resDispatchVehicleDto=new ResDispatchVehicleDto();
public ResDispatchVehicleDto getDispatchVehicleByOrderId(String orderId) {
ResDispatchVehicleDto resDispatchVehicleDto = new ResDispatchVehicleDto();
EbikeBikeOrder ebikeBikeOrder = ebikeBikeOrderMapper.selectOneById(orderId);
EbikeScheduleWorkOrderExtension ebikeScheduleWorkOrderExtension = ebikeScheduleWorkOrderExtensionMapper.selectOneById(orderId);
@ -1238,11 +1276,13 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
return resDispatchVehicleDto;
}
/**
* 有工单-根据工单ID 车辆编号 新增调度车车辆
*
* @param ebikeDispatchRecordDto
*/
public EbikeDispatchRecords createDispatchRecord(ReqEbikeDispatchRecordDto ebikeDispatchRecordDto){
public EbikeDispatchRecords createDispatchRecord(ReqEbikeDispatchRecordDto ebikeDispatchRecordDto) {
// 检查是否已存在相同的 OrderId 和 BikeCode
QueryWrapper query = QueryWrapper.create();
@ -1261,11 +1301,13 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeDispatchRecords.setStartVehicleLng(ebikeDispatchRecordDto.getStartVehicleLng());
ebikeDispatchRecords.setStartVehicleLat(ebikeDispatchRecordDto.getStartVehicleLat());
ebikeDispatchRecords.setDispatchState(ebikeDispatchRecordDto.getDispatchState());
ebikeDispatchRecordsMapper.insert(ebikeDispatchRecords);
ebikeDispatchRecordsMapper.insert(ebikeDispatchRecords);
return ebikeDispatchRecords;
}
/**
* 删除调度记录接口
*
* @param recordId
* @return
*/
@ -1324,7 +1366,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
String bikeCode = queryParam.getBikeCode();
// 根据 bikeCode 查找 bikeId
QueryWrapper query = QueryWrapper.create();
query.eq("bike_code",bikeCode);
query.eq("bike_code", bikeCode);
EbikeBikeInfo ebikeBikeInfo = ebikeBikeInfoMapper.selectOneByQuery(query);
if (ebikeBikeInfo.getBikeId() == null) {
@ -1340,7 +1382,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
// 调用服务层方法，执行车辆状态更新
int update = ebikeBikeInfoMapper.update(updateDto);
if(update>0){
if (update > 0) {
return JsonResult.success("车辆状态修改成功");
} else {
return JsonResult.failed("车辆状态修改失败");
@ -1353,19 +1395,19 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
* @param param 完成投放请求参数 orderId
* @return
*/
public JsonResult<?> completeDeployment(Map<String,Object> param) {
public JsonResult<?> completeDeployment(Map<String, Object> param) {
String orderId = MapUtil.getStr(param, "orderId");
List<Map<String,Object>> fileLists = (List<Map<String,Object>>) param.get("fileLists");
List<Map<String, Object>> fileLists = (List<Map<String, Object>>) param.get("fileLists");
//设置一个关联ID
if(fileLists!=null && fileLists.size()>0){
if (fileLists != null && fileLists.size() > 0) {
String siteId = MapUtil.getStr(param, "siteId");
String after_dispatch_photo=UUID.randomUUID().toString();
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) {
for (Map<String, Object> fileList : fileLists) {
EbikeVehicleDispatchFile ebikeVehicleDispatchFile = new EbikeVehicleDispatchFile();
ebikeVehicleDispatchFile.setFileName(fileList.get("fileName") != null ? fileList.get("fileName").toString() : "");
ebikeVehicleDispatchFile.setFileSize(fileList.get("fileSize") != null ? fileList.get("fileSize").toString() : "");
@ -1376,7 +1418,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeVehicleDispatchFile.setUpdatedAt(LocalDateTime.now());
ebikeVehicleDispatchFile.setReportId(after_dispatch_photo);
ebikeVehicleDispatchFileMapper.insert(ebikeVehicleDispatchFile);
}
}
}
//根据orderId 完成订单
EbikeBikeOrder ebikeBikeOrder = new EbikeBikeOrder();
@ -1386,7 +1428,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeBikeOrderMapper.update(ebikeBikeOrder);
//根据订单ID 查出需要投放的车辆 进行修改状态
QueryWrapper query = QueryWrapper.create();
query.eq("order_id",orderId);
query.eq("order_id", orderId);
List<EbikeDispatchRecords> ebikeDispatchRecords = ebikeDispatchRecordsMapper.selectListByQuery(query);
for (EbikeDispatchRecords ebikeDispatchRecord : ebikeDispatchRecords) {
ebikeDispatchRecord.setDispatchState("1");
@ -1409,7 +1451,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
// 获取分页参数
com.cdzy.ebikemaintenance.model.dto.request.PageParam pageParam = param.getPageParam();
int pageNum = pageParam.getPageNum();
int pageSize = pageParam.getPageSize();
int pageSize = pageParam.getPageSize();
String orderType = param.getOrderType();
String bikeCode = param.getBikeCode();
// 创建查询条件
@ -1426,8 +1468,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
query.eq("order_type", orderType);
}
// 执行查询，获取工作订单列表
Page<ResEbikeWorkOrderSummaryDto> resEbikeWorkOrderSummaryDtoPage = ebikeBikeOrderMapper
.paginateAs(pageNum,pageSize, query,ResEbikeWorkOrderSummaryDto.class);
Page<ResEbikeWorkOrderSummaryDto> resEbikeWorkOrderSummaryDtoPage = ebikeBikeOrderMapper
.paginateAs(pageNum, pageSize, query, ResEbikeWorkOrderSummaryDto.class);
// 返回查询结果
return JsonResult.success(resEbikeWorkOrderSummaryDtoPage);
} catch (Exception e) {
@ -1437,6 +1479,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
return JsonResult.failed("获取工作订单列表时发生错误。");
}
}
public StaffFeign getStaffFeignInfo() {
String tokenValue = StpUtil.getTokenValue();
// 调用 Feign 客户端获取用户信息
@ -1451,7 +1494,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
/**
*根据regin_id 获取车辆详情和EcuId
* 根据regin_id 获取车辆详情和EcuId
*
* @param regionId
* @return
*/
@ -1459,7 +1503,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
// 创建查询条件
QueryWrapper query = QueryWrapper.create();
// 选择需要的字段，并进行表连接
query.select(EBIKE_BIKE_INFO.ALL_COLUMNS,EBIKE_ECU_INFO.ECU_SN);
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条件
@ -1469,18 +1513,19 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
return JsonResult.success(resEbikeInfoReginIdDtos);
}
private void modifyMaintenanceStatus(String bikeCode){
private void modifyMaintenanceStatus(String bikeCode) {
//是否存在维修中的订单数据
int i = ebikeBikeInfoMapper.selectOrderCount(bikeCode);
//查询车辆是否存在故障
int i1 = ebikeBikeInfoMapper.selectReportCount(bikeCode);
String currentStatus = EbikeStatus.WAITING_FOR_REPAIR;
if(i >0){ //维修中
currentStatus=EbikeStatus.REPAIRING;
} else if(i==0 && i1>0){ //待维修
currentStatus=EbikeStatus.WAITING_FOR_REPAIR;
}else if(i==0 && i1==0){ //待出库
currentStatus=EbikeStatus.WAITING_FOR_SHIPMENT;
if (i > 0) { //维修中
currentStatus = EbikeStatus.REPAIRING;
} else if (i == 0 && i1 > 0) { //待维修
currentStatus = EbikeStatus.WAITING_FOR_REPAIR;
} else if (i == 0 && i1 == 0) { //待出库
currentStatus = EbikeStatus.WAITING_FOR_SHIPMENT;
}
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("bike_code", bikeCode);