Merge remote-tracking branch 'origin/main' into main

flx-ai/src/main/java/com/pjilisense/flxai/base/service/CrudService.java

@@ -31,6 +31,6 @@ public interface CrudService<T, D> extends BaseService<T> {
 
     void update(D dto);
 
-    void delete(Long[] ids);
+    void delete(Serializable[] ids);
 
 }

flx-ai/src/main/java/com/pjilisense/flxai/base/service/impl/CrudServiceImpl.java

@@ -75,7 +75,7 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T, D> extends Bas
     }
 
     @Override
-    public void delete(Long[] ids) {
+    public void delete(Serializable[] ids) {
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 }

flx-ai/src/main/java/com/pjilisense/flxai/controller/AppAiAssistantController.java

@@ -0,0 +1,95 @@
+package com.pjilisense.flxai.controller;
+
+import com.pjilisense.flxai.base.constant.Constant;
+import com.pjilisense.flxai.page.PageData;
+import com.pjilisense.flxai.utils.Result;
+import com.pjilisense.flxai.dto.AppAiAssistantDTO;
+import com.pjilisense.flxai.service.AppAiAssistantService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * AI助手表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-13
+ */
+@RestController
+@RequestMapping(Constant.BASE_PATH+"appaiassistant")
+@Api(tags="AI助手表")
+public class AppAiAssistantController {
+
+    private static Logger logger = LoggerFactory.getLogger(AppAiAssistantController.class);
+
+    @Autowired
+    private AppAiAssistantService appAiAssistantService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="Integer", dataTypeClass =Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="Integer", dataTypeClass =Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String", dataTypeClass =String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String", dataTypeClass =String.class)
+    })
+    public Result<PageData<AppAiAssistantDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<AppAiAssistantDTO> page = appAiAssistantService.page(params);
+
+        return new Result<PageData<AppAiAssistantDTO>>().ok(page);
+    }
+    @GetMapping("getAllAiAssistant")
+    @ApiOperation("获取所有收藏")
+    public Result<List<Map<String, Object>>> getAllAiAssistant(@RequestParam("userid") String userid){
+        List<Map<String, Object>> allTools = appAiAssistantService.getAllAiTools(userid);
+        return new Result<List<Map<String, Object>>>().ok(allTools);
+    }
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    public Result<AppAiAssistantDTO> get(@PathVariable("id") String id){
+        AppAiAssistantDTO data = appAiAssistantService.get(id);
+
+        return new Result<AppAiAssistantDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    public Result save(@RequestBody AppAiAssistantDTO dto){
+        //效验数据
+
+        appAiAssistantService.save(dto);
+
+        return new Result<AppAiAssistantDTO>().ok(dto);
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    public Result update(@RequestBody AppAiAssistantDTO dto){
+        //效验数据
+
+        appAiAssistantService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        appAiAssistantService.delete(ids);
+
+        return new Result();
+    }
+
+}

flx-ai/src/main/java/com/pjilisense/flxai/controller/AppToolsSetController.java

@@ -51,14 +51,14 @@ public class AppToolsSetController {
     }
 
     @GetMapping("getAllAiTools")
-    @ApiOperation("分页")
+    @ApiOperation("获取所有AI应用集")
     public Result<Map<String,Object>> getAllAiTools(){
         Map<String,Object> allTools = appToolsSetService.getAllAiTools();
         return new Result<Map<String,Object>>().ok(allTools);
     }
     @GetMapping("{id}")
     @ApiOperation("信息")
-    public Result<AppToolsSetDTO> get(@PathVariable("id") Long id){
+    public Result<AppToolsSetDTO> get(@PathVariable("id") String id){
         AppToolsSetDTO data = appToolsSetService.get(id);
 
         return new Result<AppToolsSetDTO>().ok(data);
@@ -88,7 +88,7 @@ public class AppToolsSetController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    public Result delete(@RequestBody Long[] ids){
+    public Result delete(@RequestBody String[] ids){
         //效验数据
 //        AssertUtils.isArrayEmpty(ids, "id");
 

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 {
 

flx-ai/src/main/java/com/pjilisense/flxai/dao/AppAiAssistantDao.java

@@ -0,0 +1,16 @@
+package com.pjilisense.flxai.dao;
+
+import com.pjilisense.flxai.base.dao.BaseDao;
+import com.pjilisense.flxai.entity.AppAiAssistantEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * AI助手表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-13
+ */
+@Mapper
+public interface AppAiAssistantDao extends BaseDao<AppAiAssistantEntity> {
+	
+}

flx-ai/src/main/java/com/pjilisense/flxai/dto/AppAiAssistantDTO.java

@@ -0,0 +1,60 @@
+package com.pjilisense.flxai.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * AI助手表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-13
+ */
+@Data
+@ApiModel(value = "AI助手表")
+public class AppAiAssistantDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "主键")
+	private String id;
+
+	@ApiModelProperty(value = "作者")
+	private String author;
+
+	@ApiModelProperty(value = "主页地址")
+	private String homepage;
+
+	@ApiModelProperty(value = "标识")
+	private String identifier;
+
+	@ApiModelProperty(value = "avatar")
+	private String avatar;
+
+	@ApiModelProperty(value = "描述")
+	private String description;
+
+	@ApiModelProperty(value = "标签")
+	private String tags;
+
+	@ApiModelProperty(value = "标题")
+	private String title;
+
+	@ApiModelProperty(value = "分类")
+	private String category;
+
+	@ApiModelProperty(value = "Version")
+	private String schemaVersion;
+
+	@ApiModelProperty(value = "创建时间")
+	private String createAt;
+
+	@ApiModelProperty(value = "时间")
+	private String createdAt;
+
+	@ApiModelProperty(value = "用户ID")
+	private String userid;
+}

flx-ai/src/main/java/com/pjilisense/flxai/entity/AppAiAssistantEntity.java

@@ -0,0 +1,70 @@
+package com.pjilisense.flxai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * AI助手表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-13
+ */
+@Data
+@TableName("app_ai_assistant")
+public class AppAiAssistantEntity {
+
+    /**
+     * 主键
+     */
+	private String id;
+    /**
+     * 作者
+     */
+	private String author;
+    /**
+     * 主页地址
+     */
+	private String homepage;
+    /**
+     * 标识
+     */
+	private String identifier;
+    /**
+     * avatar
+     */
+	private String avatar;
+    /**
+     * 描述
+     */
+	private String description;
+    /**
+     * 标签
+     */
+	private String tags;
+    /**
+     * 标题
+     */
+	private String title;
+    /**
+     * 分类
+     */
+	private String category;
+    /**
+     * Version
+     */
+	private String schemaVersion;
+    /**
+     * 创建时间
+     */
+	private String createAt;
+    /**
+     * 时间
+     */
+	private String createdAt;
+    /**
+     * 用户ID
+     */
+    private String userid;
+}

flx-ai/src/main/java/com/pjilisense/flxai/service/AppAiAssistantService.java

@@ -0,0 +1,19 @@
+package com.pjilisense.flxai.service;
+
+import com.pjilisense.flxai.base.service.CrudService;
+import com.pjilisense.flxai.dto.AppAiAssistantDTO;
+import com.pjilisense.flxai.entity.AppAiAssistantEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI助手表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-13
+ */
+public interface AppAiAssistantService extends CrudService<AppAiAssistantEntity, AppAiAssistantDTO> {
+
+    List<Map<String, Object>> getAllAiTools(String userid);
+}

flx-ai/src/main/java/com/pjilisense/flxai/service/impl/AppAiAssistantServiceImpl.java

@@ -0,0 +1,75 @@
+package com.pjilisense.flxai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pjilisense.flxai.base.service.impl.CrudServiceImpl;
+import com.pjilisense.flxai.dao.AppAiAssistantDao;
+import com.pjilisense.flxai.dto.AppAiAssistantDTO;
+import com.pjilisense.flxai.entity.AppAiAssistantEntity;
+import com.pjilisense.flxai.entity.AppToolsSetEntity;
+import com.pjilisense.flxai.service.AppAiAssistantService;
+import cn.hutool.core.util.StrUtil;
+import com.pjilisense.flxai.utils.MapUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * AI助手表
+ *
+ * @author liushujing liushujing@philisense.com
+ * @since 1.0.0 2024-12-13
+ */
+@Service
+public class AppAiAssistantServiceImpl extends CrudServiceImpl<AppAiAssistantDao, AppAiAssistantEntity, AppAiAssistantDTO> implements AppAiAssistantService {
+
+    @Override
+    public QueryWrapper<AppAiAssistantEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<AppAiAssistantEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    public QueryWrapper<AppAiAssistantEntity> getWrapperAll(Map<String, Object> params){
+        String userid = (String)params.get("userid");
+
+        QueryWrapper<AppAiAssistantEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(userid), "userid", userid);
+        wrapper.orderByDesc("create_at","created_at");
+        return wrapper;
+    }
+    @Override
+    public List<Map<String, Object>> getAllAiTools(String userid) {
+        Map<String, Object> params =new HashMap<>();
+        params.put("userid",userid);
+        List<AppAiAssistantEntity> entityList = baseDao.selectList(getWrapperAll(params));
+        params.clear();
+        List<Map<String, Object>> retList = new ArrayList<>();
+        if(entityList!=null && entityList.size()>0) {
+            for (AppAiAssistantEntity entity : entityList) {
+                Map<String, Object> mapx = MapUtils.objectToMap(entity);
+                retList.add(mapx);
+                HashMap<String, Object> 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.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;
+    }
+}

flx-ai/src/main/resources/mapper/postgres/AppAiAssistantDao.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pjilisense.flxai.dao.AppAiAssistantDao">
+
+    <resultMap type="com.pjilisense.flxai.entity.AppAiAssistantEntity" id="appAiAssistantMap">
+        <result property="id" column="id"/>
+        <result property="author" column="author"/>
+        <result property="homepage" column="homepage"/>
+        <result property="identifier" column="identifier"/>
+        <result property="avatar" column="avatar"/>
+        <result property="description" column="description"/>
+        <result property="tags" column="tags"/>
+        <result property="title" column="title"/>
+        <result property="category" column="category"/>
+        <result property="schemaVersion" column="schema_version"/>
+        <result property="createAt" column="create_at"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="userid" column="userid"/>
+    </resultMap>
+
+
+</mapper>

flx-ai/src/test/java/test/com/pjilisense/flxai/TestUtils.java

@@ -13,15 +13,15 @@ import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.logging.Level;
+//import java.util.logging.Level;
-import java.util.logging.Logger;
+//import java.util.logging.Logger;
 
 public class TestUtils {
     public static final String UTF8 = "utf-8";
     public static final String GBK = "gbk";
     public static final String GB2312 = "gb2312";
     public static final String ISO88591 = "ISO-8859-1";
-    public static String WebconnectURL = "http://localhost:18080/flxai/";
+    public static String WebconnectURL = "http://localhost:18080/flxai";
     public static String EXPIRESIN = null;
     public static String TOKEN=null;
     public static int READ_TIMEOUT = 30000;
@@ -274,9 +274,9 @@ public class TestUtils {
             HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
             HttpsURLConnection.setDefaultHostnameVerifier(ignoreHostnameVerifier);
         } catch (KeyManagementException ex) {
-            Logger.getLogger(TestUtils.class.getName()).log(Level.SEVERE, null, ex);
+            //Logger.getLogger(TestUtils.class.getName()).log(Level.SEVERE, null, ex);
         } catch (NoSuchAlgorithmException ex) {
-            Logger.getLogger(TestUtils.class.getName()).log(Level.SEVERE, null, ex);
+            //Logger.getLogger(TestUtils.class.getName()).log(Level.SEVERE, null, ex);
         }
      }
 

flx-ai/src/test/java/test/com/pjilisense/flxai/controller/AppAiAssistantControllerTest.java

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+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<String, Object> params = new HashMap<String, Object>();
+            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();
+        }
+    }
+}

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";