From 8abd6e600e78df7105058c0b990b4e2aecdb48ad Mon Sep 17 00:00:00 2001 From: liushujing Date: Fri, 20 Dec 2024 13:25:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=8F=92=E4=BB=B6=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppAiModelController.java | 17 +++- .../controller/AppAiPluginController.java | 16 +++- .../flxai/service/AppAiModelService.java | 6 ++ .../flxai/service/AppAiPluginService.java | 6 ++ .../impl/AppAiAssistantServiceImpl.java | 2 +- .../service/impl/AppAiModelServiceImpl.java | 77 ++++++++++++++++++- .../service/impl/AppAiPluginServiceImpl.java | 50 +++++++++++- 7 files changed, 167 insertions(+), 7 deletions(-) diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiModelController.java b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiModelController.java index f899e53..d6ad5e5 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiModelController.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiModelController.java @@ -27,7 +27,7 @@ import java.util.Map; * @since 1.0.0 2024-12-20 */ @RestController -@RequestMapping("robot/appaimodel") +@RequestMapping(Constant.BASE_PATH+"appaimodel") @Api(tags="AI模型表") public class AppAiModelController { @@ -49,7 +49,12 @@ public class AppAiModelController { return new Result>().ok(page); } - + @GetMapping("getAllAiModel") + @ApiOperation("获取所有收藏") + public Result>> getAllAiModel(@RequestParam("userid") String userid){ + List> allTools = appAiModelService.getAllAiModel(userid); + return new Result>>().ok(allTools); + } @GetMapping("{id}") @ApiOperation("信息") public Result get(@PathVariable("id") Long id){ @@ -87,5 +92,13 @@ public class AppAiModelController { return new Result(); } + @GetMapping("deleteByIdentifier") + @ApiOperation("删除") + public Result deleteByIdentifier(@RequestParam("userid") String userid, @RequestParam("identifier") String identifier){ + //效验数据 + appAiModelService.deleteByIdentifier(userid,identifier); + + return new Result(); + } } \ No newline at end of file diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiPluginController.java b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiPluginController.java index 56f5f89..f1767e4 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiPluginController.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiPluginController.java @@ -27,7 +27,7 @@ import java.util.Map; * @since 1.0.0 2024-12-20 */ @RestController -@RequestMapping("robot/appaiplugin") +@RequestMapping(Constant.BASE_PATH+"appaiplugin") @Api(tags="AI插件表") public class AppAiPluginController { @@ -49,7 +49,12 @@ public class AppAiPluginController { return new Result>().ok(page); } - + @GetMapping("getAllAiPlugin") + @ApiOperation("获取所有收藏") + public Result>> getAllAiPlugin(@RequestParam("userid") String userid){ + List> allTools = appAiPluginService.getAllAiPlugin(userid); + return new Result>>().ok(allTools); + } @GetMapping("{id}") @ApiOperation("信息") public Result get(@PathVariable("id") Long id){ @@ -87,5 +92,12 @@ public class AppAiPluginController { return new Result(); } + @GetMapping("deleteByIdentifier") + @ApiOperation("删除") + public Result deleteByIdentifier(@RequestParam("userid") String userid, @RequestParam("identifier") String identifier){ + //效验数据 + appAiPluginService.deleteByIdentifier(userid,identifier); + return new Result(); + } } \ No newline at end of file diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiModelService.java b/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiModelService.java index 558618e..d78c2c0 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiModelService.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiModelService.java @@ -4,6 +4,9 @@ import com.pjilisense.flxai.base.service.CrudService; import com.pjilisense.flxai.dto.AppAiModelDTO; import com.pjilisense.flxai.entity.AppAiModelEntity; +import java.util.List; +import java.util.Map; + /** * AI模型表 * @@ -12,4 +15,7 @@ import com.pjilisense.flxai.entity.AppAiModelEntity; */ public interface AppAiModelService extends CrudService { + int deleteByIdentifier(String userid, String identifier); + + List> getAllAiModel(String userid); } \ No newline at end of file diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiPluginService.java b/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiPluginService.java index 2cf98ba..ca657b6 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiPluginService.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiPluginService.java @@ -4,6 +4,9 @@ import com.pjilisense.flxai.base.service.CrudService; import com.pjilisense.flxai.dto.AppAiPluginDTO; import com.pjilisense.flxai.entity.AppAiPluginEntity; +import java.util.List; +import java.util.Map; + /** * AI插件表 * @@ -12,4 +15,7 @@ import com.pjilisense.flxai.entity.AppAiPluginEntity; */ public interface AppAiPluginService extends CrudService { + List> getAllAiPlugin(String userid); + + int deleteByIdentifier(String userid, String identifier); } \ No newline at end of file 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 7fc8501..d70728f 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 @@ -58,7 +58,7 @@ public class AppAiAssistantServiceImpl extends CrudServiceImpl 0) { + if (tags!=null && tags.length() > 0) { meta.put("tags", Arrays.asList(tags.split("\\,"))); } else { meta.put("tags", new ArrayList<>()); diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiModelServiceImpl.java b/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiModelServiceImpl.java index d35c3c3..6de89a5 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiModelServiceImpl.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiModelServiceImpl.java @@ -5,11 +5,13 @@ import com.pjilisense.flxai.base.service.impl.CrudServiceImpl; import com.pjilisense.flxai.dao.AppAiModelDao; import com.pjilisense.flxai.dto.AppAiModelDTO; import com.pjilisense.flxai.entity.AppAiModelEntity; +import com.pjilisense.flxai.entity.AppAiPluginEntity; import com.pjilisense.flxai.service.AppAiModelService; import cn.hutool.core.util.StrUtil; +import com.pjilisense.flxai.utils.MapUtils; import org.springframework.stereotype.Service; -import java.util.Map; +import java.util.*; /** * AI模型表 @@ -30,5 +32,78 @@ public class AppAiModelServiceImpl extends CrudServiceImpl getWrapperAll(Map params){ + String userid = (String)params.get("userid"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid); + wrapper.orderByDesc("created_at"); + return wrapper; + } + + @Override + public int deleteByIdentifier(String userid, String identifier) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StrUtil.isNotBlank(identifier), "identifier", identifier); + wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid); + return baseDao.delete(wrapper); + } + + @Override + public List> getAllAiModel(String userid) { + Map params =new HashMap<>(); + params.put("userid",userid); + List entityList = baseDao.selectList(getWrapperAll(params)); + params.clear(); + List> retList = new ArrayList<>(); + if(entityList!=null && entityList.size()>0) { + for (AppAiModelEntity entity : entityList) { + Map mapx = MapUtils.objectToMap(entity); + retList.add(mapx); + HashMap meta = new HashMap<>(); + mapx.put("meta", meta); + meta.put("displayName", mapx.get("displayName")); + meta.put("description", mapx.get("description")); + meta.put("title", mapx.get("title")); + meta.put("enabled", mapx.get("enabled")); + meta.put("category", mapx.get("category")); + meta.put("metaId", mapx.get("metaId")); + meta.put("metaTokens", mapx.get("metaTokens")); + String tags = (String) mapx.get("tags"); + if (tags!=null && tags.length() > 0) { + meta.put("tags", Arrays.asList(tags.split("\\,"))); + } else { + meta.put("tags", new ArrayList<>()); + } + mapx.remove("displayName"); + mapx.remove("description"); + mapx.remove("title"); + mapx.remove("enabled"); + mapx.remove("category"); + mapx.remove("metaId"); + mapx.remove("metaTokens"); + String providers = (String) mapx.get("providers"); + if (providers!=null && providers.length() > 0) { + meta.put("providers", Arrays.asList(providers.split("\\,"))); + } else { + meta.put("providers", new ArrayList<>()); + } + HashMap socialData = new HashMap<>(); + mapx.put("socialData", socialData); + meta.put("conversations", mapx.get("conversations")); + meta.put("likes", mapx.get("likes")); + meta.put("tokens", mapx.get("tokens")); + mapx.remove("conversations"); + mapx.remove("likes"); + mapx.remove("tokens"); + String suggestions = (String) mapx.get("suggestions"); + if (suggestions!=null && suggestions.length() > 0) { + meta.put("suggestions", Arrays.asList(suggestions.split("\\,"))); + } else { + meta.put("suggestions", new ArrayList<>()); + } + } + } + return retList; + } } \ No newline at end of file diff --git a/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiPluginServiceImpl.java b/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiPluginServiceImpl.java index f28582f..2f550ea 100644 --- a/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiPluginServiceImpl.java +++ b/flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiPluginServiceImpl.java @@ -7,9 +7,10 @@ import com.pjilisense.flxai.dto.AppAiPluginDTO; import com.pjilisense.flxai.entity.AppAiPluginEntity; import com.pjilisense.flxai.service.AppAiPluginService; import cn.hutool.core.util.StrUtil; +import com.pjilisense.flxai.utils.MapUtils; import org.springframework.stereotype.Service; -import java.util.Map; +import java.util.*; /** * AI插件表 @@ -30,5 +31,52 @@ public class AppAiPluginServiceImpl extends CrudServiceImpl getWrapperAll(Map params){ + String userid = (String)params.get("userid"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid); + wrapper.orderByDesc("created_at"); + return wrapper; + } + @Override + public List> getAllAiPlugin(String userid) { + Map params =new HashMap<>(); + params.put("userid",userid); + List entityList = baseDao.selectList(getWrapperAll(params)); + params.clear(); + List> retList = new ArrayList<>(); + if(entityList!=null && entityList.size()>0) { + for (AppAiPluginEntity entity : entityList) { + Map mapx = MapUtils.objectToMap(entity); + retList.add(mapx); + HashMap meta = new HashMap<>(); + mapx.put("meta", meta); + meta.put("avatar", mapx.get("avatar")); + meta.put("description", mapx.get("description")); + meta.put("title", mapx.get("title")); + meta.put("category", mapx.get("category")); + String tags = (String) mapx.get("tags"); + if (tags!=null && tags.length() > 0) { + meta.put("tags", Arrays.asList(tags.split("\\,"))); + } else { + meta.put("tags", new ArrayList<>()); + } + mapx.remove("avatar"); + mapx.remove("description"); + mapx.remove("title"); + mapx.remove("category"); + mapx.remove("tags"); + } + } + return retList; + } + + @Override + public int deleteByIdentifier(String userid, String identifier) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StrUtil.isNotBlank(identifier), "identifier", identifier); + wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid); + return baseDao.delete(wrapper); + } } \ No newline at end of file