硬件协议对接

jiangping

2023-11-03 b52604d53c7568a522f2e0b471a72dbcd4d022fe

硬件协议对接

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -35,7 +35,7 @@
    public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
    public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
    //车辆类型数据
    public static final String  BIKE_TYPE ="1,2,3,4,5,6,7,8" ;
    public static final String  BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
    public static String REDIS_DEBUG_STR="test_";
    public static final String AD = "AD";
    public static String REPAIR = "REPAIR";

 server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java

@@ -104,6 +104,7 @@
                    bikes.setBackLockId( lockid);
                    bikes.setBackSiteId( siteid);
                    bikes.setBackCommondId(logId);
                    bikes.setStatus(pjson.getInteger("status"));
                    result = memberRidesService.mqttCloseBikeEvent(bikes);
                    logInfo = "mqtt消息订阅还车消息";
                    log.info("mqtt消息订阅=========还车==========成功");

 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java

@@ -584,7 +584,7 @@
        //车辆记录
        Bikes bikes = dealBikesByParam(model);
        //状态，0闭合, 1打开，2运行中, 3异常
        if(model.getStatus() == Constants.LockStatus.open){
        if(locks.getStatus() == Constants.LockStatus.open){
            //如果是开锁业务，判断是否有开锁中的信息
            MemberRides memberRides = new MemberRides();
            memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -644,12 +644,15 @@
        if(bikes != null ) {
            if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
                //如果绑定车辆信息发生编号，更换绑定关系
                String type =getBileTypeByCode(model.getBikeCode());
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
                updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
                updateWrapper.lambda().set(Bikes::getParamId,type);
                //更新自行站点锁头绑定自行车信息
                bikesMapper.update(null,updateWrapper);
                bikes.setCode(model.getBikeCode());
                bikes.setParamId(model.getBikeType());
            }
        }else{
            bikes = new Bikes();
@@ -751,6 +754,8 @@
            updateWrapper.lambda().set(Locks::getEditDate, new Date() );
            updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
            locksMapper.update(null,updateWrapper);
            model.setStatus(locks.getStatus());
            model.setBikeCode(locks.getBikeCode());
        }
        model.setSites(sites);
        return  model;
@@ -769,6 +774,7 @@
        locks.setCode(bikes.getBackLockId());
        locks.setBikeCode(bikes.getBikeCode());
        locks.setInfo(bikes.getBackCommondId());
        locks.setStatus(bikes.getStatus());
        //处理锁头数据
         mqttLockInfoEvent(locks);
        //免费骑行时长查询，数据字典配置