Compare commits
3 Commits
3d43715051
...
8144e4019e
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8144e4019e | ||
![]() |
52502bfa15 | ||
![]() |
77d3a20530 |
ruoyi-service/src/main/java/com/ruoyi/bst
device/mapper
fault
order/service/impl
ruoyi-web/src/main/java/com/ruoyi/web
|
@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
bd.iot_status,
|
||||
bd.is_sound,
|
||||
bd.deleted,
|
||||
bd.order_id,
|
||||
bd.last_online_time,
|
||||
bd.order_device_id,
|
||||
mch.nick_name as mch_name,
|
||||
|
|
|
@ -37,6 +37,10 @@ public class Fault extends BaseEntity
|
|||
@ApiModelProperty("订单编号")
|
||||
private Long orderId;
|
||||
|
||||
@Excel(name = "商戶id")
|
||||
@ApiModelProperty("商戶编号")
|
||||
private Long storeId;
|
||||
|
||||
@Excel(name = "故障部位")
|
||||
@ApiModelProperty("故障部位")
|
||||
private String faultSite;
|
||||
|
|
|
@ -19,7 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
bf.create_time,
|
||||
bf.order_end_time,
|
||||
bf.user_id,
|
||||
bf.vehicle_num
|
||||
bf.vehicle_num,
|
||||
bf.store_id,
|
||||
from bst_fault bf
|
||||
</sql>
|
||||
|
||||
|
@ -37,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</if>
|
||||
<if test="query.faultDetail != null and query.faultDetail != ''"> and bf.fault_detail = #{query.faultDetail}</if>
|
||||
<if test="query.appealStatus != null and query.appealStatus != ''"> and bf.appeal_status = #{query.appealStatus}</if>
|
||||
${@com.ruoyi.framework.util.datascopeutil@dataScope(
|
||||
null,
|
||||
"stroe_id",
|
||||
null,
|
||||
null,
|
||||
query.scope
|
||||
)}
|
||||
${query.params.dataScope}
|
||||
</sql>
|
||||
|
||||
|
@ -68,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="userName != null and userName != ''">user_name,</if>
|
||||
<if test="vehicleCode != null">vehicle_code,</if>
|
||||
<if test="picture != null and picture != ''">picture,</if>
|
||||
<if test="storeId != null and storeId != ''">store_id,</if>
|
||||
<if test="orderId != null">order_id,</if>
|
||||
<if test="faultSite != null and faultSite != ''">fault_site,</if>
|
||||
<if test="faultDetail != null">fault_detail,</if>
|
||||
|
@ -81,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="userName != null and userName != ''">#{userName},</if>
|
||||
<if test="vehicleCode != null">#{vehicleCode},</if>
|
||||
<if test="picture != null and picture != ''">#{picture},</if>
|
||||
<if test="storeId != null and storeId != ''">#{storeId},</if>
|
||||
<if test="orderId != null">#{orderId},</if>
|
||||
<if test="faultSite != null and faultSite != ''">#{faultSite},</if>
|
||||
<if test="faultDetail != null">#{faultDetail},</if>
|
||||
|
|
|
@ -47,19 +47,26 @@ public class AbnormalConverterImpl implements FaultConverter {
|
|||
po.setCreateTime(DateUtils.getNowDate());
|
||||
po.setUserName(fault.getCreateBy());
|
||||
po.setUserId(fault.getUserId());
|
||||
|
||||
if (device.getOrderId() != null && fault.getOrderId().equals(device.getOrderId())) {
|
||||
po.setOrderId(device.getOrderId());
|
||||
OrderVO order = orderService.selectOrderById(device.getOrderId());
|
||||
if (order.getEndTime() != null) {
|
||||
po.setOrderEndTime(DateUtils.toDate(order.getEndTime()));
|
||||
}
|
||||
// 如果订单存在,存入订单时间和订单结束时间
|
||||
if (fault.getOrderId() != null) {
|
||||
OrderVO order = orderService.selectOrderById(fault.getOrderId());
|
||||
ServiceUtil.assertion(order == null,"订单不存在");
|
||||
Long orderId = order.getId();
|
||||
if (device.getOrderId() != null && orderId.equals(device.getOrderId())) {
|
||||
po.setOrderId(orderId);
|
||||
if (order.getEndTime() != null) {
|
||||
po.setOrderEndTime(DateUtils.toDate(order.getEndTime()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String vehicleNum = device.getVehicleNum();
|
||||
if (vehicleNum != null) {
|
||||
po.setVehicleNum(vehicleNum);
|
||||
}
|
||||
Long mchId = device.getMchId();
|
||||
if (mchId != null) {
|
||||
po.setStoreId(mchId);
|
||||
}
|
||||
return po;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -496,7 +496,7 @@ public class OrderServiceImpl implements OrderService
|
|||
}
|
||||
|
||||
// 查询设备
|
||||
DeviceVO device = deviceService.selectDeviceById(order.getDeviceId());
|
||||
DeviceVO device = deviceService.selectDeviceById(order.getOrderDeviceId());
|
||||
deviceIotService.refresh(device, null);
|
||||
if (device == null) {
|
||||
return null;
|
||||
|
@ -534,7 +534,7 @@ public class OrderServiceImpl implements OrderService
|
|||
ServiceUtil.assertion(order == null, "参数错误,order不允许为空");
|
||||
ServiceUtil.assertion(!OrderStatus.inUse().contains(order.getStatus()), "ID为%s的订单当前状态并非使用中,无法操作设备", order.getId());
|
||||
|
||||
return deviceIotService.unlock(order.getDeviceId(), false, "订单开锁:" + order.getNo(), requiredIot);
|
||||
return deviceIotService.unlock(order.getOrderDeviceId(), false, "订单开锁:" + order.getNo(), requiredIot);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -542,7 +542,7 @@ public class OrderServiceImpl implements OrderService
|
|||
ServiceUtil.assertion(order == null, "参数错误,order不允许为空");
|
||||
ServiceUtil.assertion(!OrderStatus.inUse().contains(order.getStatus()), "ID为%s的订单当前状态并非使用中,无法操作设备", order.getId());
|
||||
|
||||
return deviceIotService.lock(order.getDeviceId(), false, "订单锁车:" + order.getNo(), requiredIot);
|
||||
return deviceIotService.lock(order.getOrderDeviceId(), false, "订单锁车:" + order.getNo(), requiredIot);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -106,7 +106,7 @@ public class OrderValidatorImpl implements OrderValidator{
|
|||
|
||||
// 设备
|
||||
DeviceVO device = bo.getDevice();
|
||||
ServiceUtil.assertion(device == null, "ID为%s的设备不存在", order.getDeviceId());
|
||||
ServiceUtil.assertion(device == null, "ID为%s的设备不存在", order.getOrderDeviceId());
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -35,12 +35,6 @@ public class AppFaultController extends BaseController {
|
|||
@Autowired
|
||||
private FaultService faultService;
|
||||
|
||||
@Autowired
|
||||
private DeviceService deviceService;
|
||||
|
||||
@Autowired
|
||||
private OrderService orderService;
|
||||
|
||||
@Autowired
|
||||
private FaultConverter faultConverter;
|
||||
|
||||
|
|
|
@ -42,6 +42,7 @@ public class FaultController extends BaseController
|
|||
{
|
||||
startPage();
|
||||
startOrderBy();
|
||||
query.setScope(true);
|
||||
List<FaultVO> list = faultService.selectFaultList(query);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user