From a0e79a5c2830f15cca6ce0dc30a5955395054cc7 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 14 二月 2025 16:02:45 +0800 Subject: [PATCH] jtt808初始化 --- server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java index d38055c..152fa98 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java @@ -1,5 +1,6 @@ package com.doumee.service.business.impl; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; @@ -9,18 +10,25 @@ import com.doumee.dao.business.model.*; 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.system.SystemDictDataMapper; +import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.BikesService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.doumee.service.system.SystemDictDataService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 鑷杞︿俊鎭〃Service瀹炵幇 @@ -34,6 +42,10 @@ private BikesMapper bikesMapper; @Autowired private BikesJoinMapper bikesJoinMapper; + + + @Autowired + SystemDictDataMapper systemDictDataMapper; @Override public String create(Bikes bikes) { @@ -79,6 +91,32 @@ public Bikes findById(String id) { return bikesMapper.selectById(id); } + @Override + public void updateByJtt( Bikes m){ + if(StringUtils.isBlank(m.getDeviceSn() )){ + return; + } + String tSn = m.getDeviceSn(); + if(tSn.length() <12){ + for (int i = 0; i < 12-tSn.length(); i++) { + tSn = "0"+tSn; + } + } + Bikes bikes = bikesJoinMapper.selectOne(new QueryWrapper<Bikes>().lambda() + .eq(Bikes::getDeviceSn,tSn) + .eq(Bikes::getIsdeleted,Constants.ZERO) + .eq(Bikes::getType,Constants.ONE) + .last("limit 1")); + if(bikes == null){ + return; + } + bikesJoinMapper.update(null,new UpdateWrapper<Bikes>().lambda() + .set(m.getLatitude()!=null,Bikes::getLatitude,m.getLatitude()) + .set(m.getVoltage()!=null,Bikes::getVoltage,m.getVoltage()) + .set(m.getLongitude()!=null,Bikes::getLongitude,m.getLongitude()) + .set(m.getHeartDate()!=null,Bikes::getHeartDate,m.getHeartDate()) + .eq(Bikes::getId,bikes.getId())); + } @Override public Bikes findOne(Bikes bikes) { @@ -91,9 +129,16 @@ QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes); return bikesMapper.selectList(wrapper); } - + @Override public PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap) { + + QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK)); + List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper); + Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s)); + IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); @@ -102,9 +147,15 @@ .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId) .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId()) .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName()) - .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId()) - .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode) - .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode); + .eq( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId()) + .ne(Bikes::getLockId,Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode())) + .ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode()) + .and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE, + s->s.isNull(Bikes::getCode) + .or(b->b.eq(Bikes::getCode,""))) + .and(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,s->s + .isNotNull(Bikes::getCode) + .and(b->b.ne(Bikes::getCode,""))); queryWrapper.selectAll(Bikes.class) .selectAs(BaseParam::getName,Bikes::getParamName) .selectAs(Sites::getName,Bikes::getSiteName) ; -- Gitblit v1.9.3