diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/ti/TiVehicleFunctionController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/ti/TiVehicleFunctionController.java index c67bc59..0171123 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/ti/TiVehicleFunctionController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/ti/TiVehicleFunctionController.java @@ -46,6 +46,14 @@ public class TiVehicleFunctionController extends BaseController { return success(tiVehicleFunctionService.selectTiVehicleFunctionById(id)); } + + @ApiOperation("获取车机功能详细信息帶字典") + @PreAuthorize("@ss.hasPermi('ti:function:query')") + @GetMapping(value = "/detail/{id}") + public AjaxResult getDetailInfo(@PathVariable("id") Long id) { + return success(tiVehicleFunctionService.selectTiVehicleFunctionDetailById(id)); + } + @ApiOperation("新增车机功能") @PreAuthorize("@ss.hasPermi('ti:function:add')") @Log(title = "车机功能", businessType = BusinessType.INSERT) diff --git a/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/ITiVehicleFunctionService.java b/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/ITiVehicleFunctionService.java index 31ab093..12d7932 100644 --- a/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/ITiVehicleFunctionService.java +++ b/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/ITiVehicleFunctionService.java @@ -1,5 +1,6 @@ package com.cmvr.ti.service; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import com.cmvr.ti.model.domain.TiVehicleFunction; import com.cmvr.ti.model.vo.TiVehicleFunctionVO; @@ -18,6 +19,14 @@ public interface ITiVehicleFunctionService extends IService { */ public TiVehicleFunction selectTiVehicleFunctionById(Long id); + /** + * 查询车辆功能 + * + * @param id 车辆功能主键 + * @return 车辆功能 + */ + public JSONObject selectTiVehicleFunctionDetailById(Long id); + public List queryByIds(List ids); /** diff --git a/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiVehicleFunctionServiceImpl.java b/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiVehicleFunctionServiceImpl.java index 9e4c634..5681d03 100644 --- a/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiVehicleFunctionServiceImpl.java +++ b/cmvr-iot-ti/src/main/java/com/cmvr/ti/service/impl/TiVehicleFunctionServiceImpl.java @@ -3,9 +3,13 @@ package com.cmvr.ti.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cmvr.common.core.domain.entity.SysDictData; +import com.cmvr.system.service.ISysDictDataService; +import com.cmvr.system.service.ISysDictTypeService; import com.cmvr.ti.mapper.TiVehicleFunctionMapper; import com.cmvr.ti.model.domain.TiVehicleFunction; import com.cmvr.ti.model.vo.TiVehicleFunctionVO; @@ -25,11 +29,21 @@ import java.util.List; public class TiVehicleFunctionServiceImpl extends ServiceImpl implements ITiVehicleFunctionService { + private final ISysDictDataService sysDictDataService; @Override public TiVehicleFunction selectTiVehicleFunctionById(Long id) { + + return this.getById(id); } + @Override + public JSONObject selectTiVehicleFunctionDetailById(Long id) { + JSONObject jsonObject = JSONObject.from(this.getById(id)); + jsonObject.put("funcName", id== 26 ? "首页" : "设置"); + return jsonObject; + } + @Override public List queryByIds(List ids) { return this.listByIds(ids);