我的收藏根据用户查询所有收藏

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

@@ -49,10 +49,15 @@ public class AppAiAssistantController {
 
         return new Result<PageData<AppAiAssistantDTO>>().ok(page);
     }
-
+    @GetMapping("getAllAiAssistant")
+    @ApiOperation("获取所有收藏")
+    public Result<List<Map<String, Object>>> getAllAiAssistant(@PathVariable("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") Long id){
+    public Result<AppAiAssistantDTO> get(@PathVariable("id") String id){
         AppAiAssistantDTO data = appAiAssistantService.get(id);
 
         return new Result<AppAiAssistantDTO>().ok(data);
@@ -80,7 +85,7 @@ public class AppAiAssistantController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    public Result delete(@RequestBody Long[] ids){
+    public Result delete(@RequestBody String[] ids){
         //效验数据
         appAiAssistantService.delete(ids);
 

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/dto/AppAiAssistantDTO.java

@@ -55,5 +55,6 @@ public class AppAiAssistantDTO implements Serializable {
 	@ApiModelProperty(value = "时间")
 	private String createdAt;
 
-
+	@ApiModelProperty(value = "用户ID")
+	private String userid;
 }

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

@@ -63,4 +63,8 @@ public class AppAiAssistantEntity {
      * 时间
      */
 	private String createdAt;
+    /**
+     * 用户ID
+     */
+    private String userid;
 }

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

@@ -4,6 +4,9 @@ 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助手表
  *
@@ -12,4 +15,5 @@ import com.pjilisense.flxai.entity.AppAiAssistantEntity;
  */
 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

@@ -5,11 +5,13 @@ 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.Map;
+import java.util.*;
 
 /**
  * AI助手表
@@ -30,5 +32,44 @@ public class AppAiAssistantServiceImpl extends CrudServiceImpl<AppAiAssistantDao
         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("createAt","createdAt");
+        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(retList!=null && retList.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

@@ -16,6 +16,7 @@
         <result property="schemaVersion" column="schema_version"/>
         <result property="createAt" column="create_at"/>
         <result property="createdAt" column="created_at"/>
+        <result property="userid" column="userid"/>
     </resultMap>
 
 

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

@@ -21,7 +21,7 @@ public class TestUtils {
     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;