diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml index fc8e764..3d254c7 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml @@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + order by bf.create_time desc diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java index 2dc2642..b6a81b3 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/service/impl/FaultServiceImpl.java @@ -5,6 +5,8 @@ import java.util.List; import com.github.pagehelper.PageHelper; import com.ruoyi.bst.area.domain.AreaQuery; import com.ruoyi.bst.area.domain.AreaVO; +import com.ruoyi.bst.device.domain.DeviceVO; +import com.ruoyi.bst.device.service.DeviceService; import com.ruoyi.bst.fault.domain.enums.FaultHandleStatus; import com.ruoyi.bst.fault.domain.enums.FaultStatus; import com.ruoyi.common.utils.DateUtils; @@ -30,6 +32,8 @@ public class FaultServiceImpl implements FaultService { @Autowired private FaultMapper faultMapper; + @Autowired + private DeviceService deviceService; @Override public FaultVO selectFaultById(Long id, boolean scope) { @@ -77,7 +81,9 @@ public class FaultServiceImpl implements FaultService { fault.setCreateTime(DateUtils.getNowDate()); fault.setUserId(SecurityUtils.getLoginUser().getUserId()); - return faultMapper.insertFault(fault); + DeviceVO vo = deviceService.selectDeviceBySn(fault.getVehicleNum()); + ServiceUtil.assertion(vo==null,"当前设备不存在"); + return faultMapper.insertFault(fault); } /**