chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

驾驶证管理

Browse Source
This commit is contained in:
磷叶 2025-06-04 16:39:49 +08:00
parent 853be0462f
commit 8ce2a7d800
19 changed files with 146 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
View File

@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.bst.device.mapper.DeviceMapper">
<resultMap type="DeviceVO" id="DeviceResult" autoMapping="true">
<result property="modelSuitIds" column="model_suit_ids" typeHandler="com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler"/>
<result property="areaAuthentication" column="area_authentication" typeHandler="com.ruoyi.common.mybatis.typehandler.StringSplitListTypeHandler"/>
</resultMap>
<sql id="selectDeviceVo">

19
ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java
View File

@ -298,9 +298,6 @@ public class DeviceIotServiceImpl implements DeviceIotService {
// this.updateIot(device);
// }
// 拼接物联网信息
deviceAssembler.assembleIot(deviceList);
// 异步发送命令，强制设备上报数据
if (onlineType != null) {
scheduledExecutorService.execute(() -> {
@ -435,8 +432,7 @@ public class DeviceIotServiceImpl implements DeviceIotService {
for (Long deviceId : idList) {
try {
// 获取设备最新信息
DeviceVO device = deviceMapper.selectDeviceById(deviceId);
deviceAssembler.assembleIot(device);
DeviceVO device = deviceService.selectDeviceById(deviceId);
this.monitor(device);
} catch (Exception e) {
log.error("监控设备id={}出错：{}", deviceId, e.getMessage());
@ -448,18 +444,6 @@ public class DeviceIotServiceImpl implements DeviceIotService {
if (device == null) {
return;
}
// 判断电门与设备锁状态是否一致，不一致则发送命令
if (DeviceLockStatus.OPEN.getCode().equals(device.getLockStatus())
&& !DeviceQuality.OPEN.getCode().equals(device.getQuality())) {
CommandResponse res = iotService.unlock(device, SUB_FAST, "重新尝试开锁", 1);
if (device.getOrderId() != null) {
operLogService.operSysLog("【设备监控】发现未开启的车辆", IotUtil.isSuccess(res), LogBizType.ORDER,
device.getOrderId(), device);
} else {
operLogService.operSysLog("【设备监控】发现未开启的车辆", IotUtil.isSuccess(res), LogBizType.DEVICE, device.getId(),
device);
}
}
if (DeviceLockStatus.CLOSE.getCode().equals(device.getLockStatus())
&& !DeviceQuality.CLOSE.getCode().equals(device.getQuality())) {
CommandResponse res = iotService.lock(device, getDeviceSubSlow(device), "重新尝试锁车", 1);
@ -476,7 +460,6 @@ public class DeviceIotServiceImpl implements DeviceIotService {
@Override
public void monitor(String mac) {
DeviceVO device = deviceService.selectByMac(mac);
deviceAssembler.assembleIot(device);
this.monitor(device);
}

10
ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceServiceImpl.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
import com.ruoyi.bst.device.service.DeviceAssembler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionTemplate;
@ -67,6 +68,9 @@ public class DeviceServiceImpl implements DeviceService {
@Autowired
private RedisCache redisCache;
@Autowired
private DeviceAssembler deviceAssembler;
/**
* 查询设备
*
@ -99,7 +103,9 @@ public class DeviceServiceImpl implements DeviceService {
*/
@Override
public List<DeviceVO> selectDeviceList(DeviceQuery query) {
return deviceMapper.selectDeviceList(query);
List<DeviceVO> list = deviceMapper.selectDeviceList(query);
deviceAssembler.assembleIot(list);
return list;
}
@Override
@ -502,7 +508,7 @@ public class DeviceServiceImpl implements DeviceService {
query.setEqSn(sn);
}
DeviceVO device = this.selectOne(query);
ServiceUtil.assertion(DeviceStatus.AVAILABLE.getCode().equals(device.getStatus()),
ServiceUtil.assertion(!DeviceStatus.AVAILABLE.getCode().equals(device.getStatus()),
"当前设备不可用：" + DeviceStatus.getNameByCode(device.getStatus()) );
return device;
}

15
ruoyi-service/src/main/java/com/ruoyi/bst/device/utils/DeviceUtil.java
View File

@ -39,8 +39,8 @@ public class DeviceUtil {
}
// 转换经纬度坐标系并赋值
// 只有定位是正常的 && 卫星信号大于2颗 才认为是有获取到定位
if (DeviceUtil.validLocation(sys.getLon(), sys.getLat()) && sys.getS() != null && sys.getS() > 2) {
// 只有定位是正常的 && 卫星信号不弱 才认为是有获取到定位
if (DeviceUtil.validLocation(sys.getLon(), sys.getLat()) && !DeviceUtil.isLowSatelliteSignal(sys.getS())) {
List<BigDecimal> coordinates = null;
// 转换坐标
@ -188,7 +188,16 @@ public class DeviceUtil {
* @return 是否弱
*/
public static boolean isLowSatelliteSignal(DeviceVO device) {
return device != null && device.getSatellites() != null && device.getSatellites() <= 5;
return device != null && isLowSatelliteSignal(device.getSatellites());
}
/**
* 卫星信号弱
* @param s
* @return
*/
public static boolean isLowSatelliteSignal(Integer s) {
return s == null || s <= 5;
}
/**

11
ruoyi-service/src/main/java/com/ruoyi/bst/driver/service/impl/DriverServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.ruoyi.bst.driver.domain.dto.DriverVerifyDTO;
import com.ruoyi.bst.driver.domain.enums.DriverStatus;
import com.ruoyi.bst.driver.mapper.DriverMapper;
import com.ruoyi.bst.driver.service.DriverService;
import com.ruoyi.common.core.domain.vo.UserVO;
import com.ruoyi.common.core.redis.RedisLock;
import com.ruoyi.common.core.redis.enums.RedisLockKey;
import com.ruoyi.common.utils.DateUtils;
@ -22,6 +23,7 @@ import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.collection.CollectionUtils;
import com.ruoyi.system.user.domain.enums.UserAuthType;
import com.ruoyi.system.user.service.UserService;
import com.ruoyi.system.user.utils.UserUtil;
/**
* 驾驶证认证Service业务层处理
@ -83,8 +85,13 @@ public class DriverServiceImpl implements DriverService
boolean lock = redisLock.lock(RedisLockKey.DRIVER_INSERT, lockKey);
ServiceUtil.assertion(!lock, "提交过于频繁，请稍后再试");
try {
// 查询用户
UserVO user = userService.selectUserById(driver.getUserId());
ServiceUtil.assertion(UserUtil.hasAuth(user, UserAuthType.DRIVER.getCode()), "您已通过驾驶证认证，请勿重复提交");
// 查询上次提交的信息
DriverVO lastOne = this.selectLastOneByUserId(driver.getUserId());
ServiceUtil.assertion(lastOne != null && !DriverStatus.FAILED.getCode().equals(lastOne.getStatus()), "您已提交过驾驶证认证，请勿重复提交");
ServiceUtil.assertion(lastOne != null && DriverStatus.WAIT_VERIFY.getCode().equals(lastOne.getStatus()), "您已提交过驾驶证认证，请勿重复提交");
driver.setCreateTime(DateUtils.getNowDate());
return driverMapper.insertDriver(driver);
@ -167,8 +174,10 @@ public class DriverServiceImpl implements DriverService
int rows = driverMapper.updateByQuery(data, query);
ServiceUtil.assertion(rows != 1, "当前数据已发生变化，请刷新后重试");
if (pass) {
int authType = userService.addAuthType(driver.getUserId(), UserAuthType.DRIVER);
ServiceUtil.assertion(authType != 1, "为用户添加驾驶证认证失败,id=" + driver.getUserId());
}
return rows;
});

6
ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/OrderVO.java
View File

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.bst.order.domain.vo.OrderCalcPreRideFeeVO;
import com.ruoyi.bst.order.utils.OrderUtil;
import com.ruoyi.bst.orderDevice.domain.OrderDeviceVO;
import com.ruoyi.common.utils.MathUtils;
@ -143,4 +144,9 @@ public class OrderVO extends Order implements IotDevice {
public BigDecimal getTotalDiscountAmount() {
return this.getRidingDiscount();
}
// 预估骑行费
public OrderCalcPreRideFeeVO getPreRideFee() {
return OrderUtil.calcRideFee(this, LocalDateTime.now());
}
}

20
ruoyi-service/src/main/java/com/ruoyi/bst/order/domain/vo/OrderCalcPreRideFeeVO.java Normal file
View File

@ -0,0 +1,20 @@
package com.ruoyi.bst.order.domain.vo;
import java.math.BigDecimal;
import lombok.Data;
@Data
public class OrderCalcPreRideFeeVO {
/**
* 使用时长（秒）
*/
private Long seconds;
/**
* 骑行费
*/
private BigDecimal rideFee;
}

9
ruoyi-service/src/main/java/com/ruoyi/bst/order/service/OrderService.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.bst.order.service;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.ruoyi.bst.device.domain.vo.DeviceIotVO;
@ -21,6 +22,7 @@ import com.ruoyi.bst.order.domain.dto.OrderRidePaySuccessDTO;
import com.ruoyi.bst.order.domain.dto.OrderSeatDTO;
import com.ruoyi.bst.order.domain.dto.OrderUpdatePriceDTO;
import com.ruoyi.bst.order.domain.dto.OrderVerifyDTO;
import com.ruoyi.bst.order.domain.vo.OrderCalcPreRideFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderCalcRideFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderEndVO;
import com.ruoyi.bst.order.domain.vo.OrderFeeVO;
@ -271,4 +273,11 @@ public interface OrderService {
* @return
*/
public OrderCalcRideFeeVO calcRideFee(OrderVO order, VipUserVO vipUser);
/**
* 计算预估骑行费
* @param orderId
* @return
*/
public OrderCalcPreRideFeeVO calcPreRideFee(Long orderId, LocalDateTime endTime);
}

4
ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderConverterImpl.java
View File

@ -160,7 +160,6 @@ public class OrderConverterImpl implements OrderConverter{
// 设备
DeviceVO device = deviceService.selectDeviceById(dto.getDeviceId());
deviceAssembler.assembleIot(device);
bo.setDevice(device);
if (device != null) {
@ -410,7 +409,6 @@ public class OrderConverterImpl implements OrderConverter{
if (orderDevice != null) {
// 获取当前设备信息
DeviceVO device = deviceService.selectDeviceById(orderDevice.getDeviceId());
deviceAssembler.assembleIot(device);
bo.setDevice(device);
}
@ -458,7 +456,6 @@ public class OrderConverterImpl implements OrderConverter{
DeviceVO newDevice = null;
if (dto.getDeviceId() != null) {
newDevice = deviceService.selectDeviceById(dto.getDeviceId());
deviceAssembler.assembleIot(newDevice);
ServiceUtil.assertion(newDevice == null, "ID为%s的设备不存在", dto.getDeviceId());
} else if (StringUtils.isNotBlank(dto.getDeviceSn())) {
newDevice = deviceService.selectDeviceBySn(dto.getDeviceSn());
@ -495,7 +492,6 @@ public class OrderConverterImpl implements OrderConverter{
// 查询旧设备
DeviceVO oldDevice = deviceService.selectDeviceById(oldOrderDevice.getDeviceId());
deviceAssembler.assembleIot(oldDevice);
ServiceUtil.assertion(oldDevice == null, "ID为%s的旧设备不存在", oldOrderDevice.getDeviceId());
bo.setOldDevice(oldDevice);

11
ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java
View File

@ -67,6 +67,7 @@ import com.ruoyi.bst.order.domain.dto.OrderVerifyDTO;
import com.ruoyi.bst.order.domain.enums.OrderPayType;
import com.ruoyi.bst.order.domain.enums.OrderReturnType;
import com.ruoyi.bst.order.domain.enums.OrderStatus;
import com.ruoyi.bst.order.domain.vo.OrderCalcPreRideFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderCalcRideFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderEndVO;
import com.ruoyi.bst.order.domain.vo.OrderFeeVO;
@ -658,7 +659,6 @@ public class OrderServiceImpl implements OrderService {
// 设备信息
DeviceVO device = deviceService.selectDeviceById(order.getDeviceId());
deviceAssembler.assembleIot(device);
if (device == null) {
return null;
}
@ -808,7 +808,6 @@ public class OrderServiceImpl implements OrderService {
// 查询设备
DeviceVO device = deviceService.selectDeviceById(orderDevice.getDeviceId());
ServiceUtil.assertion(device == null, "ID为%s的设备不存在", orderDevice.getDeviceId());
deviceAssembler.assembleIot(device);
// 设置日志参数
this.setLogParam(device);
// 异步使用手机定位更新设备定位
@ -834,7 +833,6 @@ public class OrderServiceImpl implements OrderService {
// 查询设备
DeviceVO device = deviceService.selectDeviceById(orderDevice.getDeviceId());
ServiceUtil.assertion(device == null, "ID为%s的设备不存在", orderDevice.getDeviceId());
deviceAssembler.assembleIot(device);
// 设置日志参数
this.setLogParam(device);
// 异步使用手机定位更新设备定位
@ -990,7 +988,6 @@ public class OrderServiceImpl implements OrderService {
ServiceUtil.assertion(device == null, "ID为%s的设备不存在", order.getDeviceId());
boolean enableSeat = device.getModelEnableSeat() != null && device.getModelEnableSeat();
ServiceUtil.assertion(!enableSeat, "ID为%s的设备不允许用户打开坐垫锁", order.getDeviceId());
deviceAssembler.assembleIot(device);
// 设置日志参数
this.setLogParam(device);
@ -1277,4 +1274,10 @@ public class OrderServiceImpl implements OrderService {
return vo;
}
@Override
public OrderCalcPreRideFeeVO calcPreRideFee(Long orderId, LocalDateTime endTime) {
OrderVO order = this.selectOrderById(orderId);
return OrderUtil.calcRideFee(order, endTime);
}
}

2
ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderValidatorImpl.java
View File

@ -99,7 +99,7 @@ public class OrderValidatorImpl implements OrderValidator{
if (authTypeEnum == null) {
throw new ServiceException(String.format("运营区%s认证类型错误", device.getAreaName()));
}
throw new ServiceException(String.format("用户%s未认证%s", user.getNickName(), authTypeEnum.getName()), authTypeEnum.getErrorCode());
throw new ServiceException(String.format("用户【%s】未认证【%s】", user.getNickName(), authTypeEnum.getName()), authTypeEnum.getErrorCode());
}
}
}

60
ruoyi-service/src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java
View File

@ -20,6 +20,7 @@ import com.ruoyi.bst.order.domain.OrderVO;
import com.ruoyi.bst.order.domain.dto.OrderRefundDTO;
import com.ruoyi.bst.order.domain.dto.OrderRefundDetailDTO;
import com.ruoyi.bst.order.domain.enums.OrderPayType;
import com.ruoyi.bst.order.domain.vo.OrderCalcPreRideFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderCalcRideFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderFeeVO;
import com.ruoyi.bst.order.domain.vo.OrderInParkingVO;
@ -29,6 +30,7 @@ import com.ruoyi.bst.suit.domain.enums.SuitRentalUnit;
import com.ruoyi.bst.suit.domain.enums.SuitRidingRule;
import com.ruoyi.bst.suit.utils.SuitUtil;
import com.ruoyi.common.utils.MathUtils;
import com.ruoyi.common.utils.ServiceUtil;
public class OrderUtil {
@ -80,23 +82,9 @@ public class OrderUtil {
OrderFeeVO vo = new OrderFeeVO();
// 骑行费
Duration duration = Duration.between(order.getStartTime(), endTime);
long seconds = duration.getSeconds(); // 使用时长
Integer freeRideMinutes = order.getSuitFreeRideTime(); // 免费骑行时长
boolean isFree = freeRideMinutes != null && seconds <= freeRideMinutes * 60; // 是否免费
// 若免费，则骑行费为0
if (isFree) {
vo.setRidingFee(BigDecimal.ZERO);
}
// 否则，计算骑行费
else {
SuitRentalUnit rentalUnit = SuitRentalUnit.parse(order.getSuitRentalUnit());
if (SuitRidingRule.START_FEE.getCode().equals(order.getSuitRidingRule())) {
vo.setRidingFee(SuitUtil.calcAmountForStartFee(seconds, order.getSuitStartRule(), rentalUnit));
} else {
vo.setRidingFee(SuitUtil.calcAmountForIntervalFee(seconds, order.getSuitIntervalRule(), rentalUnit));
}
OrderCalcPreRideFeeVO rideFee = calcRideFee(order, endTime);
if (rideFee != null) {
vo.setRidingFee(rideFee.getRideFee());
}
// 若需要调度费，则计算调度费
@ -310,4 +298,42 @@ public class OrderUtil {
return MathUtils.equals(a.getDiscountAmount(), b.getDiscountAmount())
&& MathUtils.equals(a.getPayAmount(), b.getPayAmount());
}
/**
* 计算骑行费
* @param order
* @param endTime
* @return
*/
public static OrderCalcPreRideFeeVO calcRideFee(OrderVO order, LocalDateTime endTime) {
if (order == null || endTime == null || order.getStartTime() == null) {
return null;
}
OrderCalcPreRideFeeVO vo = new OrderCalcPreRideFeeVO();
Duration duration = Duration.between(order.getStartTime(), endTime);
long seconds = duration.getSeconds(); // 使用时长
vo.setSeconds(seconds);
Integer freeRideMinutes = order.getSuitFreeRideTime(); // 免费骑行时长
boolean isFree = freeRideMinutes != null && seconds <= freeRideMinutes * 60; // 是否免费
// 若免费，则骑行费为0
if (isFree) {
vo.setRideFee(BigDecimal.ZERO);
}
// 否则，计算骑行费
else {
SuitRentalUnit rentalUnit = SuitRentalUnit.parse(order.getSuitRentalUnit());
if (SuitRidingRule.START_FEE.getCode().equals(order.getSuitRidingRule())) {
vo.setRideFee(SuitUtil.calcAmountForStartFee(seconds, order.getSuitStartRule(), rentalUnit));
} else {
vo.setRideFee(SuitUtil.calcAmountForIntervalFee(seconds, order.getSuitIntervalRule(), rentalUnit));
}
}
return vo;
}
}

5
ruoyi-service/src/main/java/com/ruoyi/bst/realName/service/impl/RealNameServiceImpl.java
View File

@ -39,6 +39,7 @@ import com.ruoyi.common.valid.towEle.TwoEleUtil;
import com.ruoyi.common.valid.towEle.vo.IDResponse;
import com.ruoyi.system.user.domain.enums.UserAuthType;
import com.ruoyi.system.user.service.UserService;
import com.ruoyi.system.user.utils.UserUtil;
/**
* 实名认证信息Service业务层处理
@ -126,7 +127,7 @@ public class RealNameServiceImpl implements RealNameService
public RealNameFaceVO faceRealName(RealName realName) {
UserVO user = userService.selectUserById(realName.getUserId());
ServiceUtil.assertion(user == null,"用户信息不存在");
ServiceUtil.assertion(user.getIsReal() != null && user.getIsReal(),"用户已实名认证");
ServiceUtil.assertion(UserUtil.hasAuth(user, UserAuthType.REAL_NAME.getCode()),"用户已实名认证");
// 获取活体检测token
LivenessResponseTokenData tokenData = LivenessUtils.getToken(LIVENESS_RETURN_URL, null, null);
@ -215,7 +216,7 @@ public class RealNameServiceImpl implements RealNameService
// 判断用户是否已经实名认证
UserVO user = userService.selectUserById(dto.getUserId());
ServiceUtil.assertion(user == null,"用户信息不存在");
ServiceUtil.assertion(user.getIsReal() != null && user.getIsReal(),"用户已实名认证");
ServiceUtil.assertion(UserUtil.hasAuth(user, UserAuthType.REAL_NAME.getCode()), "用户已实名认证，请勿重复实名");
IDResponse idRes = TwoEleUtil.verifyIdentity(dto.getIdCard(), dto.getUserName());
ServiceUtil.assertion(idRes == null, "二要素实名认证返回为空，请联系管理员续费");

1
ruoyi-service/src/main/java/com/ruoyi/iot/constants/IotConstants.java
View File

@ -63,5 +63,6 @@ public class IotConstants {
public static final String DS_SYS_Q = "q"; // 钥匙状态
public static final String DS_SYS_LON = "lon"; // 经度
public static final String DS_SYS_LAT = "lat"; // 纬度
public static final String DS_CSQ = "CSQ"; // 信号强度
}

13
ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
View File

@ -137,15 +137,18 @@ public class IotReceiveServiceImpl implements IotReceiveService {
log.error("更新设备软件版本失败: {}，版本：{}", msg.getDevName(), msg.getValue());
}
}
// CSQ 重启
else if (IotConstants.DS_CSQ.equals(msg.getDsId())) {
this.handleReboot(msg);
}
}
// 生命周期（暂时不做，需要测试）
else if (ReceiveType.DEVICE_STATUS.getType().equals(msg.getType())) {
// this.handleReboot(msg);
}
}
/**
* 处理设备重启
* 处理设备重启事件
*/
private void handleReboot(ReceiveMsg msg) {
if (msg == null || StringUtils.isBlank(msg.getDevName())) {
@ -319,9 +322,9 @@ public class IotReceiveServiceImpl implements IotReceiveService {
// 定位日志处理
private void handleLocationLog(DeviceVO device) {
// 卫星数量小于5，不保存定位日志
if (device.getSatellites() == null || device.getSatellites() < 5) {
log.error("卫星数量小于5，不处理: {}", device.getMac());
// 卫星信号弱，不保存定位日志
if (DeviceUtil.isLowSatelliteSignal(device.getSatellites())) {
log.error("卫星信号弱，不处理: {}", device.getMac());
return;
}
// 转换定位日志

2
ruoyi-web/src/main/java/com/ruoyi/web/app/AppDeviceController.java
View File

@ -45,7 +45,6 @@ public class AppDeviceController extends BaseController {
}
query.setStatus(DeviceStatus.AVAILABLE.getCode());
List<DeviceVO> list = deviceService.selectDeviceList(query);
deviceAssembler.assembleIot(list);
return success(list);
}
@ -54,7 +53,6 @@ public class AppDeviceController extends BaseController {
@Anonymous
public AjaxResult getAvailableDetail(@RequestParam(required = false) Long id, @RequestParam(required = false) String sn) {
DeviceVO device = deviceService.selectAvaliableDevice(id, sn);
deviceAssembler.assembleIot(device);
return success(device);
}

10
ruoyi-web/src/main/java/com/ruoyi/web/app/AppOrderController.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.web.app;
import java.time.LocalDateTime;
import java.util.List;
import java.util.function.Supplier;
@ -143,6 +144,9 @@ public class AppOrderController extends BaseController {
dto.setReturnType(OrderReturnType.NORMAL.getCode());
dto.setEndReason("用户【" + getNickName() + "】手动还车");
dto.setNeedDispatchFee(true);
if (dto.getRequiredIot() == null) {
dto.setRequiredIot(true);
}
OrderEndVO vo = orderService.endOrder(dto);
if (vo.getDb() > 0) {
return success(vo);
@ -163,6 +167,12 @@ public class AppOrderController extends BaseController {
return success(fee);
}
@ApiOperation("计算预估骑行费")
@GetMapping("/calcPreRideFee")
public AjaxResult calcPreRideFee(Long orderId) {
return success(orderService.calcPreRideFee(orderId, LocalDateTime.now()));
}
@ApiOperation("订单开锁")
@PutMapping("/openDevice")
@Log(title = "订单开锁", businessType = BusinessType.OTHER, bizIdName = "arg0", bizType = LogBizType.ORDER)

3
ruoyi-web/src/main/java/com/ruoyi/web/bst/DeviceController.java
View File

@ -83,7 +83,6 @@ public class DeviceController extends BaseController {
if (query.getRefresh() != null && query.getRefresh()) {
deviceIotService.refresh(list, IotConstants.ONLINE_TYPE_COMMAND);
}
deviceAssembler.assembleIot(list);
return getDataTable(list);
}
@ -102,7 +101,6 @@ public class DeviceController extends BaseController {
if (query.getRefresh() != null && query.getRefresh()) {
deviceIotService.refresh(list, IotConstants.ONLINE_TYPE_COMMAND);
}
deviceAssembler.assembleIot(list);
return success(list);
}
@ -133,7 +131,6 @@ public class DeviceController extends BaseController {
if (refresh) {
deviceIotService.refresh(device, IotConstants.ONLINE_TYPE_COMMAND);
}
deviceAssembler.assembleIot(device);
return success(device);
}

1
ruoyi-web/src/main/java/com/ruoyi/web/bst/DeviceIotController.java
View File

@ -122,7 +122,6 @@ public class DeviceIotController extends BaseController {
DeviceVO device = this.getDevice(id, sn);
return executeWithLock(device, () -> {
deviceIotService.refresh(device, IotConstants.ONLINE_TYPE_COMMAND);
deviceAssembler.assembleIot(device);
return success(device);
});
}