|
|
|
@ -6,8 +6,10 @@ import javax.validation.Valid;
|
|
|
|
|
|
|
|
|
|
import com.ruoyi.basetyre.domain.BaseCarQueue;
|
|
|
|
|
import com.ruoyi.basetyre.domain.BaseCarType;
|
|
|
|
|
import com.ruoyi.basetyre.domain.BaseDevice;
|
|
|
|
|
import com.ruoyi.basetyre.service.IBaseCarQueueService;
|
|
|
|
|
import com.ruoyi.basetyre.service.IBaseCarTypeService;
|
|
|
|
|
import com.ruoyi.basetyre.service.IBaseDeviceService;
|
|
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
@ -43,7 +45,8 @@ public class BaseCarController extends BaseController
|
|
|
|
|
private IBaseCarQueueService baseCarQueueService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private IBaseCarTypeService baseCarTypeService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private IBaseDeviceService baseDeviceService;
|
|
|
|
|
/**
|
|
|
|
|
* 查询车辆基础信息列表
|
|
|
|
|
*/
|
|
|
|
@ -52,7 +55,7 @@ public class BaseCarController extends BaseController
|
|
|
|
|
public TableDataInfo list(BaseCar baseCar)
|
|
|
|
|
{
|
|
|
|
|
startPage();
|
|
|
|
|
List<BaseCar> list = baseCarService.selectBaseCarList(baseCar);
|
|
|
|
|
List<BaseCar> list = baseCarService.queryList(baseCar);
|
|
|
|
|
return getDataTable(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -128,4 +131,14 @@ public class BaseCarController extends BaseController
|
|
|
|
|
ajaxResult.put("CarTypeList",baseCarTypeList);
|
|
|
|
|
return ajaxResult;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getDeviceList")
|
|
|
|
|
public TableDataInfo getDeviceList(String deviceId){
|
|
|
|
|
BaseDevice baseDevice = new BaseDevice();
|
|
|
|
|
baseDevice.setState((long) 0);
|
|
|
|
|
baseDevice.setInternetThingsNo(deviceId);
|
|
|
|
|
List<BaseDevice> baseDeviceList = baseDeviceService.selectBaseDeviceList(baseDevice);
|
|
|
|
|
return getDataTable(baseDeviceList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|