Skip to content

C
cust-api
Commit 1e2e8592 authored by liwei's avatar liwei
Browse files
Options

修改了多余图片传参的问题

parent 77c00812
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 90 deletions
src/main/java/org/rcisoft/app/appNotice/controller/AppNoticeController.java
View file @ 1e2e8592
......@@ -54,7 +54,7 @@ public class AppNoticeController extends CyPaginationController<CmsNotice> {
@Operation(summary = "分页查询公告集合", description = "分页查询公告集合")
@GetMapping(value = "/open/cmsNotice/queryCmsNoticeByPagination")
public CyGridModel listByPagination(CmsNotice cmsNotice) {
cmsNoticeServiceImpl.findAllByPagination(getPaginationUtility(), cmsNotice);
cmsNoticeServiceImpl.findAllByPagination(getPaginationUtility(), cmsNotice,"app");
return getGridModelResponse();
}
......
src/main/java/org/rcisoft/business/cmsNotice/controller/CmsNoticeController.java
View file @ 1e2e8592
......@@ -107,7 +107,7 @@ public class CmsNoticeController extends CyPaginationController<CmsNotice> {
@Operation(summary = "分页查询公告集合", description = "分页查询公告集合")
@GetMapping(value = "/queryCmsNoticeByPagination")
public CyGridModel listByPagination(CmsNotice cmsNotice) {
cmsNoticeServiceImpl.findAllByPagination(getPaginationUtility(), cmsNotice);
cmsNoticeServiceImpl.findAllByPagination(getPaginationUtility(), cmsNotice,"web");
return getGridModelResponse();
}
......
src/main/java/org/rcisoft/business/cmsNotice/dao/CmsNoticeRepository.java
View file @ 1e2e8592
......@@ -19,10 +19,14 @@ public interface CmsNoticeRepository extends CyBaseMapper<CmsNotice> {
List<CmsNotice> queryCmsNotice(@Param("entity") CmsNotice cmsNotice);
/**
* 分页查询 cmsActivity
*
* web端-分页查询 cmsActivity
*/
IPage<CmsNotice> queryCmsNoticePaged(CyPageInfo cyPageInfo, @Param("entity") CmsNotice cmsNotice);
/**
* app端-分页查询 cmsActivity
*/
IPage<CmsNotice> appQueryCmsNoticePaged(CyPageInfo<CmsNotice> paginationUtility, CmsNotice cmsNotice);
//根据id逻辑删除
int deleteCmsNotice(@Param("businessId")Integer businessId);
//修改状态
......
src/main/java/org/rcisoft/business/cmsNotice/service/CmsNoticeService.java
View file @ 1e2e8592
......@@ -46,7 +46,7 @@ public interface CmsNoticeService {
* @return
*/
IPage<CmsNotice> findAllByPagination(CyPageInfo<CmsNotice> paginationUtility,
CmsNotice cmsNotice);
CmsNotice cmsNotice,String type);
/**
......
src/main/java/org/rcisoft/business/cmsNotice/service/impl/CmsNoticeServiceImpl.java
View file @ 1e2e8592
......@@ -113,10 +113,14 @@ public class CmsNoticeServiceImpl extends ServiceImpl<CmsNoticeRepository, CmsNo
*/
@Override
public IPage<CmsNotice> findAllByPagination(CyPageInfo<CmsNotice> paginationUtility,
CmsNotice cmsNotice) {
IPage<CmsNotice> cmsNoticeIPage = baseMapper.queryCmsNoticePaged(paginationUtility, cmsNotice);
CmsNotice cmsNotice,String type) {
IPage<CmsNotice> cmsNoticeIPage;
if (type.equals("app")){
cmsNoticeIPage = baseMapper.appQueryCmsNoticePaged(paginationUtility, cmsNotice);
} else {
cmsNoticeIPage = baseMapper.queryCmsNoticePaged(paginationUtility, cmsNotice);
}
return cmsNoticeIPage;
}
/**
......
src/main/java/org/rcisoft/business/memLeaveMessage/entity/MemLeaveMessage.java
View file @ 1e2e8592
......@@ -142,5 +142,11 @@ public class MemLeaveMessage extends CyIdIncreNotDataEntity<MemLeaveMessage> {
*/
@TableField(exist = false)
private Integer noReadCount;
/***
* 会员头像路径
*/
@TableField(exist = false)
private String avatarUrl;
}
src/main/java/org/rcisoft/business/opmBlacklist/entity/OpmBlackList.java
View file @ 1e2e8592
......@@ -78,6 +78,13 @@ public class OpmBlackList extends CyIdIncreNotDataEntity<OpmBlackList> {
@TableField(exist = false)
private Integer avatar;
/**
* 头像URL
*/
@TableField(exist = false)
private String avatarUrl;
/**
* 会员昵称
*/
......
src/main/java/org/rcisoft/business/opmBlacklist/service/impl/OpmBlackListServiceImpl.java
View file @ 1e2e8592
......@@ -63,8 +63,9 @@ public class OpmBlackListServiceImpl extends ServiceImpl<OpmBlackListRepository,
Integer targetId = opmBlackList.getTargetId().intValue();
MemLeaveMessage userTalk = memLeaveMessageRepository.queryUserTalk(userId, targetId);
if (userTalk.getBlackUser() != 0){
//对方也将自己拉黑了 则删除该条对话
memLeaveMessageRepository.deleteTalkById(userTalk);
//对方也将自己拉黑了 则修改该条对话状态为-1
userTalk.setBlackUser(-1);
memLeaveMessageRepository.updateTalkBlack(userTalk);
} else {
//对方没将自己拉黑
userTalk.setBlackUser(userId);
......@@ -92,11 +93,16 @@ public class OpmBlackListServiceImpl extends ServiceImpl<OpmBlackListRepository,
int line = baseMapper.realDelete(opmBlackList);
//修改对话表 拉黑状态
MemLeaveMessage userTalk = memLeaveMessageRepository.queryUserTalk(opmBlackList.getUserId().intValue(), opmBlackList.getTargetId().intValue());
if (userTalk != null) {
if (userTalk != null && userTalk.getBlackUser() == opmBlackList.getUserId().intValue()) {
//当前登录人拉黑了对方 修改对话状态为互相都没拉黑的情况
userTalk.setBlackUser(0);
memLeaveMessageRepository.updateTalkBlack(userTalk);
return new CyPersistModel(line);
} else if (userTalk != null && userTalk.getBlackUser() == -1){
//对方也把自己拉黑了，双方都拉黑的情况
userTalk.setBlackUser(opmBlackList.getTargetId().intValue());
memLeaveMessageRepository.updateTalkBlack(userTalk);
return new CyPersistModel(line);
}
return new CyPersistModel(1);
}
......
src/main/resources/mapper/business/cmsActivity.mapper/CmsActivityMapper.xml
View file @ 1e2e8592
......@@ -186,24 +186,18 @@
<select id="appQueryCmsActivityPaged" resultMap="BaseResultMap">
SELECT
ca.business_id,
ca.is_top,
ca.is_recommended,
ca.weight,
ca.publish_date,
ca.create_by,
ca.create_date,
ca.title,
ca.picture_id,
ca.application_fee,
ca.publish_status,
ca.is_application,
ca.start_time,
ca.end_time,
ca.summary,
oi.url
ca.summary
FROM
cms_activity ca
LEFT JOIN oss_info oi ON ca.picture_id = oi.business_id
WHERE 1=1
and ca.del_flag = '0'
and ca.flag = '1'
......@@ -223,10 +217,8 @@
where business_id = #{entity.businessId}
</update>
<select id="selectById" resultMap="BaseResultMap" parameterType="java.lang.Integer">
select ca.*,
oi.url
select ca.*
from cms_activity ca
left join oss_info oi on oi.business_id = ca.picture_id
where ca.business_id = #{businessId}
</select>
<select id="checkWeight" resultMap="BaseResultMap" parameterType="java.lang.Integer">
......
src/main/resources/mapper/business/cmsNotice.mapper/CmsNoticeMapper.xml
View file @ 1e2e8592
......@@ -107,6 +107,19 @@
</if>
ORDER BY cn.publish_date DESC
</select>
<select id="appQueryCmsNoticePaged" resultMap="BaseResultMap">
SELECT cn.business_id,
cn.publish_date,
cn.create_by,
cn.create_date,
cn.title,
cn.summary
FROM cms_notice cn
where 1=1
and cn.del_flag='0'
and cn.flag = '1'
ORDER BY cn.publish_date DESC
</select>
<update id="deleteCmsNotice" parameterType="java.lang.Integer">
update cms_notice
set del_flag = '1'
......
src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml
View file @ 1e2e8592
......@@ -356,9 +356,8 @@
m.mem_native_city,m.mem_introduce,m.mem_hobby,m.mem_future_plan,m.mem_half_desire,m.mem_marriage,m.mem_marriage_remarks,
m.mem_mbti,m.mem_wx_code,m.mem_real_authen,m.mem_real_authen_date,m.mem_level,m.mem_level_begin_date,m.mem_level_end_date,
m.mem_nick_name,m.mem_code_level,m.flag,m.del_flag,m.create_by,m.create_date,m.update_by,m.update_date,m.remarks,m.mem_nation,m.wx_openid,m.avatar,
oi.url as avatarUrl,m.sort,m.is_recommended,m.avatar_open,m.mem_picture_id,m.mem_liked_count,m.mem_followed_count
m.sort,m.is_recommended,m.avatar_open,m.mem_picture_id,m.mem_liked_count,m.mem_followed_count
from mem_info m
left join oss_info oi on oi.business_id = m.avatar
where 1=1
and m.del_flag = '0'
and m.user_id != 1
......@@ -836,27 +835,28 @@
m.mem_native_city,m.mem_introduce,m.mem_hobby,m.mem_future_plan,m.mem_half_desire,m.mem_marriage,m.mem_marriage_remarks,
m.mem_mbti,m.mem_wx_code,m.mem_real_authen,m.mem_real_authen_date,m.mem_education_authen,m.mem_education_authen_date,m.mem_education_picture_id,m.mem_level,m.mem_level_begin_date,m.mem_level_end_date,
m.mem_code_level,m.flag,m.del_flag,m.create_by,m.create_date,m.update_by,m.update_date,m.remarks,m.mem_nation,m.wx_openid,m.avatar,
oi.url AS avatarUrl,m.sort,m.is_recommended,m.avatar_open,
m.sort,m.is_recommended,m.avatar_open,
m.mem_picture_id,m.mem_education_picture_id,su.wx_nick_name,
IFNULL(m.mem_nick_name, su.wx_nick_name) AS mem_nick_name,
GROUP_CONCAT( DISTINCT pic_urls.url ORDER BY pic_urls.business_id DESC SEPARATOR ',' ) AS pictureUrls,
oss.url AS educationPictureUrl,m.gold_coins_count
IFNULL(m.mem_nick_name, su.wx_nick_name) AS mem_nick_name,m.gold_coins_count
# oi.url AS avatarUrl,
# GROUP_CONCAT( DISTINCT pic_urls.url ORDER BY pic_urls.business_id DESC SEPARATOR ',' ) AS pictureUrls,
# oss.url AS educationPictureUrl
from mem_info m
LEFT JOIN oss_info oi on oi.business_id = m.avatar
LEFT JOIN (
SELECT
mem_info.business_id,
CAST( JSON_UNQUOTE( JSON_EXTRACT( mem_picture_id, CONCAT( '$.id[', jt_ids.idx - 1, ']' ))) AS UNSIGNED ) AS mem_picture_id
FROM
mem_info,
JSON_TABLE (
JSON_EXTRACT( mem_info.mem_picture_id, '$.id' ),
'$[*]' COLUMNS ( idx FOR ORDINALITY )) AS jt_ids
WHERE
mem_info.del_flag = '0'
) AS pic_ids ON m.business_id = pic_ids.business_id
LEFT JOIN oss_info pic_urls ON pic_ids.mem_picture_id = pic_urls.business_id
LEFT JOIN oss_info oss ON m.mem_education_picture_id = oss.business_id
# LEFT JOIN oss_info oi on oi.business_id = m.avatar
# LEFT JOIN (
# SELECT
# mem_info.business_id,
# CAST( JSON_UNQUOTE( JSON_EXTRACT( mem_picture_id, CONCAT( '$.id[', jt_ids.idx - 1, ']' ))) AS UNSIGNED ) AS mem_picture_id
# FROM
# mem_info,
# JSON_TABLE (
# JSON_EXTRACT( mem_info.mem_picture_id, '$.id' ),
# '$[*]' COLUMNS ( idx FOR ORDINALITY )) AS jt_ids
# WHERE
# mem_info.del_flag = '0'
# ) AS pic_ids ON m.business_id = pic_ids.business_id
# LEFT JOIN oss_info pic_urls ON pic_ids.mem_picture_id = pic_urls.business_id
# LEFT JOIN oss_info oss ON m.mem_education_picture_id = oss.business_id
LEFT JOIN sys_user su ON su.business_id = m.user_id
where m.user_id = #{userId}
</select>
......
src/main/resources/mapper/business/memLeaveMessage/mapper/MemLeaveMessageMapper.xml
View file @ 1e2e8592
......@@ -30,6 +30,7 @@
WHERE mut.create_by = #{entity.createBy}
and mut.del_user != #{entity.createBy}
and mut.black_user != #{entity.createBy}
and mut.black_user != -1
UNION ALL(
SELECT
mut.business_id,
......@@ -44,6 +45,7 @@
WHERE mut.target_id = #{entity.createBy}
and mut.del_user != #{entity.createBy}
and mut.black_user != #{entity.createBy}
and mut.black_user != -1
)
ORDER BY create_date DESC
</select>
......
src/main/resources/mapper/business/opmArticle/mapper/OpmArticleMapper.xml
View file @ 1e2e8592
......@@ -212,26 +212,26 @@
mi.avatar AS avatarId,
CASE
WHEN oal.business_id IS NOT NULL THEN 1 ELSE 0
END AS isLike,
oi.url AS memAvatar,
GROUP_CONCAT(DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',') AS url
END AS isLike
# oi.url AS memAvatar,
# GROUP_CONCAT(DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',') AS url
FROM
opm_article opa
LEFT JOIN opm_topic opt ON opa.topic_id = opt.business_id
LEFT JOIN mem_info mi ON opa.create_by = mi.user_id
LEFT JOIN oss_info oi ON mi.avatar = oi.business_id
# LEFT JOIN oss_info oi ON mi.avatar = oi.business_id
LEFT JOIN opm_article_like oal on oal.article_id = opa.business_id and oal.user_id = #{entity.loginUserId}
LEFT JOIN (
SELECT
opm_article.business_id,
CAST(JSON_UNQUOTE(JSON_EXTRACT(picture_id, CONCAT('$.id[', jt_ids.idx - 1, ']'))) AS UNSIGNED) AS picture_id
FROM
opm_article,
JSON_TABLE(JSON_EXTRACT(opm_article.picture_id, '$.id'), '$[*]' COLUMNS (idx FOR ORDINALITY)) AS jt_ids
WHERE
opm_article.del_flag = '0'
) AS pic_ids ON opa.business_id = pic_ids.business_id
LEFT JOIN oss_info pic_urls ON pic_ids.picture_id = pic_urls.business_id
# LEFT JOIN (
# SELECT
# opm_article.business_id,
# CAST(JSON_UNQUOTE(JSON_EXTRACT(picture_id, CONCAT('$.id[', jt_ids.idx - 1, ']'))) AS UNSIGNED) AS picture_id
# FROM
# opm_article,
# JSON_TABLE(JSON_EXTRACT(opm_article.picture_id, '$.id'), '$[*]' COLUMNS (idx FOR ORDINALITY)) AS jt_ids
# WHERE
# opm_article.del_flag = '0'
# ) AS pic_ids ON opa.business_id = pic_ids.business_id
# LEFT JOIN oss_info pic_urls ON pic_ids.picture_id = pic_urls.business_id
WHERE 1=1
and opa.del_flag = '0'
and opa.flag = '1'
......@@ -287,26 +287,26 @@
mi.avatar AS avatarId,
CASE
WHEN oal.business_id IS NOT NULL THEN 1 ELSE 0
END AS isLike,
oi.url AS memAvatar,
GROUP_CONCAT(DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',') AS url
END AS isLike
# oi.url AS memAvatar,
# GROUP_CONCAT(DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',') AS url
FROM
opm_article opa
LEFT JOIN opm_topic opt ON opa.topic_id = opt.business_id
LEFT JOIN mem_info mi ON opa.create_by = mi.user_id
LEFT JOIN oss_info oi ON mi.avatar = oi.business_id
# LEFT JOIN oss_info oi ON mi.avatar = oi.business_id
LEFT JOIN opm_article_like oal on oal.article_id = opa.business_id and oal.user_id = #{entity.loginUserId}
LEFT JOIN (
SELECT
opm_article.business_id,
CAST(JSON_UNQUOTE(JSON_EXTRACT(picture_id, CONCAT('$.id[', jt_ids.idx - 1, ']'))) AS UNSIGNED) AS picture_id
FROM
opm_article,
JSON_TABLE(JSON_EXTRACT(opm_article.picture_id, '$.id'), '$[*]' COLUMNS (idx FOR ORDINALITY)) AS jt_ids
WHERE
opm_article.del_flag = '0'
) AS pic_ids ON opa.business_id = pic_ids.business_id
LEFT JOIN oss_info pic_urls ON pic_ids.picture_id = pic_urls.business_id
# LEFT JOIN (
# SELECT
# opm_article.business_id,
# CAST(JSON_UNQUOTE(JSON_EXTRACT(picture_id, CONCAT('$.id[', jt_ids.idx - 1, ']'))) AS UNSIGNED) AS picture_id
# FROM
# opm_article,
# JSON_TABLE(JSON_EXTRACT(opm_article.picture_id, '$.id'), '$[*]' COLUMNS (idx FOR ORDINALITY)) AS jt_ids
# WHERE
# opm_article.del_flag = '0'
# ) AS pic_ids ON opa.business_id = pic_ids.business_id
# LEFT JOIN oss_info pic_urls ON pic_ids.picture_id = pic_urls.business_id
WHERE 1=1
and opa.del_flag = '0'
and opa.flag = '1'
......@@ -337,28 +337,28 @@
mi.mem_career AS memCareer,
mi.mem_nick_name AS memNickName,
mi.avatar AS avatarId,
oi.url AS memAvatar,
# oi.url AS memAvatar,
CASE
WHEN oal.business_id IS NOT NULL THEN 1 ELSE 0
END AS isLike,
GROUP_CONCAT( DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',' ) AS url
END AS isLike
# GROUP_CONCAT( DISTINCT pic_urls.url ORDER BY pic_urls.url SEPARATOR ',' ) AS url
FROM
opm_article opa
LEFT JOIN mem_info mi ON mi.user_id = opa.create_by
LEFT JOIN (
SELECT
opm_article.business_id,
CAST( JSON_UNQUOTE( JSON_EXTRACT( picture_id, CONCAT( '$.id[', jt_ids.idx - 1, ']' ))) AS UNSIGNED ) AS picture_id
FROM
opm_article,
JSON_TABLE (
JSON_EXTRACT( opm_article.picture_id, '$.id' ),
'$[*]' COLUMNS ( idx FOR ORDINALITY )) AS jt_ids
WHERE
opm_article.del_flag = '0'
) AS pic_ids ON opa.business_id = pic_ids.business_id
LEFT JOIN oss_info pic_urls ON pic_ids.picture_id = pic_urls.business_id
LEFT JOIN oss_info oi ON oi.business_id = mi.avatar
# LEFT JOIN (
# SELECT
# opm_article.business_id,
# CAST( JSON_UNQUOTE( JSON_EXTRACT( picture_id, CONCAT( '$.id[', jt_ids.idx - 1, ']' ))) AS UNSIGNED ) AS picture_id
# FROM
# opm_article,
# JSON_TABLE (
# JSON_EXTRACT( opm_article.picture_id, '$.id' ),
# '$[*]' COLUMNS ( idx FOR ORDINALITY )) AS jt_ids
# WHERE
# opm_article.del_flag = '0'
# ) AS pic_ids ON opa.business_id = pic_ids.business_id
# LEFT JOIN oss_info pic_urls ON pic_ids.picture_id = pic_urls.business_id
# LEFT JOIN oss_info oi ON oi.business_id = mi.avatar
LEFT JOIN opm_article_like oal on oal.article_id = opa.business_id and oal.user_id = #{loginUserId}
WHERE
1 = 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment