优化

MrShi

2025-09-15 856f526f823f5dad88c28657d82f971ff66afb1e

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

@@ -19,6 +19,7 @@
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MiniProgrammeDTO;
import com.doumee.dao.business.web.response.UserResponse;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.BikesService;
@@ -118,6 +119,39 @@
        bikesMapper.deleteBatchIds(ids);
    }

    /**
     * 小程序端更新上下级
     * @param user
     * @param ids
     * @param status
     */
    @Override
    public  void updateBikeStatusBatchWx(UserResponse user, List<String> ids, Integer status){
        updateBikeStatusBatchBiz(ids,user.getId(),status);
    }

    /**
     * 管理端端更新上下级
     */
    @Override
    public void updateBikeStatusBatch(List<String> ids,Integer status) {
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        updateBikeStatusBatchBiz(ids,user.getId(),status);
    }
    public void updateBikeStatusBatchBiz(List<String> ids,String userId,Integer status) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        //状态 0停车可出借 1出借中 3禁用
        status =status==0?status:1;
        bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda()
                .set(Bikes::getEditDate,new Date())
                .set(Bikes::getEditor,userId)
                .set(Bikes::getBikeStatus,status)
                .set(Bikes::getIsdeleted,Constants.ZERO)
                .eq(Bikes::getType,Constants.ONE )
                .in(Bikes::getId,ids));
    }
    @Override
    public void updateById(Bikes bikes) {
        Bikes model =bikesMapper.selectById(bikes.getId());
@@ -207,7 +241,7 @@

        QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.LOW_BIKE_VOLTAGE));
                .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.LOW_BIKE_VOLTAGE,Constants.OBLINE_HEART_TIME_LIMIT));
        List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
        Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));
        double low = 0;
@@ -215,6 +249,12 @@
            low = Double.parseDouble(collect.get(Constants.LOW_BIKE_VOLTAGE).getCode());
        }catch (Exception e){
        }
        Integer onlineTime = 60;//默认1分钟未通讯则离线
        try {
            onlineTime = Integer.parseInt(collect.get(Constants.OBLINE_HEART_TIME_LIMIT).getCode());//数据字典配置时长
        }catch (Exception e){
        }
        Date onlineData = new Date(System.currentTimeMillis()-onlineTime*1000);//判断离线在线的时间节点
        IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
@@ -225,6 +265,9 @@
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCode()), Bikes::getCode,pageWrap.getModel().getCode())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getDeviceSn()), Bikes::getDeviceSn,pageWrap.getModel().getDeviceSn())
                .lt( pageWrap.getModel().getIsOnline() !=null&& pageWrap.getModel().getIsOnline() ==0,Bikes::getHeartDate,onlineData)//如果离线
                .gt( pageWrap.getModel().getIsOnline() !=null&& pageWrap.getModel().getIsOnline() ==1,Bikes::getHeartDate,onlineData)//如果在线
                .eq( pageWrap.getModel().getBikeStatus() !=null,Bikes::getBikeStatus,pageWrap.getModel().getBikeStatus())
                .eq( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
                .eq(  Bikes::getType,Constants.formatIntegerNum(pageWrap.getModel().getType()))//默认查询自行车
                .ne(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()))
@@ -249,18 +292,16 @@
                .selectAs(Sites::getName,Bikes::getSiteName) ;
        PageData<Bikes> pageData = PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper));
        double finalLow = low;
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageData.getRecords())){
            pageData.getRecords().forEach(i->{
                if(Constants.equalsInteger(i.getType(),Constants.ONE)){
                    if(Objects.isNull(i.getVoltage())){
                        i.setLowVoltage(Constants.ONE);
                    }else{
                        i.setLowVoltage(i.getVoltage().compareTo(new BigDecimal(Double.toString(finalLow)))>=0?0:1);
                    }
        Date finalOnlineTime = onlineData;
        pageData.getRecords().forEach(i->{
            if(Constants.equalsInteger(i.getType(),Constants.ONE)){
                i.setLowVoltage(Constants.formatDecimalNum(i.getVoltage()).compareTo(new BigDecimal(Double.toString(finalLow)))>=0?0:1);
                i.setIsOnline(Constants.ZERO);//默认离线
                if(i.getHeartDate()!=null && i.getHeartDate().getTime() > finalOnlineTime.getTime()){
                    i.setIsOnline(Constants.ONE);//如果再时间范围内 则在线
                }
            });
        }

            }
        });
        return  pageData;

    }