From e30fac271f4e099634b7eeb0d24d8df159487e3c Mon Sep 17 00:00:00 2001 From: liushujing Date: Fri, 13 Dec 2024 14:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppAiAssistantController.java | 6 +- .../controller/AppToolsTypeController.java | 2 +- .../impl/AppAiAssistantServiceImpl.java | 4 +- .../AppAiAssistantControllerTest.java | 66 +++++++++++++++++++ .../controller/AppToolsSetControllerTest.java | 1 - 5 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppAiAssistantControllerTest.java diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiAssistantController.java b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiAssistantController.java index b723f1b..f20fa4f 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiAssistantController.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiAssistantController.java @@ -27,7 +27,7 @@ import java.util.Map; * @since 1.0.0 2024-12-13 */ @RestController -@RequestMapping("robot/appaiassistant") +@RequestMapping(Constant.BASE_PATH+"appaiassistant") @Api(tags="AI助手表") public class AppAiAssistantController { @@ -51,7 +51,7 @@ public class AppAiAssistantController { } @GetMapping("getAllAiAssistant") @ApiOperation("获取所有收藏") - public Result>> getAllAiAssistant(@PathVariable("userid") String userid){ + public Result>> getAllAiAssistant(@RequestParam("userid") String userid){ List> allTools = appAiAssistantService.getAllAiTools(userid); return new Result>>().ok(allTools); } @@ -70,7 +70,7 @@ public class AppAiAssistantController { appAiAssistantService.save(dto); - return new Result(); + return new Result().ok(dto); } @PutMapping diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppToolsTypeController.java b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppToolsTypeController.java index 343b741..8c8c006 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppToolsTypeController.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppToolsTypeController.java @@ -27,7 +27,7 @@ import java.util.Map; * @since 1.0.0 2024-12-12 */ @RestController -@RequestMapping("robot/apptoolstype") +@RequestMapping(Constant.BASE_PATH+"apptoolstype") @Api(tags="AI应用工具集分类表") public class AppToolsTypeController { diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiAssistantServiceImpl.java b/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiAssistantServiceImpl.java index 61e5b48..0340734 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiAssistantServiceImpl.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiAssistantServiceImpl.java @@ -37,7 +37,7 @@ public class AppAiAssistantServiceImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid); - wrapper.orderByDesc("createAt","createdAt"); + wrapper.orderByDesc("create_at","created_at"); return wrapper; } @Override @@ -47,7 +47,7 @@ public class AppAiAssistantServiceImpl extends CrudServiceImpl entityList = baseDao.selectList(getWrapperAll(params)); params.clear(); List> retList = new ArrayList<>(); - if(retList!=null && retList.size()>0) { + if(entityList!=null && entityList.size()>0) { for (AppAiAssistantEntity entity : entityList) { Map mapx = MapUtils.objectToMap(entity); retList.add(mapx); diff --git a/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppAiAssistantControllerTest.java b/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppAiAssistantControllerTest.java new file mode 100644 index 0000000..11300cf --- /dev/null +++ b/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppAiAssistantControllerTest.java @@ -0,0 +1,66 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package test.com.pjilisense.flxai.controller; + +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.ApiModelProperty; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import test.com.pjilisense.flxai.TestUtils; + +import java.util.HashMap; +import java.util.Map; + +public class AppAiAssistantControllerTest { + @BeforeEach + public void setUpTestDataWithinTransaction() { + // set up test data within the transaction + } + @AfterEach + public void tearDownWithinTransaction() { + // execute "tear down" logic within the transaction + } + + @Test + public void testAppAiAssistantSave() { + String url = TestUtils.WebconnectURL+"/api/robot/appaiassistant"; + String charset = TestUtils.UTF8; + try { + Map params = new HashMap(); + params.put("author","sharkbear212a"); + params.put("homepage","https://github.com/sharkbear212a"); + params.put("identifier","japan-language-helpera"); + params.put("avatar","avatara"); + params.put("description","擅长日语五十音，平假名，片假名，单词和短语解释与记忆技巧a"); + params.put("tags","解释,记忆技巧,日语教学a"); + params.put("title","日语帮助记忆师a"); + params.put("category","education"); + params.put("schemaVersion","1"); + params.put("createAt","2024-12-04"); + params.put("createdAt","2024-12-04"); + params.put("userid","flx"); + String body = TestUtils.doPost(url, JSON.toJSONString(params), charset); + System.out.println(body); + } catch (Exception e) { + e.printStackTrace(); + } + } + @Test + public void testGetAllAiAssistant() { + String url = TestUtils.WebconnectURL+"/api/robot/appaiassistant/getAllAiAssistant?userid=flx"; + String charset = TestUtils.UTF8; + try { + String body = TestUtils.doGet(url, charset); + System.out.println(body); + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppToolsSetControllerTest.java b/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppToolsSetControllerTest.java index 21f7679..606d649 100644 --- a/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppToolsSetControllerTest.java +++ b/flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppToolsSetControllerTest.java @@ -27,7 +27,6 @@ public class AppToolsSetControllerTest { // execute "tear down" logic within the transaction } - String token="c047b2a8a72d495abc350489b691c683"; @Test public void testGetAllAiTools() { String url = TestUtils.WebconnectURL+"/api/robot/apptoolsset/getAllAiTools";