From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 28 二月 2025 18:25:00 +0800 Subject: [PATCH] 111 --- server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 144 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 121 insertions(+), 23 deletions(-) diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java index ad6648b..fcee3c4 100644 --- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java +++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java @@ -8,12 +8,16 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.constants.ResponseStatus; +import com.doumee.core.dingding.DingDingNotice; import com.doumee.core.exception.BusinessException; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.PositionUtil; import com.doumee.core.utils.StringTools; +import com.doumee.core.wx.SendWxMessage; +import com.doumee.core.wx.WxMiniConfig; import com.doumee.core.wx.WxMiniUtilService; import com.doumee.dao.business.*; +import com.doumee.dao.business.join.BikesJoinMapper; import com.doumee.dao.business.join.GoodsorderJoinMapper; import com.doumee.dao.business.join.MemberRidesJoinMapper; import com.doumee.dao.business.join.RefundJoinMapper; @@ -26,9 +30,11 @@ import com.doumee.service.business.GoodsorderService; import com.doumee.service.business.PricingRuleService; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ConcurrentReferenceHashMap; @@ -50,12 +56,18 @@ @Service public class Jtt808Service { + @Value("${tencent.map.remoteHost}") + private String mapHost; + @Value("${tencent.map.appKey}") + private String mapKey; @Autowired private MessageManager messageManager; @Autowired private GoodsorderService goodsorderService; @Autowired private BikesMapper bikesMapper; + @Autowired + private BikesJoinMapper bikesJoinMapper; @Autowired private SystemDictDataBiz systemDictDataBiz; @@ -68,7 +80,6 @@ @Autowired private MemberRidesJoinMapper memberRidesJoinMapper; - @Autowired private PricingParamMapper pricingParamMapper; @@ -77,6 +88,9 @@ @Autowired private HolidaysMapper holidaysMapper; + + @Autowired + private SendWxMessage sendWxMessage; @Autowired @@ -87,6 +101,10 @@ return data; } + /** + * 鎵嬪姩杩樿溅 + * @param param + */ @Transactional(rollbackFor = {BusinessException.class}) public void backElecBike(BackElecBikeRequest param) { Member member = memberMapper.selectById(param.getMemberId()); @@ -96,7 +114,24 @@ Goodsorder gparam = new Goodsorder(); gparam.setMemberId(param.getMemberId()); gparam.setStatus(Constants.goodsorderStatus.pay); + gparam.setType(Constants.ZERO); Goodsorder goodsorder = goodsorderService.findOne(gparam); + this.backBike(goodsorder); + } + + /** + * 鑷姩杩樿溅 + * @param id + */ + @Transactional + public void forceBack(String id){ + Goodsorder goodsorder = goodsorderService.findById(id); + this.backBike(goodsorder); + } + + + @Transactional(rollbackFor = {BusinessException.class}) + public void backBike(Goodsorder goodsorder){ if(Objects.isNull(goodsorder)){ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"鏃犻獞琛岃鍗曡褰�"); } @@ -116,11 +151,16 @@ if(bike.getSiteId() ==null){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍓嶅線鍋滆溅鐐瑰仠杞︼紒"); } - lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰 + lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰 backIds.add(rides.getId()); rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞� rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣 + rides.setBackDate(new Date()); + Integer freeRentTime = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode()); + Integer rideTime = DateUtil.betweenMin(rides.getRentDate(), rides.getBackDate()); + //璁$畻楠戣璁¤垂鏃堕暱 + rides.setDuration( rideTime > freeRentTime ? rideTime : 0 ); rides.setEditDate(rides.getBackDate()); memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞� } @@ -131,6 +171,10 @@ goodsorder.setEditDate(date); goodsorder.setEditor(null); goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides); + //鏇存柊鐢靛姩杞﹁溅杈嗙姸鎬� + bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda().set(Bikes::getStatus,Constants.ZERO).eq(Bikes::getType,Constants.ONE) + .apply(" code in ( select m.bike_code from member_rides m where m.ordre_id = '"+goodsorder.getId()+"' ) ") + ); } private Bikes getElecBikeByCode(String bikeCode) { @@ -173,9 +217,12 @@ 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?"杞﹁締鍏抽攣":"杞﹁締寮�閿�")+"澶辫触锛岃绋嶅悗閲嶈瘯锛屾垨鑰呰仈绯诲洯鍖虹鐞嗕汉鍛橈紒"); } } + + + /** * 鏌ヨ鍋滆溅绔欑偣淇℃伅 @@ -197,7 +244,7 @@ if(array == null || array.size() ==0){ continue; } - if(PositionUtil.isInPolygon(lat,lng,array)){ + if(PositionUtil.isInPolygon(lng,lat,array)){ //濡傛灉鍦ㄥ仠杞︾偣鑼冨洿鍐咃紱 site = sites; break; @@ -222,6 +269,7 @@ Goodsorder gparam = new Goodsorder(); gparam.setMemberId(param.getMemberId()); gparam.setStatus(Constants.goodsorderStatus.pay); + gparam.setType(Constants.ZERO); Goodsorder goodsorder = goodsorderService.findOne(gparam); if(Objects.isNull(goodsorder)){ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�"); @@ -238,6 +286,7 @@ Bikes bike = getElecBikeByCode(memberRides.getBikeCode()); //鏌ヨ鍋滆溅浣嶇疆鏄惁绗﹀悎鍋滆溅浣嶇疆瑙勮寖 checkPausePostionBiz(bike); + lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰 memberRides.setPauseDate(new Date()); memberRides.setEditDate(memberRides.getBackDate()); memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()); @@ -251,7 +300,7 @@ ruleType =Integer.parseInt( systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PAUSE_BIKE_TYPE).getCode()); }catch (Exception e){ } - if(ruleType == 0){ + if(ruleType == 1){ //濡傛灉浠呴檺浜庡洯鍖轰复鏃跺仠杞� List<LocaltionDTO> array = new ArrayList<>(); try { @@ -262,7 +311,7 @@ if(array == null || array.size() ==0){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝鍥尯杩愯惀鍖哄煙閰嶇疆鏈夎锛岃鑱旂郴鍥尯绠$悊鍛樺鐞嗭紒"); } - if( !PositionUtil.isInPolygon(bike.getLatitude().doubleValue(),bike.getLongitude().doubleValue(),array)){ + if( !PositionUtil.isInPolygon(bike.getLongitude().doubleValue(),bike.getLatitude().doubleValue(),array)){ //濡傛灉鍦ㄥ仠杞︾偣鑼冨洿鍐咃紱 throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍦ㄥ洯鍖鸿繍钀ュ尯鍩熻寖鍥村唴鍋滆溅锛�"); } @@ -274,8 +323,12 @@ } } - public void updateBikesInfo(List<T0200> list) { + public void updateBikesInfo(List<T0200> list) throws Exception{ Date date = new Date(); + BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LOW_VOLTAGE).getCode()); + String ddToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode(); + String ddRobotCode = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode(); + String ddChatToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode(); for(T0200 m : list){ Bikes bike = new Bikes(); bike.setDeviceSn(m.getClientId()); @@ -285,6 +338,7 @@ if(m.getLongitude()!=0){ bike.setLongitude(new BigDecimal(m.getLongitude()).divide(new BigDecimal(1000000),8,BigDecimal.ROUND_HALF_UP)); } + updateMapLocation(bike); bike.setHeartDate(DateUtil.getDateFromLocalDateTime(m.getDeviceTime())); if(m.getAttributes()!=null ){ Battery battery= (Battery) m.getAttributes().get(AttributeKey.Battery); @@ -316,7 +370,27 @@ .set(Bikes::getSiteId,site ==null?null:site.getId()) .set( Bikes::getHeartDate,date) .eq(Bikes::getId,bikes.getId())); + + if(bikes.getVoltage().compareTo(lowVoltage)>=Constants.ZERO + && bike.getVoltage().compareTo(lowVoltage)<Constants.ZERO){ + //鍙戦�侀拤閽夐�氱煡 + DingDingNotice.lowVoltageNotice(bikes.getCode(), + PositionUtil.getTxMapAddrByLatAndLng(Double.valueOf(bike.getLatitude().toString()),Double.valueOf(bike.getLongitude().toString()),mapHost,mapKey) + ,Objects.nonNull(site)?site.getName():null, + ddToken, + ddRobotCode, + ddChatToken); + } } + } + + private void updateMapLocation(Bikes bike) { + if(bike.getLatitude() == null || bike.getLongitude() == null){ + return; + } + PositionUtil.AMap aMap =PositionUtil.transform(bike.getLongitude().doubleValue() ,bike.getLatitude().doubleValue()); + bike.setLatitude(new BigDecimal(aMap.getLatitude())); + bike.setLongitude(new BigDecimal(aMap.getLongitude())); } public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>(); @@ -337,12 +411,16 @@ //濡傛灉杞﹁締绫诲瀷鏄┖ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒"); } - cacheOpenLock.put(bike.getCode(), 1); + if(!Constants.equalsInteger(bike.getStatus(),Constants.ZERO)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ溅杈嗗凡琚攣瀹氬�熺敤锛岃灏濊瘯鏇存崲鍏朵粬杞﹁締锛�"); + } + cacheOpenLock.put(openElecBikeRequest.getCode(), 1); try { //鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲� Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>() .eq("isdeleted", Constants.ZERO) .eq("status", Constants.goodsorderStatus.pay) + .eq("type", Constants.ZERO) .eq("member_id", member.getId()) .orderByDesc("create_date") .last("limit 1")); @@ -367,7 +445,7 @@ //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规 isValidePricingType(bike,memberRides) ; MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse(); - this.lockBikes(bike.getDeviceSn(),1); + this.lockBikes(bike.getDeviceSn(),0); //瀛樺偍楠戣璁板綍 memberRides.setId(Constants.getUUID()); memberRides.setIsdeleted(Constants.ZERO); @@ -376,17 +454,19 @@ memberRides.setOrdreId(goodsorder.getId()); memberRides.setBikeCode(bike.getCode()); memberRides.setRentDate(new Date()); - memberRides.setType(Constants.ZERO); + memberRides.setType(Constants.ONE); memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode())); memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey()); memberRides.setCloseStatus(Constants.ZERO); memberRidesJoinMapper.insert(memberRides); BeanUtils.copyProperties(memberRides, memberRidesDetailResponse); return memberRidesDetailResponse; - }catch (Exception e){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寮�閿佸け璐ワ紝璇疯仈绯荤鐞嗗憳"); + }catch (BusinessException biz){ + throw biz; + }catch (Exception biz){ + throw new BusinessException(ResponseStatus.SERVER_ERROR); }finally { - cacheOpenLock.remove(bike.getCode()); + cacheOpenLock.remove(openElecBikeRequest.getCode()); } } @@ -400,6 +480,7 @@ Goodsorder gparam = new Goodsorder(); gparam.setMemberId(param.getMemberId()); gparam.setStatus(Constants.goodsorderStatus.pay); + gparam.setType(Constants.ZERO); Goodsorder goodsorder = goodsorderService.findOne(gparam); if(Objects.isNull(goodsorder)){ throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�"); @@ -422,7 +503,7 @@ //濡傛灉杞﹁締绫诲瀷鏄┖ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "杞﹀瀷淇℃伅寮傚父锛岃鑱旂郴绠$悊鍛�"); } - this.lockBikes(bike.getDeviceSn(),1); + this.lockBikes(bike.getDeviceSn(),0); //鏇存柊楠戣鐘舵�佷负楠戣涓� memberRides.setEditDate(memberRides.getBackDate()); memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey()); @@ -491,17 +572,18 @@ /** * 涓存椂鍋滆溅瓒呮椂 鑷姩杩樿溅 */ - public void autoBackBike(){ + public void autoBackBike() throws WxErrorException { List<MemberRides> memberRidesList = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>() .selectAll(MemberRides.class) .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId) .eq(Goodsorder::getStatus,Constants.ONE) .eq(MemberRides::getIsdeleted,Constants.ZERO) .eq(MemberRides::getType,Constants.ONE) - .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING) - .apply(" NOW() >= t.create_date + INTERVAL '2 hours' ") + .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey()) + .apply(" NOW() >= (t.create_date + INTERVAL '"+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PAUSE_AUTO_CLOSE_TIME).getCode()+" min') ") ); + ; for (MemberRides timeOutRides:memberRidesList) { Goodsorder goodsorder = goodsorderService.findById(timeOutRides.getOrdreId()); //鏌ヨ楠戣璁板綍 @@ -516,10 +598,14 @@ .eq(Bikes::getIsdeleted,Constants.ZERO) .eq(Bikes::getCode,rides.getBikeCode()) ); - lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰 + lockBikes(bike.getDeviceSn(),Constants.ONE);//鍙戣捣鍏抽攣鎸囦护璇锋眰 rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞� rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣 rides.setBackDate(new Date()); + Integer freeRentTime = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode()); + Integer rideTime = DateUtil.betweenMin(rides.getRentDate(), rides.getBackDate()); + //璁$畻楠戣璁¤垂鏃堕暱 + rides.setDuration( rideTime > freeRentTime ? rideTime : 0 ); rides.setEditDate(rides.getBackDate()); memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞� } @@ -530,15 +616,27 @@ goodsorder.setEditDate(date); goodsorder.setEditor(null); goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides); + + //鏇存柊鐢靛姩杞﹁溅杈嗙姸鎬� + bikesMapper.update(null,new UpdateWrapper<Bikes>().lambda().set(Bikes::getStatus,Constants.ZERO).eq(Bikes::getType,Constants.ONE) + .apply(" code in ( select m.bike_code from member_rides m where m.ordre_id = '"+goodsorder.getId()+"' ) ") + ); + + //鍙戦�佸皬绋嬪簭閫氱煡 + Member member = memberMapper.selectById(goodsorder.getMemberId()); + if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){ + sendWxMessage.bookingsCancel(member.getOpenid(),goodsorder.getId(), + WxMiniConfig.wxMaService.getAccessToken(), + timeOutRides.getBikeCode(),goodsorder.getPayDate(),goodsorder.getEditDate()); + } } - - - - - } +// public void test(double lat,double lng){ +// this.getBackSiteByPostion(lat,lng); +// } + } -- Gitblit v1.9.3