From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 09 十月 2025 11:16:43 +0800 Subject: [PATCH] 优化 --- server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 334 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 318 insertions(+), 16 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 60c9b79..d1fc03f 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,16 +1,25 @@ package com.doumee.service.business.impl; import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.annotation.excel.ExcelImporter; import com.doumee.core.constants.Constants; +import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.exception.BusinessException; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.StringTools; import com.doumee.core.utils.Utils; +import com.doumee.dao.business.BaseParamMapper; import com.doumee.dao.business.BikesMapper; +import com.doumee.dao.business.MemberRidesMapper; import com.doumee.dao.business.join.BikesJoinMapper; import com.doumee.dao.business.model.*; +import com.doumee.dao.business.vo.BikesImportVO; 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; @@ -19,15 +28,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.service.system.SystemDictDataService; +import com.github.xiaoymin.knife4j.core.util.StrUtil; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.shiro.SecurityUtils; +import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.MultipartFile; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.util.*; import java.util.stream.Collectors; /** @@ -38,17 +53,49 @@ @Service public class BikesServiceImpl implements BikesService { + + @Autowired + private RedisTemplate<String, Object> redisTemplate; @Autowired private BikesMapper bikesMapper; @Autowired - private BikesJoinMapper bikesJoinMapper; - - + private BaseParamMapper baseParamMapper; @Autowired - SystemDictDataMapper systemDictDataMapper; + private BikesJoinMapper bikesJoinMapper; + @Autowired + private MemberRidesMapper memberRidesMapper; + @Autowired + private SystemDictDataMapper systemDictDataMapper; @Override public String create(Bikes bikes) { + if(StringUtils.isBlank(bikes.getParamId() ) + ||StringUtils.isBlank(bikes.getCode()) + ||StringUtils.isBlank(bikes.getDeviceSn())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } + if(baseParamMapper.selectCount(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO) + .eq(BaseParam::getType,Constants.FOUR)) ==0){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝g‘鐨勭數杞︾被鍨嬶紒"); + } + QueryWrapper<Bikes> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(Bikes::getCode,bikes.getCode()) + .eq(Bikes::getIsdeleted,Constants.ZERO) + .eq(Bikes::getType,Constants.ONE); + Long count = bikesMapper.selectCount(wrapper); + if (count > 0){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杞︾墝鍙峰彿宸插瓨鍦�"); + } + LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + bikes.setId(UUID.randomUUID().toString().replace("-","")); + bikes.setCreateDate(new Date()); + bikes.setCreator(user.getId()); + bikes.setEditDate(bikes.getCreateDate()); + bikes.setEditor(user.getId()); + bikes.setStatus(Constants.ZERO); + bikes.setIsdeleted(Constants.ZERO); + bikes.setType(Constants.ONE);//鍙兘鏂板鐢佃溅鏁版嵁 bikesMapper.insert(bikes); return bikes.getId(); } @@ -72,9 +119,73 @@ 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) { - bikesMapper.updateById(bikes); + Bikes model =bikesMapper.selectById(bikes.getId()); + if (model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } + QueryWrapper<Bikes> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(Bikes::getCode,bikes.getCode()) + .eq(Bikes::getIsdeleted,Constants.ZERO) + .ne(Bikes::getId,bikes.getId()) + .eq(Bikes::getType,Constants.ONE); + long count = bikesMapper.selectCount(wrapper); + if (count > 0){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杞︾墝鍙峰彿宸插瓨鍦�"); + } + if(StringUtils.isNotBlank(bikes.getParamId()) && + baseParamMapper.selectCount(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO) + .eq(BaseParam::getType,Constants.FOUR)) ==0){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝g‘鐨勭數杞︾被鍨嬶紒"); + } + + LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda() + .set(Bikes::getEditDate,new Date()) + .set(Bikes::getEditor,user.getId()) + .set(StringUtils.isNotBlank(bikes.getCode()),Bikes::getCode,bikes.getCode()) + .set(!StringUtils.equals( model.getCode(),bikes.getCode()),Bikes::getImgurl,null) + .set(StringUtils.isNotBlank(bikes.getDeviceSn()),Bikes::getDeviceSn,bikes.getDeviceSn()) + .set(StringUtils.isNotBlank(bikes.getParamId()),Bikes::getParamId,bikes.getParamId()) + .set(Bikes::getStatus, Constants.ZERO) + .set(Bikes::getIsdeleted, Constants.ZERO) + .eq(Bikes::getId,bikes.getId()) + ); } @Override @@ -90,6 +201,27 @@ @Override public Bikes findById(String id) { return bikesMapper.selectById(id); + } + @Override + public void updateByJtt( Bikes m){ + if(StringUtils.isBlank(m.getDeviceSn() )){ + return; + } + String tSn = StringTools.leftPad(m.getDeviceSn(),12,'0') ; + 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 @@ -109,10 +241,20 @@ QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>(); wrapper.lambda() - .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK)); + .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; + try { + 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()); @@ -121,19 +263,47 @@ .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( 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()) + .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())) + .ne(Constants.formatIntegerNum(pageWrap.getModel().getType())==0, 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,""))); + .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,Bikes::getCode) + .and(Constants.formatIntegerNum(pageWrap.getModel().getType())==0,b->b.ne(Bikes::getCode,""))); + if(pageWrap.getModel().getLowVoltage()!=null){ + if(pageWrap.getModel().getLowVoltage() == Constants.ONE){ + //浣庣數閲� + queryWrapper.lt(Bikes::getVoltage,low); + }else{ + //姝e父鐢甸噺 + queryWrapper.ge(Bikes::getVoltage,low); + } + } queryWrapper.selectAll(Bikes.class) .selectAs(BaseParam::getName,Bikes::getParamName) .selectAs(Sites::getName,Bikes::getSiteName) ; - return PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper)); + PageData<Bikes> pageData = PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper)); + double finalLow = low; + 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; + } @Override public PageData<Bikes> findPage(PageWrap<Bikes> pageWrap) { @@ -204,4 +374,136 @@ QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes); return bikesMapper.selectCount(wrapper); } + + + @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) + public String importBatch(MultipartFile file){ + Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.import_bikes); + if(importing!=null && importing){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸插瓨鍦ㄥ鍏ヤ换鍔℃鍦ㄦ墽琛屼腑锛岃绋嶅悗鍐嶈瘯锛�"); + } + LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + + redisTemplate.opsForValue().set(Constants.RedisKeys.import_bikes,true); + try { + ExcelImporter ie = null; + List<BikesImportVO> dataList =null; + try { + ie = new ExcelImporter(file,1,0, CellType.STRING); // 纭繚鍗曞厓鏍肩被鍨嬩负瀛楃涓� + dataList = ie.getDataList(BikesImportVO.class,null); + } catch (Exception e) { + e.printStackTrace(); + } + if(dataList == null || dataList.size() ==0){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�"); + } + List<Bikes> list = bikesJoinMapper.selectJoinList(Bikes.class,new MPJLambdaWrapper<Bikes>() + .selectAll(Bikes.class) + .eq(Member::getIsdeleted,Constants.ZERO) + ); + List<BaseParam> params = baseParamMapper.selectList(new QueryWrapper<BaseParam>().lambda() + .eq(BaseParam::getIsdeleted,Constants.ZERO) + .eq(BaseParam::getType,Constants.FOUR) + ); + List<Bikes> newList = new ArrayList<>(); + Date date = new Date(); + for(int i=0;i<dataList.size();i++){ + BikesImportVO model = dataList.get(i); + if(StringUtils.isBlank(model.getSn()) + &&StringUtils.isBlank(model.getCode()) + &&StringUtils.isBlank(model.getParamName())){ + continue; + } + Bikes bike = checkModelParam(model,newList,i,list,params,user.getId(),date); + newList.add(bike); + } + if(newList == null || newList.size() ==0){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝褰曞叆鏈夋晥鏁版嵁涓虹┖锛�"); + } + bikesMapper.insert(newList); + return "瀵煎叆鎴愬姛"; + }catch (BusinessException e){ + throw e; + }catch (Exception e){ + throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鍛樺伐淇℃伅瀵煎叆澶辫触锛岃绋嶅悗閲嶈瘯"); + }finally { + redisTemplate.delete(Constants.RedisKeys.import_bikes); + } + } + + private Bikes checkModelParam(BikesImportVO model, List<Bikes> newList, int index, List<Bikes> list, List<BaseParam> params,String userId,Date date) { + Bikes bike = new Bikes(); + if(StringUtils.isBlank(model.getParamName()) + ||StringUtils.isBlank(model.getCode()) + ||StringUtils.isBlank(model.getSn())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屼汉鍛樹俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); + } + if(params ==null){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐢佃溅绫诲瀷鏈厤缃紝璇疯仈绯荤郴缁熸妧鏈汉鍛樺鐞嗭紒"); + } + for(BaseParam p: params){ + if(StringUtils.equals(model.getParamName(),p.getName())){ + bike.setParamId(p.getId()); + } + } + if(bike.getParamId() ==null){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃溅杈嗙被鍨嬨��"+model.getParamName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); + } + if(list!=null){ + for(Bikes bikes: list){ + if(StringUtils.equals(model.getCode(),bikes.getCode())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃溅鐗屽彿銆�"+model.getCode()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); + } + if(StringUtils.equals(model.getSn(),bikes.getDeviceSn())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾帶鍒跺櫒sn銆�"+model.getSn()+"銆戝凡瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒"); + } + } + } + for(Bikes bikes: newList){ + if(StringUtils.equals(model.getCode(),bikes.getCode())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃溅鐗屽彿銆�"+model.getCode()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒"); + } + if(StringUtils.equals(model.getSn(),bikes.getDeviceSn())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾帶鍒跺櫒sn銆�"+model.getSn()+"銆戦噸澶嶅嚭鐜帮紝璇锋鏌ヨ〃鏍煎唴瀹癸紒"); + } + } + bike.setCode(model.getCode()); + bike.setDeviceSn(model.getSn()); + bike.setId(UUID.randomUUID().toString()); + bike.setCreateDate(new Date()); + bike.setCreator(userId); + bike.setEditDate(date); + bike.setEditor(userId); + bike.setStatus(Constants.ZERO); + bike.setIsdeleted(Constants.ZERO); + bike.setType(Constants.ONE);//鍙兘鏂板鐢佃溅鏁版嵁 + return bike; + } + + + @Override + public List<Bikes> getEleBikes(String memberId) { + //鏌ヨ褰撳墠鏄惁澶勪簬楠戣涓� + MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>().lambda().eq(MemberRides::getMemberId,memberId) + .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey() + ,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()) + .eq(MemberRides::getType,Constants.ONE) + .orderByDesc(MemberRides::getCreateDate) + .last(" limit 1 ") + ); + QueryWrapper<Bikes> queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Bikes::getIsdeleted,Constants.ZERO) + .eq(Bikes::getType,Constants.ONE) + .isNotNull(Bikes::getLatitude) + .isNotNull(Bikes::getLongitude); + if(Objects.nonNull(memberRides)&&StringUtils.isNotBlank(memberRides.getBikeCode())){ + queryWrapper.lambda().eq(Bikes::getCode,memberRides.getBikeCode()); + }else{ + queryWrapper.lambda().eq(Bikes::getStatus,Constants.ZERO); + } + return bikesMapper.selectList(queryWrapper); + } + + } -- Gitblit v1.9.3