update 增加绘画模型的模糊查询

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

@@ -30,8 +30,8 @@ public class DiscoverPageController {
      * 绘画广场
      */
     @GetMapping("/drawSquare")
-    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId) {
-        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId);
+    public Result<List<DrawGraphicsSquareVo>> drawSquare(Long graphicsId, String keyword) {
+        List<DrawGraphicsSquareVo> drawGraphicsList = discoverService.queryGraphics(graphicsId, keyword);
 
         return Result.ok(drawGraphicsList);
     }
@@ -41,8 +41,8 @@ public class DiscoverPageController {
      * 绘画模型
      */
     @GetMapping("/drawModel")
-    public Result<List<DrawModelCollectVo>> drawModel(Long drawModelId) {
-        List<DrawModelCollectVo> drawModelList = discoverService.queryDrawModelList(drawModelId);
+    public Result<List<DrawModelCollectVo>> drawModel(Long drawModelId, String keyword) {
+        List<DrawModelCollectVo> drawModelList = discoverService.queryDrawModelList(drawModelId, keyword);
 
         return Result.ok(drawModelList);
     }
@@ -61,8 +61,8 @@ public class DiscoverPageController {
      * 查询具体绘画助手的提示词
      */
     @GetMapping("/drawAssistant/{assistantId}")
-    public Result<List<DrawPromptConfigVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId) {
-        List<DrawPromptConfigVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId);
+    public Result<List<DrawPromptConfigVo>> drawAssistant(@PathVariable Integer assistantId, Long promptId, String keyword) {
+        List<DrawPromptConfigVo> drawPromptConfigList = drawAssistantService.queryDrawPromptConfigList(assistantId, promptId, keyword);
 
         return Result.ok(drawPromptConfigList);
     }

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

@@ -16,5 +16,5 @@ public interface DrawAssistantMapper extends BaseMapperPlus<DrawAssistant, DrawA
      * @param promptId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptList(Integer assistantId, Long promptId);
+    List<DrawPromptConfigVo> queryDrawPromptList(Integer assistantId, Long promptId, String keyword);
 }

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

@@ -17,7 +17,7 @@ public interface DrawGraphicsMapper extends BaseMapperPlus<DrawGraphics, DrawGra
      * @param graphicsId
      * @return
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId);
+    List<DrawGraphicsSquareVo> queryGraphics(Long userId, Long graphicsId, String keyword);
 
 
 }

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

@@ -24,7 +24,7 @@ public interface DrawModelMapper extends BaseMapperPlus<DrawModel, DrawModelVo>
      * @param drawModelId
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId);
+    List<DrawModelCollectVo> queryDrawModelList(Long userId ,Long drawModelId, String keyword);
 
 
 }

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

@@ -20,7 +20,7 @@ public interface IDiscoverService {
      * @param graphicsId Long
      * @return List<DrawGraphicsVo>
      */
-    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId);
+    List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword);
 
     /**
      * 分页查询绘画模型
@@ -28,7 +28,7 @@ public interface IDiscoverService {
      * @param drawModelId
      * @return
      */
-    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId);
+    List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword);
 
 
 }

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

@@ -19,5 +19,5 @@ public interface IDrawAssistantService {
      * @param assistantId
      * @return
      */
-    List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId);
+    List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword);
 }

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

@@ -33,9 +33,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId) {
+    public List<DrawGraphicsSquareVo> queryGraphics(Long graphicsId, String keyword) {
 
-        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId);
+        return drawGraphicsMapper.queryGraphics(SecurityUser.getUserId(), graphicsId, keyword);
     }
 
     /**
@@ -45,9 +45,9 @@ public class DiscoverServiceImpl implements IDiscoverService {
      * @return
      */
     @Override
-    public List<DrawModelCollectVo> queryDrawModelList(Long drawModelId) {
+    public List<DrawModelCollectVo> queryDrawModelList(Long drawModelId, String keyword) {
 
-        return drawModelMapper.queryDrawModelList(drawModelId);
+        return drawModelMapper.queryDrawModelList(SecurityUser.getUserId(), drawModelId, keyword);
     }
 
 

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

@@ -33,9 +33,9 @@ public class DrawAssistantServiceImpl implements IDrawAssistantService {
      * @return
      */
     @Override
-    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId) {
+    public List<DrawPromptConfigVo> queryDrawPromptConfigList(Integer assistantId, Long promptId, String keyword) {
 
-        return drawAssistantMapper.queryDrawPromptList(assistantId, promptId);
+        return drawAssistantMapper.queryDrawPromptList(assistantId, promptId, keyword);
 
     }
 }

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

@@ -17,6 +17,9 @@
         <if test="promptId != null">
             and xdpc.id > #{promptId}
         </if>
+        <if test="keyword != null">
+            and xdpc.prompt like concat('%',#{keyword},'%')
+        </if>
     </select>
 
 

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

@@ -21,6 +21,9 @@
         <if test="graphicsId != null">
              AND dg.id &lt; #{graphicsId}
         </if>
+        <if test="keyword != null">
+            AND dg.title LIKE CONCAT('%',#{keyword},'%')
+        </if>
         ORDER BY dg.id DESC
         LIMIT 20
     </select>

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

@@ -21,6 +21,9 @@
             and xbuc.base_user_id = #{userId}
             and xbuc.type = 1
         where xdm.del_flag = '0'
+        <if test="keyword != null">
+            and xdm.model_name like concat('%',#{keyword},'%')
+        </if>
     </select>