add 修改提示词信息

pom.xml

@@ -105,6 +105,7 @@
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>xyzcadmin123</nacos.password>
                 <logstash.address>127.0.0.1:4560</logstash.address>
+                <jar.ip>127.0.0.1</jar.ip>
             </properties>
             <activation>
                 <!-- 默认环境 -->

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

@@ -1,7 +1,6 @@
 package com.xyzc.start.controller;
 
 import com.xyzc.common.core.utils.Result;
-import com.xyzc.start.domain.DrawAssistant;
 import com.xyzc.start.domain.query.AppQuery;
 import com.xyzc.start.domain.vo.*;
 import com.xyzc.start.service.IDiscoverService;
@@ -73,8 +72,8 @@ public class DiscoverPageController {
      * 查询具体绘画助手的提示词
      */
     @GetMapping("/drawAssistant/{assistantId}")
-    public Result<List<DrawPromptConfigVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId, String keyword, Integer length) {
-        List<DrawPromptConfigVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId, keyword, length);
+    public Result<List<DrawPromptVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId, String keyword, Integer length) {
+        List<DrawPromptVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId, keyword, length);
 
         return Result.ok(drawPromptConfigList);
     }

xyzc-start/src/main/java/com/xyzc/start/domain/DrawPromptConfig.java → xyzc-start/src/main/java/com/xyzc/start/domain/DrawPrompt.java

@@ -1,15 +1,16 @@
 package com.xyzc.start.domain;
 
-import io.github.linpeilie.annotations.AutoMapper;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
  * DrawPromptConfig
- *
- *
+ * <p>
+ * author: 杨兴卓
  */
 @Data
-public class DrawPromptConfig {
+@TableName("xy_draw_prompt")
+public class DrawPrompt {
 
     /**
      * 提示词id

xyzc-start/src/main/java/com/xyzc/start/domain/vo/DrawPromptConfigVo.java → xyzc-start/src/main/java/com/xyzc/start/domain/vo/DrawPromptVo.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @author 杨兴卓
  */
 @Data
-public class DrawPromptConfigVo {
+public class DrawPromptVo {
 
     /**
      * 提示词id

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

@@ -4,7 +4,7 @@ package com.xyzc.start.mapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.DrawAssistant;
 import com.xyzc.start.domain.vo.DrawAssistantVo;
-import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.domain.vo.DrawPromptVo;
 import com.xyzc.start.domain.vo.DrawReversePromptVo;
 
 import java.util.List;
@@ -18,7 +18,7 @@ public interface DrawAssistantMapper extends BaseMapperPlus<DrawAssistant, DrawA
      * @param promptId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword, Integer length);
+    List<DrawPromptVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword, Integer length);
 
     /**
      * 分页查询反向prompt列表

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

@@ -1,7 +1,7 @@
 package com.xyzc.start.service;
 
 import com.xyzc.start.domain.vo.DrawAssistantVo;
-import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.domain.vo.DrawPromptVo;
 
 import java.util.List;
 
@@ -19,5 +19,5 @@ public interface IDrawAssistantService {
      * @param assistantId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length);
+    List<DrawPromptVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length);
 }

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

@@ -1,7 +1,7 @@
 package com.xyzc.start.service.impl;
 
 import com.xyzc.start.domain.vo.DrawAssistantVo;
-import com.xyzc.start.domain.vo.DrawPromptConfigVo;
+import com.xyzc.start.domain.vo.DrawPromptVo;
 import com.xyzc.start.mapper.DrawAssistantMapper;
 import com.xyzc.start.service.IDrawAssistantService;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +33,7 @@ public class DrawAssistantServiceImpl implements IDrawAssistantService {
      * @return
      */
     @Override
-    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length) {
+    public List<DrawPromptVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword, Integer length) {
 
         return drawAssistantMapper.queryDrawPromptList(assistantId, promptId, keyword, length == null ? 10 : length);
 

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

@@ -5,20 +5,23 @@
 <mapper namespace="com.xyzc.start.mapper.DrawAssistantMapper">
 
 
-    <select id="queryDrawPromptList" resultType="com.xyzc.start.domain.vo.DrawPromptConfigVo">
+    <select id="queryDrawPromptList" resultType="com.xyzc.start.domain.vo.DrawPromptVo">
         select
-            xdpc.id     AS prompt_id,
-            xdpc.prompt_oss_url,
-            xdpc.prompt,
-            xdpc.prompt_en
+            xdp.id     AS prompt_id,
+            xdp.prompt_oss_url,
+            xdp.prompt_name,
+            xdp.prompt_name_en
         from xy_draw_assistant xda
-                 left join xy_draw_prompt_config xdpc on xda.id = xdpc.assistant_id
+                 left join xy_draw_prompt xdp on xda.id = xdp.assistant_id
         where xda.id = #{assistantId}
         <if test="promptId != null">
-            and xdpc.id > #{promptId}
+            and xdp.id > #{promptId}
         </if>
         <if test="keyword != null">
-            and xdpc.prompt like concat('%',#{keyword},'%')
+            and xdp.prompt_name like concat('%',#{keyword},'%')
+        </if>
+        <if test="keyword != null">
+            and xdp.prompt_name_en like concat('%',#{keyword},'%')
         </if>
         LIMIT #{length}
     </select>