server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
@@ -70,7 +70,8 @@ if(StringUtils.contains(topic, info)){ //如果锁头信息上报 Locks locks = JSONObject.parseObject(param, Locks.class); locks.setId(lockid); locks.setSiteId(siteid); locks.setCode(lockid); locks.setInfo(logId); result = memberRidesService.mqttLockInfoEvent(locks); logInfo = "mqtt消息订阅锁头信息"; @@ -81,8 +82,8 @@ JSONObject pjson = JSONObject.parseObject(param); MemberRides bikes = new MemberRides(); bikes.setBikeCode(pjson.getString("bikeCode")); bikes.setBackLockId( pjson.getString("lockId")); bikes.setBackSiteId( pjson.getString("siteId")); bikes.setBackLockId( lockid); bikes.setBackSiteId( siteid); bikes.setBackCommondId(logId); result = memberRidesService.mqttCloseBikeEvent(bikes); logInfo = "mqtt消息订阅还车消息"; server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -613,7 +613,10 @@ } private Locks dealLockAndSite(Locks locks) { Locks model = locksMapper.selectById(locks.getId()); Locks model = new Locks(); model.setSiteId(locks.getSiteId()); model.setCode(locks.getCode()); model = locksMapper.selectOne(new QueryWrapper<>(model).last("limit 1")); Date date =new Date(); //检查站点信息，不存在则新增 Sites sites = sitesMapper.selectById(locks.getSiteId()); @@ -631,7 +634,7 @@ if(model == null){ //如果锁头不存在，判断存储 model = new Locks(); model.setId(locks.getId()); model.setId(Constants.getUUID()); model.setSiteId(locks.getSiteId()); model.setIsdeleted(Constants.ZERO); model.setCode(locks.getCode());
