|
@@ -39,25 +39,32 @@
|
|
oss.url AS oss_id,
|
|
oss.url AS oss_id,
|
|
xdm.model_name,
|
|
xdm.model_name,
|
|
xdm.description,
|
|
xdm.description,
|
|
|
|
+ xuu.id AS ugc_user_id,
|
|
xuu.ugc_nick AS ugc_user_name,
|
|
xuu.ugc_nick AS ugc_user_name,
|
|
oss2.url AS ugc_user_avatar,
|
|
oss2.url AS ugc_user_avatar,
|
|
xdm.use_count AS use_count,
|
|
xdm.use_count AS use_count,
|
|
xbuc.is_collect AS is_collect,
|
|
xbuc.is_collect AS is_collect,
|
|
xbuc.type AS type
|
|
xbuc.type AS type
|
|
- FROM xy_draw_model xdm
|
|
|
|
- LEFT JOIN xy_base_user_collect xbuc ON xdm.id = xbuc.collect_id
|
|
|
|
|
|
+ FROM xy_base_user_collect xbuc
|
|
|
|
+ LEFT JOIN xy_draw_model xdm ON xdm.id = xbuc.collect_id
|
|
LEFT JOIN sys_oss oss ON xdm.oss_id = oss.oss_id
|
|
LEFT JOIN sys_oss oss ON xdm.oss_id = oss.oss_id
|
|
AND `type` = 1
|
|
AND `type` = 1
|
|
- LEFT JOIN xy_ugc_user xuu ON xbuc.base_user_id = xuu.id
|
|
|
|
|
|
+ LEFT JOIN xy_ugc_user xuu ON xdm.ugc_id = xuu.id
|
|
LEFT JOIN sys_oss oss2 ON xuu.avatar = oss2.oss_id
|
|
LEFT JOIN sys_oss oss2 ON xuu.avatar = oss2.oss_id
|
|
WHERE xdm.id = xbuc.collect_id
|
|
WHERE xdm.id = xbuc.collect_id
|
|
AND xbuc.base_user_id = #{userId}
|
|
AND xbuc.base_user_id = #{userId}
|
|
AND xdm.del_flag = '0'
|
|
AND xdm.del_flag = '0'
|
|
- ORDER BY xbuc.create_time DESC
|
|
|
|
|
|
+ <if test="id != null">
|
|
|
|
+ AND xbuc.id < #{id}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="modelName != null">
|
|
|
|
+ AND xdm.model_name LIKE CONCAT( '%', #{modelName}, '%')
|
|
|
|
+ </if>
|
|
|
|
+ ORDER BY id DESC
|
|
LIMIT 10
|
|
LIMIT 10
|
|
</select>
|
|
</select>
|
|
|
|
|
|
- <select id="queryAppById" resultType="com.xyzc.start.domain.vo.CollectAppVo">
|
|
|
|
|
|
+ <select id="queryAppById" resultType="com.xyzc.start.domain.vo.AppCollectVo">
|
|
SELECT xbuc.id,
|
|
SELECT xbuc.id,
|
|
app.app_name,
|
|
app.app_name,
|
|
app.description AS app_desc,
|
|
app.description AS app_desc,
|
|
@@ -69,8 +76,8 @@
|
|
am.ai_model_logo_oss_id AS ai_model_logo,
|
|
am.ai_model_logo_oss_id AS ai_model_logo,
|
|
am.ai_model_name AS ai_model_name,
|
|
am.ai_model_name AS ai_model_name,
|
|
xbuc.is_collect AS is_collect
|
|
xbuc.is_collect AS is_collect
|
|
- FROM xy_base_user bu
|
|
|
|
- LEFT JOIN xy_base_user_collect xbuc ON bu.id = xbuc.base_user_id
|
|
|
|
|
|
+ FROM xy_base_user_collect xbuc
|
|
|
|
+ LEFT JOIN xy_base_user bu ON bu.id = xbuc.base_user_id
|
|
LEFT JOIN xy_app app ON app.id = xbuc.collect_id
|
|
LEFT JOIN xy_app app ON app.id = xbuc.collect_id
|
|
LEFT JOIN sys_oss oss ON oss.oss_id = app.oss_id
|
|
LEFT JOIN sys_oss oss ON oss.oss_id = app.oss_id
|
|
LEFT JOIN xy_ai_model_app xama ON app.id = xama.app_id
|
|
LEFT JOIN xy_ai_model_app xama ON app.id = xama.app_id
|
|
@@ -79,8 +86,13 @@
|
|
WHERE bu.id = #{userId} AND app.del_flag = '0'
|
|
WHERE bu.id = #{userId} AND app.del_flag = '0'
|
|
AND xbuc.is_collect = 1 AND xbuc.type = 3
|
|
AND xbuc.is_collect = 1 AND xbuc.type = 3
|
|
<if test="appId != null">
|
|
<if test="appId != null">
|
|
- and app.id > #{appId}
|
|
|
|
|
|
+ and app.id < #{appId}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="appName != null">
|
|
|
|
+ and app.app_name like concat('%',#{appName},'%')
|
|
</if>
|
|
</if>
|
|
|
|
+ ORDER BY xbuc.create_time DESC
|
|
|
|
+ LIMIT 10
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="queryDrawGraphicsById" resultType="com.xyzc.start.domain.vo.DrawGraphicsCollectVo">
|
|
<select id="queryDrawGraphicsById" resultType="com.xyzc.start.domain.vo.DrawGraphicsCollectVo">
|
|
@@ -90,36 +102,45 @@
|
|
oss.url AS oss_url,
|
|
oss.url AS oss_url,
|
|
dg.title,
|
|
dg.title,
|
|
dg.use_count,
|
|
dg.use_count,
|
|
- xdm.model_name
|
|
|
|
|
|
+ xdm.model_name,
|
|
|
|
+ xbuc.type
|
|
FROM xy_base_user_collect xbuc
|
|
FROM xy_base_user_collect xbuc
|
|
LEFT JOIN xy_draw_graphics dg ON xbuc.collect_id = dg.id
|
|
LEFT JOIN xy_draw_graphics dg ON xbuc.collect_id = dg.id
|
|
LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
|
|
LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
|
|
LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
|
|
LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
|
|
WHERE xbuc.base_user_id = #{userId}
|
|
WHERE xbuc.base_user_id = #{userId}
|
|
and xbuc.type = 2
|
|
and xbuc.type = 2
|
|
|
|
+ <if test="graphicsId != null">
|
|
|
|
+ and xbuc.collect_id > #{graphicsId}
|
|
|
|
+ </if>
|
|
|
|
+ <if test="graphicsName != null">
|
|
|
|
+ and dg.title like concat('%',#{graphicsName},'%')
|
|
|
|
+ </if>
|
|
ORDER BY xbuc.create_time DESC
|
|
ORDER BY xbuc.create_time DESC
|
|
LIMIT 10
|
|
LIMIT 10
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="queryCarefulSelectAppBy" resultType="com.xyzc.start.domain.vo.BaseUserSelectAppVo">
|
|
<select id="queryCarefulSelectAppBy" resultType="com.xyzc.start.domain.vo.BaseUserSelectAppVo">
|
|
- SELECT app.id as app_id,
|
|
|
|
- app.app_name as app_name,
|
|
|
|
- app.description as app_desc,
|
|
|
|
- oss.url as app_icon,
|
|
|
|
- oss2.url as ai_model_icon,
|
|
|
|
- am.ai_model_name as ai_model_name,
|
|
|
|
- app.use_count as use_count
|
|
|
|
- from xy_app app
|
|
|
|
- left join sys_oss oss on app.oss_id = oss.oss_id
|
|
|
|
- left join xy_ai_model_app ama on ama.app_id = app.id
|
|
|
|
- left join xy_ai_model am on ama.ai_model_id = am.id
|
|
|
|
- left join sys_oss oss2 on am.ai_model_logo_oss_id = oss2.oss_id
|
|
|
|
- where app.is_choiceness = 1
|
|
|
|
- and app.del_flag = '0'
|
|
|
|
- <if test="appId != null">
|
|
|
|
- and app.id > #{appId}
|
|
|
|
- </if>
|
|
|
|
- limit #{length}
|
|
|
|
|
|
+ SELECT
|
|
|
|
+ app.id AS app_id,
|
|
|
|
+ app.app_name AS app_name,
|
|
|
|
+ app.description AS app_desc,
|
|
|
|
+ oss.url AS app_icon,
|
|
|
|
+ app.route_path,
|
|
|
|
+ oss2.url AS ai_model_icon,
|
|
|
|
+ am.ai_model_name AS ai_model_name,
|
|
|
|
+ app.use_count AS use_count
|
|
|
|
+ FROM xy_app app
|
|
|
|
+ LEFT JOIN sys_oss oss ON app.oss_id = oss.oss_id
|
|
|
|
+ LEFT JOIN xy_ai_model_app ama ON ama.app_id = app.id
|
|
|
|
+ LEFT JOIN xy_ai_model am ON ama.ai_model_id = am.id
|
|
|
|
+ LEFT JOIN sys_oss oss2 ON am.ai_model_logo_oss_id = oss2.oss_id
|
|
|
|
+ WHERE app.is_choiceness = 1
|
|
|
|
+ AND app.del_flag = '0'
|
|
|
|
+ <if test = "appId != null" >
|
|
|
|
+ AND app.id > #{appId}
|
|
|
|
+ </if >
|
|
|
|
+ LIMIT #{length}
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="queryHistoryAppBy" resultType="com.xyzc.start.domain.vo.BaseUserCollectAppVo">
|
|
<select id="queryHistoryAppBy" resultType="com.xyzc.start.domain.vo.BaseUserCollectAppVo">
|
|
@@ -143,6 +164,7 @@
|
|
SELECT app.id as app_id,
|
|
SELECT app.id as app_id,
|
|
app.app_name as app_name,
|
|
app.app_name as app_name,
|
|
oss.url as app_icon,
|
|
oss.url as app_icon,
|
|
|
|
+ app.route_path,
|
|
buc.type AS type
|
|
buc.type AS type
|
|
from xy_base_user_collect buc
|
|
from xy_base_user_collect buc
|
|
left join xy_app app on buc.collect_id = app.id
|
|
left join xy_app app on buc.collect_id = app.id
|