From 8a1ef59a8fd59948f3b1362d2c793f0ebfeda677 Mon Sep 17 00:00:00 2001 From: zhoujinhua Date: Tue, 21 Oct 2025 14:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=20=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/API接口说明-参数配置中心.md | 4 ++ .../controller/AppParamsCenterController.java | 25 +++++---- .../app/service/AppParamsCenterService.java | 41 +++++--------- .../impl/AppParamsCenterServiceImpl.java | 55 ++++--------------- 4 files changed, 41 insertions(+), 84 deletions(-) diff --git a/docs/API接口说明-参数配置中心.md b/docs/API接口说明-参数配置中心.md index e7512ea..86fc494 100644 --- a/docs/API接口说明-参数配置中心.md +++ b/docs/API接口说明-参数配置中心.md @@ -116,6 +116,7 @@ Authorization: your-token（必填） "data": { "id": 1, "userId": 1, + "username": "张三", "paramName": "默认参数配置", "deviceName": "我的无人机", "description": "这是一个测试参数配置", @@ -164,6 +165,7 @@ GET /params/all/list?fcModel=Pixhawk%204 { "id": 1, "userId": 1, + "username": "张三", "paramName": "默认参数配置", "deviceName": "我的无人机", "description": "这是一个测试参数配置", @@ -219,6 +221,7 @@ GET /params/all/page?current=1&size=10&fcModel=Pixhawk%204 { "id": 1, "userId": 1, + "username": "张三", "paramName": "默认参数配置", "deviceName": "我的无人机", "description": "这是一个测试参数配置", @@ -276,6 +279,7 @@ GET /params/my/list?fcModel=Pixhawk%204 { "id": 1, "userId": 1, + "username": "张三", "paramName": "默认参数配置", "deviceName": "我的无人机", "description": "这是一个测试参数配置", diff --git a/src/main/java/com/corewing/app/controller/AppParamsCenterController.java b/src/main/java/com/corewing/app/controller/AppParamsCenterController.java index f737d6c..f3da584 100644 --- a/src/main/java/com/corewing/app/controller/AppParamsCenterController.java +++ b/src/main/java/com/corewing/app/controller/AppParamsCenterController.java @@ -9,6 +9,7 @@ import com.corewing.app.dto.UpdateParamRequest; import com.corewing.app.entity.AppParamsCenter; import com.corewing.app.service.AppParamsCenterService; import com.corewing.app.util.I18nUtil; +import com.corewing.app.vo.AppParamsCenterVO; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -124,11 +125,11 @@ public class AppParamsCenterController { * 根据ID查询参数配置 */ @GetMapping("/{id}") - public Result getById(@PathVariable Long id) { + public Result getById(@PathVariable Long id) { try { Long userId = StpUtil.getLoginIdAsLong(); - AppParamsCenter params = paramsService.getById(id); + AppParamsCenterVO params = paramsService.getVOById(id); if (params == null) { return Result.error(I18nUtil.getMessage("params.not.found")); } @@ -146,9 +147,9 @@ public class AppParamsCenterController { * 查询所有参数列表（公开接口，支持飞控型号过滤） */ @GetMapping("/all/list") - public Result> listAll(@RequestParam(required = false) String fcModel) { + public Result> listAll(@RequestParam(required = false) String fcModel) { try { - List list = paramsService.listAllByFcModel(fcModel); + List list = paramsService.listAllByFcModel(fcModel); return Result.success(list); } catch (Exception e) { return Result.error(e.getMessage()); @@ -159,10 +160,10 @@ public class AppParamsCenterController { * 查询当前用户的参数列表（支持飞控型号过滤） */ @GetMapping("/my/list") - public Result> listMy(@RequestParam(required = false) String fcModel) { + public Result> listMy(@RequestParam(required = false) String fcModel) { try { Long userId = StpUtil.getLoginIdAsLong(); - List list = paramsService.listByUserIdAndFcModel(userId, fcModel); + List list = paramsService.listByUserIdAndFcModel(userId, fcModel); return Result.success(list); } catch (Exception e) { return Result.error(e.getMessage()); @@ -173,13 +174,13 @@ public class AppParamsCenterController { * 分页查询所有参数列表（公开接口，支持飞控型号过滤） */ @GetMapping("/all/page") - public Result> pageAll( + public Result> pageAll( @RequestParam(defaultValue = "1") Long current, @RequestParam(defaultValue = "10") Long size, @RequestParam(required = false) String fcModel) { try { - Page page = new Page<>(current, size); - IPage result = paramsService.pageAllByFcModel(fcModel, page); + Page page = new Page<>(current, size); + IPage result = paramsService.pageAllByFcModel(fcModel, page); return Result.success(result); } catch (Exception e) { return Result.error(e.getMessage()); @@ -190,14 +191,14 @@ public class AppParamsCenterController { * 分页查询当前用户的参数列表（支持飞控型号过滤） */ @GetMapping("/my/page") - public Result> pageMy( + public Result> pageMy( @RequestParam(defaultValue = "1") Long current, @RequestParam(defaultValue = "10") Long size, @RequestParam(required = false) String fcModel) { try { Long userId = StpUtil.getLoginIdAsLong(); - Page page = new Page<>(current, size); - IPage result = paramsService.pageByUserIdAndFcModel(userId, fcModel, page); + Page page = new Page<>(current, size); + IPage result = paramsService.pageByUserIdAndFcModel(userId, fcModel, page); return Result.success(result); } catch (Exception e) { return Result.error(e.getMessage()); diff --git a/src/main/java/com/corewing/app/service/AppParamsCenterService.java b/src/main/java/com/corewing/app/service/AppParamsCenterService.java index 7e9db5d..3ef8085 100644 --- a/src/main/java/com/corewing/app/service/AppParamsCenterService.java +++ b/src/main/java/com/corewing/app/service/AppParamsCenterService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.corewing.app.entity.AppParamsCenter; +import com.corewing.app.vo.AppParamsCenterVO; import java.util.List; @@ -13,62 +14,46 @@ import java.util.List; public interface AppParamsCenterService extends IService { /** - * 根据用户ID查询参数列表 + * 根据ID查询参数VO（带用户名） * - * @param userId 用户ID - * @return 参数列表 + * @param id 参数ID + * @return 参数VO */ - List listByUserId(Long userId); + AppParamsCenterVO getVOById(Long id); /** - * 根据用户ID和飞控型号查询参数列表 + * 根据用户ID和飞控型号查询参数列表（带用户名） * * @param userId 用户ID * @param fcModel 飞控型号 * @return 参数列表 */ - List listByUserIdAndFcModel(Long userId, String fcModel); + List listByUserIdAndFcModel(Long userId, String fcModel); /** - * 分页查询用户的参数列表 - * - * @param userId 用户ID - * @param page 分页对象 - * @return 分页结果 - */ - IPage pageByUserId(Long userId, Page page); - - /** - * 分页查询用户的参数列表（支持飞控型号过滤） + * 分页查询用户的参数列表（支持飞控型号过滤，带用户名） * * @param userId 用户ID * @param fcModel 飞控型号（可选） * @param page 分页对象 * @return 分页结果 */ - IPage pageByUserIdAndFcModel(Long userId, String fcModel, Page page); + IPage pageByUserIdAndFcModel(Long userId, String fcModel, Page page); /** - * 查询所有参数列表 - * - * @return 参数列表 - */ - List listAll(); - - /** - * 根据飞控型号查询所有参数列表 + * 根据飞控型号查询所有参数列表（带用户名） * * @param fcModel 飞控型号 * @return 参数列表 */ - List listAllByFcModel(String fcModel); + List listAllByFcModel(String fcModel); /** - * 分页查询所有参数列表（支持飞控型号过滤） + * 分页查询所有参数列表（支持飞控型号过滤，带用户名） * * @param fcModel 飞控型号（可选） * @param page 分页对象 * @return 分页结果 */ - IPage pageAllByFcModel(String fcModel, Page page); + IPage pageAllByFcModel(String fcModel, Page page); } diff --git a/src/main/java/com/corewing/app/service/impl/AppParamsCenterServiceImpl.java b/src/main/java/com/corewing/app/service/impl/AppParamsCenterServiceImpl.java index 5659ac6..a1f18c0 100644 --- a/src/main/java/com/corewing/app/service/impl/AppParamsCenterServiceImpl.java +++ b/src/main/java/com/corewing/app/service/impl/AppParamsCenterServiceImpl.java @@ -1,14 +1,13 @@ package com.corewing.app.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.corewing.app.entity.AppParamsCenter; import com.corewing.app.mapper.AppParamsCenterMapper; import com.corewing.app.service.AppParamsCenterService; +import com.corewing.app.vo.AppParamsCenterVO; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import java.util.List; @@ -19,59 +18,27 @@ import java.util.List; public class AppParamsCenterServiceImpl extends ServiceImpl implements AppParamsCenterService { @Override - public List listByUserId(Long userId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AppParamsCenter::getUserId, userId) - .orderByDesc(AppParamsCenter::getUpdateTime); - return this.list(wrapper); + public AppParamsCenterVO getVOById(Long id) { + return this.baseMapper.selectVOById(id); } @Override - public List listByUserIdAndFcModel(Long userId, String fcModel) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AppParamsCenter::getUserId, userId) - .eq(StringUtils.hasText(fcModel), AppParamsCenter::getFcModel, fcModel) - .orderByDesc(AppParamsCenter::getUpdateTime); - return this.list(wrapper); + public List listByUserIdAndFcModel(Long userId, String fcModel) { + return this.baseMapper.selectVOListByUserId(userId, fcModel); } @Override - public IPage pageByUserId(Long userId, Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AppParamsCenter::getUserId, userId) - .orderByDesc(AppParamsCenter::getUpdateTime); - return this.page(page, wrapper); + public IPage pageByUserIdAndFcModel(Long userId, String fcModel, Page page) { + return this.baseMapper.selectVOPageByUserId(page, userId, fcModel); } @Override - public IPage pageByUserIdAndFcModel(Long userId, String fcModel, Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(AppParamsCenter::getUserId, userId) - .eq(StringUtils.hasText(fcModel), AppParamsCenter::getFcModel, fcModel) - .orderByDesc(AppParamsCenter::getUpdateTime); - return this.page(page, wrapper); + public List listAllByFcModel(String fcModel) { + return this.baseMapper.selectAllVOList(fcModel); } @Override - public List listAll() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.orderByDesc(AppParamsCenter::getUpdateTime); - return this.list(wrapper); - } - - @Override - public List listAllByFcModel(String fcModel) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.hasText(fcModel), AppParamsCenter::getFcModel, fcModel) - .orderByDesc(AppParamsCenter::getUpdateTime); - return this.list(wrapper); - } - - @Override - public IPage pageAllByFcModel(String fcModel, Page page) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.hasText(fcModel), AppParamsCenter::getFcModel, fcModel) - .orderByDesc(AppParamsCenter::getUpdateTime); - return this.page(page, wrapper); + public IPage pageAllByFcModel(String fcModel, Page page) { + return this.baseMapper.selectAllVOPage(page, fcModel); } }