Merge branch '3.0.1' of http://139.186.142.91:10010/r/productDev/parkBike i...

MrShi

13 小时以前 9eeb62c02a7b3c7b95c20678b6a9c74e7f12f943

 server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
@@ -10,6 +11,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingding.DingDingNotice;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.track.RideActiveCache;
import com.doumee.core.track.RideActiveInfo;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.PositionUtil;
import com.doumee.core.utils.StringTools;
@@ -26,12 +29,16 @@
import com.doumee.dao.business.web.request.LocaltionDTO;
import com.doumee.dao.business.web.request.OpenElecBikeRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.UserResponse;
import com.doumee.jtt808.web.endpoint.MessageManager;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesTrackService;
import com.doumee.service.business.PricingRuleService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.apache.xpath.operations.Bool;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -55,6 +62,7 @@
import java.util.concurrent.ConcurrentMap;

@Service
@Slf4j
public class Jtt808Service {
    @Value("${tencent.map.remoteHost}")
    private String mapHost;
@@ -95,6 +103,12 @@

    @Autowired
    PricingRuleService pricingRuleService;
    /** 电车活跃订单缓存:开锁写 / 还车删 / 位置上报读,免高频查 member_rides */
    @Autowired
    private RideActiveCache rideActiveCache;
    /** 骑行轨迹落库(位置上报命中活跃订单时写) */
    @Autowired
    private MemberRidesTrackService memberRidesTrackService;
    public  APIResult<T0201_0500>  bikeControl(@RequestBody T8500 request) {
        Mono<APIResult<T0201_0500>>  result = messageManager.requestR(request, T0201_0500.class);
        APIResult<T0201_0500> data = result.block();
@@ -116,22 +130,27 @@
        gparam.setStatus(Constants.goodsorderStatus.pay);
        gparam.setType(Constants.ZERO);
        Goodsorder goodsorder =  goodsorderService.findOne(gparam);
        this.backBike(goodsorder);
        this.backBike(goodsorder,false);
    }

    /**
     * 自动还车
     * 强制还车
     * @param id
     */
    @Transactional
    public void forceBack(String id){
        Goodsorder goodsorder =  goodsorderService.findById(id);
        this.backBike(goodsorder);
        this.backBike(goodsorder,true);
    }


    /**
     * 还车业务
     * @param goodsorder
     * @param isForce 强制还车 不验证车辆地点
     */
    @Transactional(rollbackFor = {BusinessException.class})
    public void backBike(Goodsorder goodsorder){
    public void backBike(Goodsorder goodsorder, Boolean isForce){
        if(Objects.isNull(goodsorder)){
            throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"无骑行订单记录");
        }
@@ -147,10 +166,14 @@
                        &&Constants.equalsInteger(rides.getType(),Constants.ONE)){
                    //如果是电车并且是骑行中 进行关锁处理
                    Bikes  bike = getElecBikeByCode(rides.getBikeCode());
                    //查询停车站点信息
                    if(bike.getSiteId() ==null){
                        throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "对不起，请按要求前往停车点停车！");
                    //非强制还车 需要限制地点
                    if(!isForce){
                        //查询停车站点信息
                        if(bike.getSiteId() ==null){
                            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "对不起，请按要求前往停车点停车！");
                        }
                    }

                    lockBikes(bike.getDeviceSn(),Constants.ONE);//发起关锁指令请求
                    backIds.add(rides.getId());
                    rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//已还车
@@ -163,6 +186,12 @@
                    rides.setDuration( rideTime > freeRentTime  ? rideTime : 0 );
                    rides.setEditDate(rides.getBackDate());
                    memberRidesJoinMapper.updateById(rides);//更新骑行状态为已还车
                    // 电车还车→已还车:删除活跃订单缓存,后续上报不再写该订单轨迹
                    try {
                        rideActiveCache.remove(rides.getBikeCode());
                    } catch (Exception e) {
                        log.warn("删除活跃订单缓存失败 bikeCode={}", rides.getBikeCode(), e);
                    }
                }
            }
        }
@@ -217,7 +246,7 @@
        APIResult<T0201_0500> data = result.block();
        if(!data.isSuccess()){
            //如果开锁失败，则返回异常
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，"+(type ==0?"车辆关锁":"车辆开锁")+"失败，请稍后重试，或者联系园区管理人员！");
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，"+(type ==0?"车辆开锁":"车辆关锁")+"失败，请稍后重试，或者联系园区管理人员！");
        }
    }

