Compare commits

...

3 Commits

Author SHA1 Message Date
SjS
8144e4019e 故障申报前台最终完善 2025-04-02 09:28:02 +08:00
SjS
52502bfa15 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
2025-04-02 09:12:33 +08:00
SjS
77d3a20530 待做权限隔离 2025-04-01 18:17:31 +08:00
8 changed files with 36 additions and 19 deletions
ruoyi-service/src/main/java/com/ruoyi/bst
ruoyi-web/src/main/java/com/ruoyi/web

View File

@ -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,

View File

@ -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;

View File

@ -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>

View File

@ -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;
}
}

View File

@ -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

View File

@ -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());
}

View File

@ -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;

View File

@ -42,6 +42,7 @@ public class FaultController extends BaseController
{
startPage();
startOrderBy();
query.setScope(true);
List<FaultVO> list = faultService.selectFaultList(query);
return getDataTable(list);
}