qzz/ride-lease
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

联调

Browse Source
This commit is contained in:
邱贞招 2024-09-26 20:22:14 +08:00
parent c636b24ea2
commit ed4931b5b0
10 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ridelease-system/src/main/java/com/ruoyi/system/domain/model/RlModelVO.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.system.domain.model;
import com.ruoyi.system.domain.accessory.RlAccessory;
import com.ruoyi.system.domain.RlFunction;
import com.ruoyi.system.domain.accessory.RlAccessoryVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -11,7 +12,7 @@ import java.util.List;
public class RlModelVO extends RlModel{
/** 配件 */
private List<RlAccessory> accessorys;
private List<RlAccessoryVO> accessorys;
/** 价格 */
private BigDecimal price;
@ -21,4 +22,7 @@ public class RlModelVO extends RlModel{
@ApiModelProperty("可租车辆")
private Integer rentalCar;
@ApiModelProperty("功能列表")
private List<RlFunction> functionList;
}

2
ridelease-system/src/main/java/com/ruoyi/system/domain/store/StoreVo.java
View File

@ -27,7 +27,5 @@ public class StoreVo extends Store {
@ApiModelProperty("车型列表")
private List<RlModelVO> models;
// @ApiModelProperty("是否免费送取车")
// private Boolean isFreeCar;
}

2
ridelease-system/src/main/java/com/ruoyi/system/mapper/RlAccessoryMapper.java
View File

@ -67,7 +67,7 @@ public interface RlAccessoryMapper
* @param modelId 车型id
* @return 配件集合
*/
List<RlAccessory> selectRlAccessoryListByModelId(Long modelId);
List<RlAccessoryVO> selectRlAccessoryListByModelId(Long modelId);
/**
* 根据车辆id查询车辆配件列表

4
ridelease-system/src/main/java/com/ruoyi/system/service/IRlAccessoryService.java
View File

@ -35,7 +35,7 @@ public interface IRlAccessoryService
* @param modelId 车型id
* @return 配件集合
*/
public List<RlAccessory> selectRlAccessoryListByModelId(Long modelId);
public List<RlAccessoryVO> selectRlAccessoryListByModelId(Long modelId);
/**
* 新增配件
@ -75,6 +75,6 @@ public interface IRlAccessoryService
* @param deviceId 车辆id
* @return 车辆配件
*/
public List<RlAccessoryVO> selectRlDeviceAccessoryByDeviceId(Long deviceId);
public List<RlAccessoryVO> selectRlDeviceAccessoryByModelId(Long deviceId);
}

8
ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlAccessoryServiceImpl.java
View File

@ -53,7 +53,7 @@ public class RlAccessoryServiceImpl implements IRlAccessoryService
* @return 配件集合
*/
@Override
public List<RlAccessory> selectRlAccessoryListByModelId(Long modelId) {
public List<RlAccessoryVO> selectRlAccessoryListByModelId(Long modelId) {
return rlAccessoryMapper.selectRlAccessoryListByModelId(modelId);
}
@ -111,12 +111,12 @@ public class RlAccessoryServiceImpl implements IRlAccessoryService
/**
* 根据车辆id
*
* @param deviceId 车辆id
* @param modelId 车型id
* @return 车辆配件
*/
@Override
public List<RlAccessoryVO> selectRlDeviceAccessoryByDeviceId(Long deviceId)
public List<RlAccessoryVO> selectRlDeviceAccessoryByModelId(Long modelId)
{
return rlAccessoryMapper.selectRlDeviceAccessoryByDeviceId(deviceId);
return rlAccessoryMapper.selectRlAccessoryListByModelId(modelId);
}
}

4
ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlDeviceServiceImpl.java
View File