@@ -371,6 +400,22 @@
                    .set( Bikes::getHeartDate,date)
                    .eq(Bikes::getId,bikes.getId()));

            // 电车位置上报:查活跃订单缓存,命中则写一条轨迹(坐标有效才写);整体容错不阻断位置更新主流程
            if(bike.getLatitude() != null && bike.getLongitude() != null){
                try {
                    RideActiveInfo active = rideActiveCache.get(bikes.getCode());
                    if(active != null){
                        // 命中活跃订单:落库轨迹点(经纬度为转换后的高德 GCJ02,reportTime 为设备上报时间)
                        memberRidesTrackService.record(bikes.getId(), bikes.getCode(),
                                active.getRidesId(), active.getOrderId(),
                                bike.getLongitude(), bike.getLatitude(),
                                DateUtil.getDateFromLocalDateTime(m.getDeviceTime()));
                    }
                } catch (Exception e) {
                    log.warn("轨迹写入失败 bikeCode={}", bikes.getCode(), e);
                }
            }

            if(bikes.getVoltage().compareTo(lowVoltage)>=Constants.ZERO
                    && bike.getVoltage().compareTo(lowVoltage)<Constants.ZERO){
                //发送钉钉通知
@@ -407,9 +452,13 @@
        }
        Bikes bike = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,openElecBikeRequest.getCode()).eq(Bikes::getIsdeleted,Constants.ZERO)
                .eq(Bikes::getType,Constants.ONE).last(" limit 1 "));

        if(bike == null && StringUtils.isBlank(bike.getParamId())){
            //如果车辆类型是空
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 该车型暂时不能借车操作哦，请更换其他车型重试！");
        }
        if(!Constants.equalsInteger(bike.getBikeStatus(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"该车辆状态异常，不支持出借，请尝试更换其他车辆！");
        }
        if(!Constants.equalsInteger(bike.getStatus(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该车辆已被锁定借用，请尝试更换其他车辆！");
@@ -459,6 +508,13 @@
            memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
            memberRides.setCloseStatus(Constants.ZERO);
            memberRidesJoinMapper.insert(memberRides);
            // 电车开锁成功→骑行中:写入「车辆→活跃订单」缓存,供后续位置上报 O(1) 取订单写轨迹
            // 容错:缓存写入失败不得阻断开锁主流程
            try {
                rideActiveCache.set(memberRides.getBikeCode(), memberRides.getId(), memberRides.getOrdreId());
            } catch (Exception e) {
                log.warn("写入活跃订单缓存失败 bikeCode={}", memberRides.getBikeCode(), e);
            }
            BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
            return memberRidesDetailResponse;
        }catch (BusinessException biz){
@@ -508,6 +564,12 @@
        memberRides.setEditDate(memberRides.getBackDate());
        memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
        memberRidesJoinMapper.updateById(memberRides);
        // 临停恢复骑行:刷新缓存(临停期间未删,此处重置 TTL 防临界过期)
        try {
            rideActiveCache.set(memberRides.getBikeCode(), memberRides.getId(), memberRides.getOrdreId());
        } catch (Exception e) {
            log.warn("刷新活跃订单缓存失败 bikeCode={}", memberRides.getBikeCode(), e);
        }
    }


@@ -608,6 +670,12 @@
                        rides.setDuration( rideTime > freeRentTime  ? rideTime : 0 );
                        rides.setEditDate(rides.getBackDate());
                        memberRidesJoinMapper.updateById(rides);//更新骑行状态为已还车
                        // 电车还车→已还车(临停超时自动还车):删除活跃订单缓存
                        try {
                            rideActiveCache.remove(rides.getBikeCode());
                        } catch (Exception e) {
                            log.warn("删除活跃订单缓存失败 bikeCode={}", rides.getBikeCode(), e);
                        }
                    }
                }
            }
@@ -632,11 +700,53 @@
        }
    }

    public String updateLockStatusBatch(UserResponse user, List<String> idList, Integer lockStatus) {
        if(idList ==null && idList.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String message = "";
        int sNum =0,eNum=0,ingNum=0;
        lockStatus = lockStatus==0?0:1;
        List<Bikes> bikesList = bikesMapper.selectList(new LambdaQueryWrapper<Bikes>()
                .eq(Bikes::getType,Constants.ONE)
                .in(Bikes::getIsdeleted,Constants.ZERO)
                .in(Bikes::getId,idList)
        );
        for(Bikes bike: bikesList){
            if(Constants.equalsInteger(bike.getStatus(),Constants.ONE)){
                //出借中
                ingNum++;
                continue;
            }
            boolean r = true;
            try {
                this.lockBikes(bike.getDeviceSn(),lockStatus==0?1:0);
            }catch (Exception e){
                log.error(e.getMessage());
                r =false;
                eNum++;
            }
            if(r){
                bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda()
                        .set(Bikes::getEditDate,new Date())
                        .set(Bikes::getEditor,user.getId())
                        .set(Bikes::getLockStatus,lockStatus)
                        .set(Bikes::getIsdeleted,Constants.ZERO)
                        .eq(Bikes::getType,Constants.ONE )
                        .eq(Bikes::getId,bike.getId()));
                sNum++;
            }
        }
       message="成功操作["+sNum+"]辆电车";
        if(ingNum>0){
            message = message+"，["+ingNum+"]辆电车正出借中";
        }
        if(eNum>0){
            message = message+"，["+eNum+"]辆电车远程操作失败";
        }
        return message;
    }


//    public void test(double lat,double lng){
//        this.getBackSiteByPostion(lat,lng);
//    }


}