feat: 获取Agent应用列表【已发布】

src/main/java/cn/com/poc/agent_application/convert/AgentApplicationInfoConvert.java

@@ -8,7 +8,9 @@ import cn.com.poc.agent_application.model.BizAgentApplicationInfoModel;
 import cn.com.poc.agent_application.entity.BizAgentApplicationInfoEntity;
 import cn.com.poc.agent_application.dto.AgentApplicationInfoDto;
 import cn.com.poc.agent_application.query.AgentApplicationInfoQueryItem;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.expose.dto.SearchAgentApplicationDto;
 import cn.hutool.core.util.ObjectUtil;
 import com.tencent.core.utils.JsonUtil;
 import org.apache.commons.lang3.ArrayUtils;
@@ -17,6 +19,17 @@ import org.apache.commons.lang3.StringUtils;
 
 public class AgentApplicationInfoConvert {
 
+    public static SearchAgentApplicationDto itemToSearchDto(PublishAgentApplicationQueryItem item) {
+        SearchAgentApplicationDto dto = new SearchAgentApplicationDto();
+        dto.setAgentId(item.getAgentId());
+        dto.setAgentTitle(item.getAgentTitle());
+        dto.setAgentDesc(item.getAgentDesc());
+        dto.setAgentAvatar(item.getAgentAvatar());
+        dto.setPublishedTime(item.getModifiedTime());
+        dto.setCreator(item.getNickName());
+        return dto;
+    }
+
     public static BizAgentApplicationInfoEntity modelToEntity(BizAgentApplicationInfoModel model) {
         BizAgentApplicationInfoEntity entity = new BizAgentApplicationInfoEntity();
         entity.setId(model.getId());
@@ -29,7 +42,7 @@ public class AgentApplicationInfoConvert {
         entity.setAgentPublishStatus(model.getAgentPublishStatus());
         entity.setPreamble(model.getPreamble());
         entity.setPublishTime(model.getPublishTime());
-        if(StringUtils.isNotBlank(model.getVariableStructure())) {
+        if (StringUtils.isNotBlank(model.getVariableStructure())) {
             entity.setVariableStructure(JsonUtils.deSerialize(model.getVariableStructure(), String[].class));
         }
         if (StringUtils.isNotBlank(model.getFeaturedQuestions())) {
@@ -190,7 +203,7 @@ public class AgentApplicationInfoConvert {
         entity.setAgentPublishStatus(infoQueryItem.getAgentPublishStatus());
         entity.setPreamble(infoQueryItem.getPreamble());
         entity.setPublishTime(infoQueryItem.getPublishTime());
-        if(StringUtils.isNotBlank(infoQueryItem.getVariableStructure())) {
+        if (StringUtils.isNotBlank(infoQueryItem.getVariableStructure())) {
             entity.setVariableStructure(JsonUtils.deSerialize(infoQueryItem.getVariableStructure(), String[].class));
         }
 

src/main/java/cn/com/poc/agent_application/query/PublishAgentApplicationQuery.sql

+select distinct
+    baap.id,
+    bmi.nick_name,
+    baap.agent_id,
+    baap.agent_avatar,
+    baap.agent_title,
+    baap.agent_desc,
+    baap.MODIFIED_TIME
+from
+     biz_agent_application_publish baap
+left join biz_member_info bmi on baap.member_id = bmi.member_id
+where baap.is_deleted = 'N'
+<< and LOCATE(:query,baap.agent_title) >>
+order by baap.MODIFIED_TIME desc
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/PublishAgentApplicationQueryCondition.java

+package cn.com.poc.agent_application.query;   
+
+import java.io.Serializable;
+
+/**
+ * Query Condition class for PulishAgentApplicationQuery
+ */
+public class PublishAgentApplicationQueryCondition implements Serializable{
+    
+    private static final long serialVersionUID = 1L;
+    
+
+    private java.lang.String query;
+    
+    public java.lang.String getQuery(){
+        return this.query;
+    }
+    
+    public void setQuery(java.lang.String query){
+        this.query = query;
+    }
+        
+}
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/PublishAgentApplicationQueryItem.java

+package cn.com.poc.agent_application.query;
+
+import cn.com.yict.framemax.data.model.BaseItemClass;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.io.Serializable;
+
+/**
+ * Query Item class for PulishAgentApplicationQuery
+ */
+@Entity
+public class PublishAgentApplicationQueryItem extends BaseItemClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     * id
+     */
+    private java.lang.Integer id;
+
+    @Column(name = "id")
+    public java.lang.Integer getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * nick_name
+     * nick_name
+     */
+    private java.lang.String nickName;
+
+    @Column(name = "nick_name")
+    public java.lang.String getNickName() {
+        return this.nickName;
+    }
+
+    public void setNickName(java.lang.String nickName) {
+        this.nickName = nickName;
+    }
+
+    /**
+     * agent_id
+     * agent_id
+     */
+    private java.lang.String agentId;
+
+    @Column(name = "agent_id")
+    public java.lang.String getAgentId() {
+        return this.agentId;
+    }
+
+    public void setAgentId(java.lang.String agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * agent_avatar
+     * agent_avatar
+     */
+    private java.lang.String agentAvatar;
+
+    @Column(name = "agent_avatar")
+    public java.lang.String getAgentAvatar() {
+        return this.agentAvatar;
+    }
+
+    public void setAgentAvatar(java.lang.String agentAvatar) {
+        this.agentAvatar = agentAvatar;
+    }
+
+    /**
+     * agent_title
+     * agent_title
+     */
+    private java.lang.String agentTitle;
+
+    @Column(name = "agent_title")
+    public java.lang.String getAgentTitle() {
+        return this.agentTitle;
+    }
+
+    public void setAgentTitle(java.lang.String agentTitle) {
+        this.agentTitle = agentTitle;
+    }
+
+    /**
+     * agent_desc
+     * agent_desc
+     */
+    private java.lang.String agentDesc;
+
+    @Column(name = "agent_desc")
+    public java.lang.String getAgentDesc() {
+        return this.agentDesc;
+    }
+
+    public void setAgentDesc(java.lang.String agentDesc) {
+        this.agentDesc = agentDesc;
+    }
+
+    /**
+     * MODIFIED_TIME
+     * MODIFIED_TIME
+     */
+    private java.util.Date modifiedTime;
+
+    @Column(name = "MODIFIED_TIME")
+    public java.util.Date getModifiedTime() {
+        return this.modifiedTime;
+    }
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+} 
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/service/BizAgentApplicationPublishService.java

 package cn.com.poc.agent_application.service;
 
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryCondition;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.yict.framemax.data.model.PagingInfo;
-import java.util.Collection;
+
 import java.util.List;
 
 public interface BizAgentApplicationPublishService extends BaseService {
@@ -12,8 +14,8 @@ public interface BizAgentApplicationPublishService extends BaseService {
 
     BizAgentApplicationPublishEntity getByAgentId(String agentId) throws Exception;
 
-    List<BizAgentApplicationPublishEntity> findByExample(BizAgentApplicationPublishEntity example,PagingInfo pagingInfo) throws Exception;
-    
+    List<BizAgentApplicationPublishEntity> findByExample(BizAgentApplicationPublishEntity example, PagingInfo pagingInfo) throws Exception;
+
     BizAgentApplicationPublishEntity save(BizAgentApplicationPublishEntity entity) throws Exception;
 
     BizAgentApplicationPublishEntity update(BizAgentApplicationPublishEntity entity) throws Exception;
@@ -21,5 +23,6 @@ public interface BizAgentApplicationPublishService extends BaseService {
     void deletedById(java.lang.Integer id) throws Exception;
 
     void deleteByAgentId(String agentId) throws Exception;
-    
+
+    List<PublishAgentApplicationQueryItem> query(PublishAgentApplicationQueryCondition condition, PagingInfo pagingInfo) throws Exception;
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationPublishServiceImpl.java

 package cn.com.poc.agent_application.service.impl;
 
 import cn.com.poc.agent_application.constant.AgentApplicationConstants;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryCondition;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.com.yict.framemax.core.exception.BusinessException;
@@ -120,6 +122,11 @@ public class BizAgentApplicationPublishServiceImpl extends BaseServiceImpl
         }
     }
 
+    @Override
+    public List<PublishAgentApplicationQueryItem> query(PublishAgentApplicationQueryCondition condition, PagingInfo pagingInfo) throws Exception {
+        return this.sqlDao.query(condition, PublishAgentApplicationQueryItem.class, pagingInfo);
+    }
+
     /**
      * 参数验证和转换 Entity To Model
      *

src/main/java/cn/com/poc/expose/dto/SearchAgentApplicationDto.java

+package cn.com.poc.expose.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SearchAgentApplicationDto implements Serializable {
+
+    /**
+     * 应用id
+     */
+    private String agentId;
+
+    /**
+     * 应用名称
+     */
+    private String agentTitle;
+
+    /**
+     * 应用描述
+     */
+    private String agentDesc;
+
+    /**
+     * 应用头像
+     */
+    private String agentAvatar;
+
+    /**
+     *  发布时间
+     */
+    private Date publishedTime;
+
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentTitle() {
+        return agentTitle;
+    }
+
+    public void setAgentTitle(String agentTitle) {
+        this.agentTitle = agentTitle;
+    }
+
+    public String getAgentDesc() {
+        return agentDesc;
+    }
+
+    public void setAgentDesc(String agentDesc) {
+        this.agentDesc = agentDesc;
+    }
+
+    public String getAgentAvatar() {
+        return agentAvatar;
+    }
+
+    public void setAgentAvatar(String agentAvatar) {
+        this.agentAvatar = agentAvatar;
+    }
+
+    public Date getPublishedTime() {
+        return publishedTime;
+    }
+
+    public void setPublishedTime(Date publishedTime) {
+        this.publishedTime = publishedTime;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+}

src/main/java/cn/com/poc/expose/rest/AgentApplicationRest.java

 package cn.com.poc.expose.rest;
 
 import cn.com.poc.agent_application.dto.AgentApplicationCreateContinueQuesDto;
+import cn.com.poc.agent_application.dto.AgentApplicationInfoDto;
 import cn.com.poc.agent_application.dto.AgentApplicationInfoSearchDto;
-import cn.com.poc.agent_application.dto.BizAgentApplicationDialoguesRecordDto;
 import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto;
 import cn.com.poc.expose.dto.AgentApplicationDto;
 import cn.com.poc.expose.dto.DialoguesContextDto;
+import cn.com.poc.expose.dto.SearchAgentApplicationDto;
 import cn.com.poc.expose.dto.UserDialoguesDto;
 import cn.com.yict.framemax.core.rest.BaseRest;
+import cn.com.yict.framemax.data.model.PagingInfo;
 import cn.com.yict.framemax.web.permission.Access;
 import cn.com.yict.framemax.web.permission.Permission;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +24,7 @@ public interface AgentApplicationRest extends BaseRest {
     /**
      * 创建对话
      */
-    String createDialogues(@RequestParam String agentId) throws Exception;
+    String createDialogues(@RequestParam String agentId) ;
 
     /**
      * 调用 已发布Agent应用
@@ -30,12 +32,13 @@ public interface AgentApplicationRest extends BaseRest {
     void callAgentApplication(@RequestBody AgentApplicationDto dto, HttpServletResponse httpServletResponse) throws Exception;
 
     /**
-     * 获取 已发布Agent应用
+     * 获取 已发布Agent应用列表
      */
-    List<BizAgentApplicationPublishDto> getAgentApplication(@RequestBody AgentApplicationInfoSearchDto dto, HttpServletResponse httpServletResponse) throws Exception;
+    @Permission(value = Access.Anonymous)
+    List<SearchAgentApplicationDto> agentApplicationList(@RequestBody AgentApplicationInfoSearchDto dto, PagingInfo pagingInfo) throws Exception;
 
     /**
-     * 获取应用详情
+     * 获取 已发布应用详情
      */
     @Permission(value = Access.Anonymous)
     BizAgentApplicationPublishDto getInfo(@RequestParam String agentId) throws Exception;

src/main/java/cn/com/poc/expose/rest/impl/AgentApplicationRestImpl.java

@@ -10,19 +10,24 @@ import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto;
 import cn.com.poc.agent_application.entity.BizAgentApplicationDialoguesRecordEntity;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.poc.agent_application.query.MemberDialoguesQueryItem;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryCondition;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
 import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.Assert;
 import cn.com.poc.common.utils.BlContext;
+import cn.com.poc.common.utils.StringUtils;
 import cn.com.poc.common.utils.UUIDTool;
 import cn.com.poc.expose.aggregate.AgentApplicationService;
 import cn.com.poc.expose.dto.AgentApplicationDto;
 import cn.com.poc.expose.dto.DialoguesContextDto;
+import cn.com.poc.expose.dto.SearchAgentApplicationDto;
 import cn.com.poc.expose.dto.UserDialoguesDto;
 import cn.com.poc.expose.rest.AgentApplicationRest;
 import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
 import cn.com.yict.framemax.core.exception.BusinessException;
+import cn.com.yict.framemax.data.model.PagingInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
@@ -48,7 +53,7 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
     private BizAgentApplicationDialoguesRecordService bizAgentApplicationDialoguesRecordService;
 
     @Override
-    public String createDialogues(String agentId) throws Exception {
+    public String createDialogues(String agentId) {
         return "DIA_" + UUIDTool.getUUID();
     }
 
@@ -70,8 +75,17 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
     }
 
     @Override
-    public List<BizAgentApplicationPublishDto> getAgentApplication(AgentApplicationInfoSearchDto dto, HttpServletResponse httpServletResponse) throws Exception {
-        return null;
+    public List<SearchAgentApplicationDto> agentApplicationList(AgentApplicationInfoSearchDto dto, PagingInfo pagingInfo) throws Exception {
+        PublishAgentApplicationQueryCondition condition = new PublishAgentApplicationQueryCondition();
+        if (StringUtils.isNotBlank(dto.getQuery())) {
+            condition.setQuery(dto.getQuery());
+        }
+        List<SearchAgentApplicationDto> result = new ArrayList<>();
+        List<PublishAgentApplicationQueryItem> items = bizAgentApplicationPublishService.query(condition, pagingInfo);
+        if (CollectionUtils.isNotEmpty(items)) {
+            result = items.stream().map(AgentApplicationInfoConvert::itemToSearchDto).collect(Collectors.toList());
+        }
+        return result;
     }
 
     @Override