diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/DeviceListController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/DeviceListController.java index 7c6a517..6be0bfe 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/DeviceListController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/DeviceListController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "设备信息获取") +@Api(tags = "边缘--设备信息获取") @RestController @RequestMapping("/api/deviceList") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeBioHeadController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeBioHeadController.java index d531de5..dc65daf 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeBioHeadController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeBioHeadController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "机器人头部") +@Api(tags = "边缘--机器人头部") @RestController @RequestMapping("/api/biohead") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/TestGrpcController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeCameraController.java similarity index 96% rename from cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/TestGrpcController.java rename to cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeCameraController.java index 031a102..a744883 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/TestGrpcController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeCameraController.java @@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "测试相机服务") +@Api(tags = "边缘--相机") @RestController @RequestMapping("/api/edge/camera") @RequiredArgsConstructor -public class TestGrpcController extends BaseController { +public class EdgeCameraController extends BaseController { private final EdgeCameraService edgeCameraService; diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDeviceController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDeviceController.java index 0da51e0..ecb456c 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDeviceController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDeviceController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "API操作") +@Api(tags = "边缘--API操作") @RestController @RequestMapping("/api") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDexHandController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDexHandController.java index 90eecbb..8049617 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDexHandController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeDexHandController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; -@Api(tags = "机器人灵巧手") +@Api(tags = "边缘--机器人灵巧手") @RestController @RequestMapping("/api/dexHand") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeHumanoidRobotController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeHumanoidRobotController.java index c066b1b..59c4b91 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeHumanoidRobotController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeHumanoidRobotController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "机械臂") +@Api(tags = "边缘--机械臂") @RestController @RequestMapping("/api/humanoid") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/MicrophoneController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeMicrophoneController.java similarity index 98% rename from cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/MicrophoneController.java rename to cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeMicrophoneController.java index fb70011..86a9674 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/MicrophoneController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeMicrophoneController.java @@ -16,11 +16,11 @@ import java.util.Map; /** * 麦克风管理 */ -@Api(tags = "麦克风") +@Api(tags = "边缘--麦克风") @RestController @RequestMapping("/api/Microphone") @RequiredArgsConstructor -public class MicrophoneController { +public class EdgeMicrophoneController { private final EdgeMicrophoneService microphoneService; diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/SpeakerController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeSpeakerController.java similarity index 98% rename from cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/SpeakerController.java rename to cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeSpeakerController.java index 31fa6c3..7f17c87 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/SpeakerController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/EdgeSpeakerController.java @@ -3,7 +3,6 @@ package com.cmvr.web.controller.api; import cmvr.api.SpeakerCommand; import com.cmvr.edge.client.service.EdgeSpeakerService; import com.cmvr.common.core.domain.AjaxResult; -import com.cmvr.common.core.page.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -19,11 +18,11 @@ import java.util.Map; * * @author cmvr */ -@Api(tags = "扬声器") +@Api(tags = "边缘--扬声器") @RestController @RequestMapping("/api/Speaker") @RequiredArgsConstructor -public class SpeakerController { +public class EdgeSpeakerController { private final EdgeSpeakerService speakerService; diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/LargeModelRemoteController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/LargeModelRemoteController.java index bd4cdd6..5e337c2 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/LargeModelRemoteController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/api/LargeModelRemoteController.java @@ -1,23 +1,42 @@ package com.cmvr.web.controller.api; +import com.cmvr.common.core.controller.BaseController; import com.cmvr.llm.model.CallAgentVO; import com.cmvr.llm.service.LargeModelRemoteService; import com.cmvr.llm.util.LargeModelFileUploadUtil; import com.cmvr.common.core.domain.AjaxResult; +import com.cmvr.system.domain.vo.CarIcon; +import com.cmvr.system.service.CarPathFinderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.stream.Collectors; -@Api(tags = "大模型接口调用") + +@Api(tags = "大模型服务") @RestController @RequestMapping("/api/call") @RequiredArgsConstructor -public class LargeModelRemoteController { +public class LargeModelRemoteController extends BaseController { private final LargeModelRemoteService largeModelRemoteService; + private final CarPathFinderService carPathFinderService; + + @ApiOperation("查找操作路径") + @GetMapping("/path") + public AjaxResult path( + @RequestParam("manufacturer") String manufacturer, + @RequestParam("vehType") String vehType, + @RequestParam("startUi") String startUi, + @RequestParam("targetFeature") String targetFeature + ) { + List path = carPathFinderService.findPath(manufacturer, vehType, startUi, targetFeature); + return AjaxResult.ok(path.stream().map(CarIcon::getIconName).collect(Collectors.joining(" -> "))); + } @ApiOperation("执行语音转文本工作流") @PostMapping("/speechToText") diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceProfileController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceProfileController.java index 90b2d50..08e7ca8 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceProfileController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceProfileController.java @@ -27,7 +27,7 @@ import com.cmvr.common.core.page.TableDataInfo; @RestController @RequestMapping("/device/profile") @RequiredArgsConstructor -@Api(tags = "设备配置信息") +@Api(tags = "设备--配置信息") public class DeDeviceProfileController extends BaseController { diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceRegistrationController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceRegistrationController.java index f0138ba..1f6f597 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceRegistrationController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceRegistrationController.java @@ -35,7 +35,7 @@ import com.cmvr.common.core.page.TableDataInfo; @RestController @RequestMapping("/device/register") @RequiredArgsConstructor -@Api(tags = "设备注册") +@Api(tags = "设备--注册") public class DeDeviceRegistrationController extends BaseController { @Autowired diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceTerminalConfigController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceTerminalConfigController.java index 902db5e..8b7c672 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceTerminalConfigController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/device/DeDeviceTerminalConfigController.java @@ -27,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/device/terminal") @RequiredArgsConstructor -@Api(tags = "设备终端配置") +@Api(tags = "设备--终端配置") public class DeDeviceTerminalConfigController extends BaseController { @Autowired private IDeDeviceTerminalConfigService deDeviceTerminalConfigService; diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/show/ShowIntelligentCockpitController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/show/ShowIntelligentCockpitController.java index b1da9eb..826494d 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/show/ShowIntelligentCockpitController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/show/ShowIntelligentCockpitController.java @@ -26,7 +26,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.io.IOException; -@Api(tags = "演示-智能座舱") +@Api(tags = "演示--智能座舱") @RestController @RequestMapping("/show") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysFileInfoController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysFileInfoController.java index 395bc05..b1313ac 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysFileInfoController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysFileInfoController.java @@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; -@Api(tags = "文件管理") +@Api(tags = "通用--文件管理") @RestController @RequestMapping("/system/file") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysGroupController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysGroupController.java index 73c5c32..5e97d55 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysGroupController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysGroupController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "通用分组配置") +@Api(tags = "通用--分组配置") @RestController @RequestMapping("/system/group") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysLoginController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysLoginController.java index 6d56bac..ab57624 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysLoginController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysLoginController.java @@ -27,7 +27,7 @@ import com.cmvr.system.service.ISysMenuService; * * @author cmvr-iot */ -@Api(tags = "登录验证") +@Api(tags = "通用--登录验证") @RestController public class SysLoginController { diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysVehOperConfigController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysVehOperConfigController.java index d906316..98b7617 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysVehOperConfigController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/system/SysVehOperConfigController.java @@ -52,7 +52,6 @@ public class SysVehOperConfigController extends BaseController { return success(sysVehOperConfigService.selectSysVehOperConfigById(configId)); } - @ApiOperation("新增参数配置") @PreAuthorize("@ss.hasPermi('system:vehOper:add')") @Log(title = "参数管理", businessType = BusinessType.INSERT) diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeDetectionItemController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeDetectionItemController.java index 49948a4..81c9b5f 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeDetectionItemController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeDetectionItemController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; -@Api(tags = "检测项配置") +@Api(tags = "测试--检测项配置") @RestController @RequestMapping("/test/detect") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeFlowController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeFlowController.java index a5bd438..589c670 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeFlowController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeFlowController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; -@Api(tags = "流程相关接口服务") +@Api(tags = "测试--流程服务") @RestController @RequestMapping("/flow") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskConfigInfoController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskConfigInfoController.java index 029ce02..26404e9 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskConfigInfoController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskConfigInfoController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "任务配置信息") +@Api(tags = "测试--任务配置") @RestController @RequestMapping("/test/config") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskInstController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskInstController.java index 09ce96a..0ec3521 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskInstController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskInstController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "任务实例") +@Api(tags = "测试--任务实例") @RestController @RequestMapping("/test/inst") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskOrchestrationController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskOrchestrationController.java index 1cb1094..5b35739 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskOrchestrationController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTaskOrchestrationController.java @@ -18,7 +18,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotEmpty; import java.util.List; -@Api(tags = "任务编排") +@Api(tags = "测试--任务编排") @RestController @RequestMapping("/test/orchestration") @RequiredArgsConstructor diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTestController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTestController.java deleted file mode 100644 index f60dfe6..0000000 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TeTestController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cmvr.web.controller.test; - - -import com.cmvr.common.core.controller.BaseController; -import com.cmvr.common.core.domain.AjaxResult; -import com.cmvr.system.domain.vo.CarIcon; -import com.cmvr.system.service.CarPathFinderService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.stream.Collectors; - -@Api(tags = "测试接口") -@RestController -@RequestMapping("/test/test") -@RequiredArgsConstructor -public class TeTestController extends BaseController { - - private final CarPathFinderService carPathFinderService; - - @ApiOperation("查找操作路径") - @GetMapping("/path") - public AjaxResult path( - @RequestParam("manufacturer") String manufacturer, - @RequestParam("vehType") String vehType, - @RequestParam("startUi") String startUi, - @RequestParam("targetFeature") String targetFeature - ) { - List path = carPathFinderService.findPath(manufacturer, vehType, startUi, targetFeature); - return success(path.stream().map(CarIcon::getIconName).collect(Collectors.joining(" -> "))); - } -} diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TekKeywordsSpotController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TekKeywordsSpotController.java index b6e1548..19fa5a4 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TekKeywordsSpotController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/test/TekKeywordsSpotController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "语音唤醒服务") +@Api(tags = "测试--语音唤醒") @RestController @RequestMapping("/kws") @RequiredArgsConstructor @@ -17,7 +17,7 @@ public class TekKeywordsSpotController { @ApiOperation("唤醒") @GetMapping("/wake") public AjaxResult wake() { - return AjaxResult.ok("ok"); + return AjaxResult.ok(); } @ApiOperation("执行")