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

换电工单生成防止重复、自动生成、自动完成

Browse Source
This commit is contained in:
attiya 2025-04-22 16:13:39 +08:00
parent a6cfb9e4c9
commit fcb6180bd2
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,4 +81,13 @@ public interface MaintenanceFeignClient {
*/ */
@PostMapping("ebikeBikeInfo/deleteBatteryInfo") @PostMapping("ebikeBikeInfo/deleteBatteryInfo")
JsonResult<List<RspBikeInfo>> deleteBatteryInfo(@RequestBody List<String> batteryCodes); JsonResult<List<RspBikeInfo>> deleteBatteryInfo(@RequestBody List<String> batteryCodes);
/**
* 根据ecuSn生成换电工单
*
* @param ecuSn 中控编号编号
* @return 结果
*/
@GetMapping("ebikeOrder/changeBattery")
JsonResult<?> changeBattery(@RequestParam(name = "ecuSn") String ecuSn);
} }

4
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -39,10 +39,11 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
EbikeBikeInfo ebikeBikeInfo = infoMapper.selectOneByQuery(queryWrapper); EbikeBikeInfo ebikeBikeInfo = infoMapper.selectOneByQuery(queryWrapper);
queryWrapper.clear(); queryWrapper.clear();
queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_ID.eq(ebikeBikeInfo.getBikeId())) queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_ID.eq(ebikeBikeInfo.getBikeId()))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0")); .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
EbikeBikeOrder order = this.mapper.selectOneByQuery(queryWrapper); EbikeBikeOrder order = this.mapper.selectOneByQuery(queryWrapper);
if (order != null) { if (order != null) {
throw new RuntimeException("该车辆已存在换电工单，无需重复生成"); throw new RuntimeException("该车辆存在未完成的换电工单，无需重复生成");
} }
//生成工单 //生成工单
EbikeBikeOrder bikeOrder = new EbikeBikeOrder(); EbikeBikeOrder bikeOrder = new EbikeBikeOrder();
@ -57,6 +58,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
public void doneChangeBattery(String bikeId, String receiverId) { public void doneChangeBattery(String bikeId, String receiverId) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId)) .where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0")); .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper); EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
if (bikeOrder == null){ if (bikeOrder == null){

8
ebike-report/src/main/java/com/cdzy/ebikereport/component/ReoprtHandler.java
View File

@ -6,6 +6,7 @@ import com.cdzy.common.model.ResGPSDto;
import com.cdzy.ebikereport.enums.BitSwitch; import com.cdzy.ebikereport.enums.BitSwitch;
import com.cdzy.ebikereport.utils.BinaryUtil; import com.cdzy.ebikereport.utils.BinaryUtil;
import com.cdzy.ebikereport.utils.RedisUtil; import com.cdzy.ebikereport.utils.RedisUtil;
import com.ebike.feign.clients.MaintenanceFeignClient;
import com.ebike.feign.clients.OperateFeignClient; import com.ebike.feign.clients.OperateFeignClient;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.data.geo.Point; import org.springframework.data.geo.Point;
@ -25,6 +26,9 @@ public class ReoprtHandler {
@Resource @Resource
private OperateFeignClient operateFeignClient; private OperateFeignClient operateFeignClient;
@Resource
private MaintenanceFeignClient maintenanceFeignClient;
/** /**
* 报文处理 * 报文处理
*/ */
@ -48,8 +52,8 @@ public class ReoprtHandler {
char isWheelSpin = binary.charAt(BitSwitch.IS_WHEEL_SPIN); char isWheelSpin = binary.charAt(BitSwitch.IS_WHEEL_SPIN);
char isMoving = binary.charAt(BitSwitch.IS_MOVING); char isMoving = binary.charAt(BitSwitch.IS_MOVING);
ResGPSDto resGpsDto = param.toJavaObject(ResGPSDto.class); ResGPSDto resGpsDto = param.toJavaObject(ResGPSDto.class);
if (resGpsDto.getSoc() < 20){ if (resGpsDto.getSoc() > 0 && resGpsDto.getSoc() < 20){
//TODO:生成换电工单 maintenanceFeignClient.changeBattery(deviceId);
} }
resGpsDto.setEcuSn(deviceId); resGpsDto.setEcuSn(deviceId);
resGpsDto.setHelmetExit(helmet); resGpsDto.setHelmetExit(helmet);