add 代理商邮箱信息，小易的用户协议，ai模型的备案信息

xyzc-start/src/main/java/com/xyzc/start/controller/DiscoverPageController.java

@@ -8,6 +8,7 @@ import com.xyzc.start.service.IDiscoverService;
 import com.xyzc.start.service.IDrawAssistantService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.apache.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -50,6 +51,26 @@ public class DiscoverPageController {
     }
 
     /**
+     * 查询代理商邮箱
+     */
+    @GetMapping("/merMail")
+    public Result<String> agentMail(HttpRequest request) {
+        String copyRight = discoverService.queryMail(request);
+
+        return Result.ok(copyRight);
+    }
+
+    /**
+     * 分页查询大模型备案信息
+     */
+    @GetMapping("/filings")
+    public Result<List<AiModelVo>> drawModelList(@Valid AppQuery appQuery) {
+        List<AiModelVo> aiModelVoList = discoverService.queryFilingsInfo(appQuery);
+
+        return Result.ok(aiModelVoList);
+    }
+
+    /**
      * 分页查询反向提示词
      */
     @GetMapping("/reversePrompt")

xyzc-start/src/main/java/com/xyzc/start/controller/UserAuthController.java

@@ -108,6 +108,7 @@ public class UserAuthController {
     @PostMapping("logout")
     public Result<String> logout() {
 //        userAuthService.logout();
+
         return Result.ok("退出成功");
     }
 
@@ -117,7 +118,7 @@ public class UserAuthController {
      */
     @GetMapping("agreement")
     public Result<XyConfigVo> legal() {
-        XyConfigVo lawVo = xyConfigService.getPrivacyPolicy();
+        XyConfigVo lawVo = xyConfigService.getUserAgreement();
 
         return Result.ok(lawVo);
     }
@@ -127,7 +128,7 @@ public class UserAuthController {
      */
     @GetMapping("privacy")
     public Result<XyConfigVo> privacy() {
-        XyConfigVo lawVo = xyConfigService.getUserAgreement();
+        XyConfigVo lawVo = xyConfigService.getPrivacyPolicy();
 
         return Result.ok(lawVo);
     }

xyzc-start/src/main/java/com/xyzc/start/domain/AiModel.java

@@ -111,5 +111,8 @@ public class AiModel extends BaseEntity {
     @TableLogic
     private String delFlag;
 
-
+    /**
+     * 备案信息
+     */
+    private String filings;
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/AiModelVo.java

@@ -1,17 +1,22 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.xyzc.start.domain.AiModel;
+import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * @description: TODO
- * @author: 墨凡
- * @date: 2024/7/21 20:14
- * @version: 1.0
+ * ai模型视图
+ * <p>
+ * author: 杨兴卓
+ * date 2024/7/21 20:14
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@AutoMapper(target = AiModel.class)
 public class AiModelVo {
 
     /**
@@ -113,4 +118,10 @@ public class AiModelVo {
      * 创建时间
      */
     private Date createTime;
+
+    /**
+     * 模型备案信息
+     */
+    private String filings;
+
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/XyConfigVo.java

@@ -26,7 +26,6 @@ public class XyConfigVo implements Serializable {
     /**
      * 小易平台配置id
      */
-
     private Integer id;
 
     /**

xyzc-start/src/main/java/com/xyzc/start/mapper/AiModelMapper.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.AiModel;
+import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.vo.AiModelLawVo;
 import com.xyzc.start.domain.vo.AiModelVo;
 import com.xyzc.start.domain.vo.FuelPackageVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,9 +21,18 @@ public interface AiModelMapper extends BaseMapperPlus<AiModel, AiModelVo> {
 
     /**
      * 根据燃料id分页查询燃料包规则列表
+     *
      * @param modelId 模型id
      * @return
      */
     List<AiModelLawVo> queryModelLawList(Long modelId);
 
+    /**
+     * 分页查询ai模型的备案信息
+     *
+     * @param appQuery
+     * @return
+     */
+    List<AiModelVo> queryFilingsInfo(@Param("appQuery") AppQuery appQuery);
+
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/MerchantMapper.java

@@ -2,8 +2,11 @@ package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.Merchant;
 import com.xyzc.start.domain.vo.MerchantCancatVo;
+import com.xyzc.start.domain.vo.MerchantVo;
+import org.apache.http.HttpRequest;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -15,7 +18,7 @@ import java.util.List;
  * @date 2024-07-02
  */
 @Repository
-public interface MerchantMapper extends BaseMapper<Merchant> {
+public interface MerchantMapper extends BaseMapperPlus<Merchant, MerchantVo> {
 
     /**
      * 查询代理商集合
@@ -27,4 +30,14 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
     }
 
     MerchantCancatVo queryMerchantCancatById(Long userId);
+
+    /**
+     * 查询代理商的邮箱
+     *
+     * @param agentId
+     * @return
+     */
+    default MerchantVo queryMail(Long agentId){
+        return this.selectVoById(agentId);
+    }
 }

xyzc-start/src/main/java/com/xyzc/start/service/IDiscoverService.java

@@ -3,6 +3,7 @@ package com.xyzc.start.service;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
+import org.apache.http.HttpRequest;
 
 import java.util.List;
 
@@ -46,4 +47,19 @@ public interface IDiscoverService {
      * @return
      */
     List<DrawReversePromptVo> queryReversePromptList(Long reversePromptId, String keyword, Integer length);
+
+    /**
+     * 查询代理商邮箱
+     *
+     * @param request
+     * @return
+     */
+    String queryMail(HttpRequest request);
+
+
+    /**
+     * 分页查询大模型备案信息
+     */
+    List<AiModelVo> queryFilingsInfo(AppQuery appQuery);
+
 }

xyzc-start/src/main/java/com/xyzc/start/service/impl/DiscoverServiceImpl.java

@@ -4,12 +4,10 @@ import com.xyzc.common.web.security.user.SecurityUser;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.query.DiscoveryAppQuery;
 import com.xyzc.start.domain.vo.*;
-import com.xyzc.start.mapper.AppMapper;
-import com.xyzc.start.mapper.DrawAssistantMapper;
-import com.xyzc.start.mapper.DrawGraphicsMapper;
-import com.xyzc.start.mapper.DrawModelMapper;
+import com.xyzc.start.mapper.*;
 import com.xyzc.start.service.IDiscoverService;
 import lombok.RequiredArgsConstructor;
+import org.apache.http.HttpRequest;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -29,6 +27,8 @@ public class DiscoverServiceImpl implements IDiscoverService {
 
     private final AppMapper appMapper;
     private final DrawAssistantMapper drawAssistantMapper;
+    private final MerchantMapper merchantMapper;
+    private final AiModelMapper aiModelMapper;
 
     /**
      * 根据id返回分页绘画
@@ -77,4 +77,29 @@ public class DiscoverServiceImpl implements IDiscoverService {
 
         return drawAssistantMapper.queryDrawReservePrompt(reversePromptId, keyword, length == null ? 10 : length);
     }
+
+    /**
+     * 查询商家邮箱信息
+     *
+     * @param request
+     * @return
+     */
+    @Override
+    public String queryMail(HttpRequest request) {
+        MerchantVo merchantVo = merchantMapper.queryMail(1810310843224322049L);
+
+        return merchantVo.getContactsEmail();
+    }
+
+    /**
+     * 分页查询大模型备案信息
+     *
+     * @param appQuery
+     * @return
+     */
+    @Override
+    public List<AiModelVo> queryFilingsInfo(AppQuery appQuery) {
+
+        return aiModelMapper.queryFilingsInfo(appQuery);
+    }
 }

xyzc-start/src/main/resources/mapper/WebStart/AiModelMapper.xml

@@ -21,5 +21,18 @@
     </select>
 
 
+    <select id="queryFilingsInfo" resultType="com.xyzc.start.domain.vo.AiModelVo">
+        select id,
+               ai_model_name,
+               filings
+        from xy_ai_model
+        where del_flag = 0
+        <if test="appQuery.appId != null">
+            AND id > #{appQuery.appId}
+        </if>
+        LIMIT #{appQuery.length}
+
+    </select>
+
 
 </mapper>