@ -210,10 +210,6 @@ public class RlDeviceServiceImpl extends ServiceImpl<RlDeviceMapper, RlDevice> i
rlDevice.setLongitude(lon.toString());
rlDevice.setLatitude(lat.toString());
}
List<RlAccessoryVO> accessorys = accessoryService.selectRlDeviceAccessoryByDeviceId(rlDevice.getDeviceId());
if(ObjectUtil.isNotNull(accessorys)){
rlDevice.setAccessorys(accessorys);
}
StoreVo storeVo = storeService.selectSmStoreById(rlDevice.getStoreId());
if(ObjectUtil.isNotNull(storeVo)){
rlDevice.setStoreLocation(storeVo.getAddress());

23
ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlModelServiceImpl.java
View File

@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.RlFunction;
import com.ruoyi.system.domain.accessory.RlAccessoryVO;
import com.ruoyi.system.domain.device.RlDevice;
import com.ruoyi.system.domain.accessory.RlAccessory;
import com.ruoyi.system.domain.model.RlModel;
import com.ruoyi.system.domain.model.RlModelVO;
import com.ruoyi.system.mapper.RlModelMapper;
@ -56,13 +56,15 @@ public class RlModelServiceImpl implements IRlModelService
{
RlModelVO etModel = rlModelMapper.selectEModelByModelId(modelId);
if(ObjectUtil.isNotNull(etModel)){
// 有几辆车待租
// 配件列表
List<RlAccessory> accessories = accessoryService.selectRlAccessoryListByModelId(modelId);
List<RlAccessoryVO> accessories = accessoryService.selectRlAccessoryListByModelId(modelId);
if(ObjectUtil.isNotNull(accessories)){
etModel.setAccessorys(accessories);
}
Integer allNum = eDeviceService.selectCountByModelId(modelId);
// 功能列表
List<RlFunction> functionList = getFunctionListByModelId(modelId);
etModel.setFunctionList(functionList);
// Integer allNum = eDeviceService.selectCountByModelId(modelId);
// etModel.setDeviceNum(allNum);
}
return etModel;
@ -112,8 +114,17 @@ public class RlModelServiceImpl implements IRlModelService
@Override
public List<RlModelVO> selectEModelListByStoreId(Long storeId)
{
List<RlModelVO> etModels = rlModelMapper.selectEModelListByStoreId(storeId);
return etModels;
List<RlModelVO> models = rlModelMapper.selectEModelListByStoreId(storeId);
for (RlModelVO model:models) {
List<RlFunction> functionList = getFunctionListByModelId(model.getModelId());
model.setFunctionList(functionList);
List<RlAccessoryVO> accessories = accessoryService.selectRlAccessoryListByModelId(model.getModelId());
if(ObjectUtil.isNotNull(accessories)){
model.setAccessorys(accessories);
}
}
return models;
}
/**

2
ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlOrderServiceImpl.java
View File

@ -99,7 +99,7 @@ public class RlOrderServiceImpl implements IRlOrderService
RlOrderVO order = orderMapper.selectRlOrderByOrderNo(orderNo);
RlDevice rlDevice = deviceService.selectDeviceBySn(order.getSn());
if(ObjectUtil.isNull(rlDevice)) throw new RuntimeException("未找到车辆信息");
List<RlAccessoryVO> accessorys = accessoryService.selectRlDeviceAccessoryByDeviceId(rlDevice.getDeviceId());
List<RlAccessoryVO> accessorys = accessoryService.selectRlAccessoryListByModelId(order.getModelId());
order.setAccessorys(accessorys);
order.setPicture(rlDevice.getPicture());
return order;

5
ridelease-system/src/main/java/com/ruoyi/system/service/store/impl/StoreServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServiceUtil;
import com.ruoyi.common.utils.bean.collection.CollectionUtils;
import com.ruoyi.common.utils.map.GeoUtils;
import com.ruoyi.system.domain.model.RlModel;
import com.ruoyi.system.domain.model.RlModelVO;
import com.ruoyi.system.domain.store.Store;
import com.ruoyi.system.domain.store.StoreCountVO;
@ -439,8 +438,8 @@ public class StoreServiceImpl implements RlStoreService
*/
@Override
public List<StoreVo> getStoreListByLocation(StoreQuery query) {
String nearby = sysConfigService.selectConfigByKey("nearby.store");
double radiusInMeters = Double.parseDouble(nearby) * 1000; // 将半径转换为米
BigDecimal radiusFromQuery = query.getRadius();
double radiusInMeters = (radiusFromQuery != null) ? radiusFromQuery.doubleValue() : Double.parseDouble(sysConfigService.selectConfigByKey("nearby.store")) * 1000;
// 根据定位获取附近方圆X公里的店铺列表
double userLon = Double.parseDouble(query.getPhoneLon());
double userLat = Double.parseDouble(query.getPhoneLat());

10
ridelease-system/src/main/resources/mapper/system/RlAccessoryMapper.xml
View File

@ -4,15 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.RlAccessoryMapper">
<resultMap type="RlAccessory" id="RlAccessoryResult">
<result property="accessoryId" column="accessory_id" />
<result property="name" column="name" />
<result property="modelId" column="model_id" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap type="RlAccessoryVO" id="RlAccessoryResult" autoMapping="true" />
<sql id="selectRlAccessoryVo">
select accessory_id, name, model_id, status, create_by, create_time, update_time from rl_accessory