CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat 是否置顶

master
ChenYan 2025-01-21 16:45:00 +08:00
parent f5f2693e8e
commit d8c964f98b
25 changed files with 246 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishCommentController.java
View File

@ -5,17 +5,16 @@ import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.communityCenter.domain.dto.CommentDelRes;
import com.mcwl.communityCenter.domain.dto.CommentDetailRes;
import com.mcwl.communityCenter.domain.dto.CommentRes;
import com.mcwl.communityCenter.domain.vo.CommentVo;
import com.mcwl.communityCenter.domain.PublishComment;
import com.mcwl.communityCenter.service.PublishCommentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.List;
/**
* 社群评论

39
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
View File

@ -18,9 +18,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
*模型
@ -152,6 +155,40 @@ public class MallProductController extends BaseController {
return modelService.selectModelById(id);
}
/**
* 设置模型置顶状态
* @param id
* @param isTop
* @return
*/
@PutMapping("/{id}/top")
public ResponseEntity<ModelProduct> setModelTop(@PathVariable Long id, @RequestParam boolean isTop) {
try {
modelService.setModelTop(id, isTop);
return ResponseEntity.ok().build();
} catch (Exception e) {
return ResponseEntity.badRequest().build();
}
}
/**
* 获取置顶的模型列表
* @return
*/
@GetMapping
public ResponseEntity<List<ModelProduct>> fetchModelsSortedByTopStatus() {
List<ModelProduct> models = modelService.fetchModelsSortedByTopStatus();
return ResponseEntity.ok(models);
}
/**
* 我的发布-模型
*/
@ -219,4 +256,6 @@ public class MallProductController extends BaseController {
}
}

23
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java
View File

@ -8,6 +8,7 @@ import com.mcwl.common.core.page.PageDomain;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.resource.domain.ModelImage;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.dto.ModelImageRes;
import com.mcwl.resource.domain.vo.ModelImageVo;
@ -17,9 +18,11 @@ import com.mcwl.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;
/**
@ -102,5 +105,25 @@ public class ModelImageController {
}
@PutMapping("/{id}/top")
public ResponseEntity<ModelImage> setModelImageTop(@PathVariable Long id, @RequestParam boolean isTop) {
try {
modelImageLikeService.setModelImageTop(id, isTop);
return ResponseEntity.ok().build();
} catch (Exception e) {
return ResponseEntity.badRequest().build();
}
}
/**
* 获取置顶的模型列表
* @return
*/
@GetMapping
public ResponseEntity<List<ModelImage>> fetchModelImagesSortedByTopStatus() {
List<ModelImage> models = modelImageLikeService.fetchModelImageSortedByTopStatus();
return ResponseEntity.ok(models);
}
}

35
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java
View File

@ -2,6 +2,8 @@ package com.mcwl.web.controller.resource;
import com.mcwl.common.core.controller.BaseController;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.PageVo;
import com.mcwl.resource.service.impl.WorkFlowServiceImpl;
@ -9,9 +11,12 @@ import com.mcwl.web.controller.common.OssUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* 工作流
@ -31,6 +36,36 @@ public class WorkFlowController extends BaseController {
@Autowired
private WorkFlowServiceImpl workFlowService;
/**
* 设置工作流的置顶状态
* @param id
* @param isTop
* @return
*/
@PutMapping("/{id}/top")
public ResponseEntity<WorkFlow> setworkFlowTop(@PathVariable Long id, @RequestParam boolean isTop) {
try {
workFlowService.setworkFlowTop(id, isTop);
return ResponseEntity.ok().build();
} catch (Exception e) {
return ResponseEntity.badRequest().build();
}
}
/**
* 获取所有工作流，按照置顶状态排序
* @return
*/
@GetMapping
public ResponseEntity<List<WorkFlow>> fetchWorkFlowSortedByTopStatus() {
List<WorkFlow> models = workFlowService.fetchWorkFlowSortedByTopStatus();
return ResponseEntity.ok(models);
}
/***
* 图片
* @param file

0
mcwl-common/src/main/java/com/mcwl/common/i18n/I18nMessage.java
View File

53
mcwl-common/src/main/java/com/mcwl/common/i18n/YamiLocaleChangeFilter.java
View File

@ -1,53 +0,0 @@
///*
// * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
// *
// * https://www.mall4j.com/
// *
// * 未经允许，不可做商业用途！
// *
// * 版权所有，侵权必究！
// */
//package com.mcwl.common.i18n;
//
//
//
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.context.i18n.LocaleContextHolder;
//import org.springframework.core.annotation.Order;
//import org.springframework.stereotype.Component;
//
//import javax.servlet.*;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import java.io.IOException;
//import java.util.Locale;
//import java.util.Objects;
//
///**
// * RequestContextFilter 会传入默认的Locale，优先级(-105) 要比RequestContextFilter优先级高
// * @author LGH
// */
//@Slf4j
//@Component
//@Order(-104)
//public class YamiLocaleChangeFilter implements Filter {
//
// public static String ZH_CN = "zh_CN";
// public static String ZH_CN_L = "zh_cn";
//
// @Override
// public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
// HttpServletRequest request = (HttpServletRequest) servletRequest;
// HttpServletResponse response = (HttpServletResponse) servletResponse;
//
// String newLocale = request.getHeader("locale");
// if(Objects.equals(newLocale,ZH_CN)||Objects.equals(newLocale,ZH_CN_L)){
// newLocale = "zh";
// }
// if (newLocale != null) {
// String lowerLocale = newLocale.toLowerCase();
// LocaleContextHolder.setLocale(new Locale(lowerLocale));
// }
// filterChain.doFilter(request, response);
// }
//}

58
mcwl-common/src/main/java/com/mcwl/common/i18n/YamiLocaleChangeInterceptor.java
View File

@ -1,58 +0,0 @@
///*
// * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
// *
// * https://www.mall4j.com/
// *
// * 未经允许，不可做商业用途！
// *
// * 版权所有，侵权必究！
// */
//package com.mcwl.common.i18n;
//
//
//
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Component;
//import org.springframework.web.servlet.LocaleResolver;
//import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
//import org.springframework.web.servlet.support.RequestContextUtils;
//
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//
///**
// * @author LGH
// */
//@Component("localeChangeInterceptor")
//@Slf4j
//public class YamiLocaleChangeInterceptor extends LocaleChangeInterceptor {
//
// @Override
// public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
//
// String newLocale = request.getHeader(getParamName());
// if (newLocale != null) {
// LocaleResolver localeResolver = RequestContextUtils.getLocaleResolver(request);
// if (localeResolver == null) {
// throw new IllegalStateException(
// "No LocaleResolver found: not in a DispatcherServlet request?");
// }
// try {
// localeResolver.setLocale(request, response, parseLocaleValue(newLocale));
// }
// catch (IllegalArgumentException ex) {
// if (isIgnoreInvalidLocale()) {
// if (logger.isDebugEnabled()) {
// logger.debug("Ignoring invalid locale value [" + newLocale + "]: " + ex.getMessage());
// }
// }
// else {
// throw ex;
// }
// }
// }
// // Proceed in any case.
// return true;
// }
//
//}

7
mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelImage.java
View File

@ -109,4 +109,11 @@ public class ModelImage extends BaseEntity {
*/
@ApiModelProperty(value = "是否置顶")
private Integer isTop;
/**
* 审核（1公开 2自见）
*/
@ApiModelProperty(value = "审核（1公开 2自见）")
private Integer jurisdiction;
}

13
mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java
View File

@ -124,6 +124,19 @@ public class ModelProduct extends BaseEntity {
*/
@ApiModelProperty(value = "是否推荐模型")
private Integer isRecommend;
/**
* 是否置顶
*/
@ApiModelProperty(value = "是否置顶")
private Integer isTop;
/**
* 审核（1公开 2自见）
*/
@ApiModelProperty(value = "审核（1公开 2自见）")
private Integer jurisdiction;
/**
* 删除标志（0代表存在 2代表删除）
*/

6
mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java
View File

@ -147,6 +147,12 @@ public class WorkFlow {
@ApiModelProperty(value = "审核权限")
private Integer jurisdiction;
/**
* 是否置顶
*/
@ApiModelProperty(value = "是否置顶")
private Integer isTop;
/**
* 创建时间
*/

8
mcwl-resource/src/main/java/com/mcwl/resource/mapper/ModelImageMapper.java
View File

@ -5,7 +5,15 @@ import com.mcwl.resource.domain.ModelImage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ModelImageMapper extends BaseMapper<ModelImage> {
Long sumLikeNumber(@Param("userId") Long userId);
List<ModelImage> fetchModelImageSortedByTopStatus();
void setModelImageTop(@Param("id") Long id, @Param("isTop") int i);
}

9
mcwl-resource/src/main/java/com/mcwl/resource/mapper/ModelMapper.java
View File

@ -6,6 +6,8 @@ import com.mcwl.resource.domain.ModelProduct;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Author：ChenYan
* @Project：McWl
@ -27,4 +29,11 @@ public interface ModelMapper extends BaseMapper<ModelProduct> {
Long sumLikeNumber(@Param("userId") Long userId);
Long sumRunNumber(Long userId);
void updateTopStatus(@Param("id") Long id, @Param("isTop") int i);
List<ModelProduct> selectAllModelsSortedByTopStatus();
}

5
mcwl-resource/src/main/java/com/mcwl/resource/mapper/WorkFlowMapper.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mcwl.resource.domain.WorkFlow;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 工作流
* @author DaiZibo
@ -16,4 +18,7 @@ public interface WorkFlowMapper extends BaseMapper<WorkFlow> {
void updateWorkFlow(WorkFlow workFlow);
List<WorkFlow> fetchWorkFlowSortedByTopStatus();
}

9
mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageLikeService.java
View File

@ -4,8 +4,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.mcwl.resource.domain.ModelImage;
import com.mcwl.resource.domain.ModelImageLike;
import java.util.List;
public interface ModelImageLikeService extends IService<ModelImageLike> {
void like(Long imageId);
void setModelImageTop(Long id, boolean isTop);
List<ModelImage> fetchModelImageSortedByTopStatus();
}

4
mcwl-resource/src/main/java/com/mcwl/resource/service/ModelImageService.java
View File

@ -39,4 +39,8 @@ public interface ModelImageService extends IService<ModelImage> {
TableDataInfo listByPage(ModelImagePageRes imagePageRes);
ModelImageVo getDetail(@NotNull(message = "图片id不能为空") Long imageId);
}

6
mcwl-resource/src/main/java/com/mcwl/resource/service/ModelService.java
View File

@ -36,4 +36,10 @@ public interface ModelService extends IService<ModelProduct> {
AjaxResult selectModelById(Long id);
void setModelTop(Long id, boolean isTop);
List<ModelProduct> fetchModelsSortedByTopStatus();
}

7
mcwl-resource/src/main/java/com/mcwl/resource/service/WorkFlowService.java
View File

@ -8,6 +8,8 @@ import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.PageVo;
import java.util.List;
/**
* 工作流 业务层
* @author DaiZibo
@ -29,4 +31,9 @@ public interface WorkFlowService extends IService<WorkFlow> {
TableDataInfo listByPage(ModelImagePageRes imagePageRes);
void setworkFlowTop(Long id, boolean isTop);
List<WorkFlow> fetchWorkFlowSortedByTopStatus();
}

14
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelCommentServiceImpl.java
View File

@ -46,19 +46,27 @@ public class ModelCommentServiceImpl extends ServiceImpl<ModelCommentMapper, Mod
@Override
public void comment(ModelComment modelComment) {
Long parentId = modelComment.getParentId();
ModelComment mic = modelCommentMapper.selectById(parentId);
if (Objects.nonNull(parentId) && Objects.isNull(mic)) {
if (Objects.nonNull(parentId)) {
ModelComment mic = modelCommentMapper.selectById(parentId);
if (Objects.isNull(mic)) {
return;
}
}
modelComment.setUserId(SecurityUtils.getUserId());
modelComment.setCreateBy(SecurityUtils.getUsername());
modelComment.setCreateTime(new Date());
modelComment.setUpdateBy(SecurityUtils.getUsername());
modelComment.setUpdateTime(new Date());
modelCommentMapper.insert(modelComment);
}
/**
* 获取评论
*
* @param imageId 图片id
* @return 评论区
*/
@Override
public List<ModelCommentVo> getComment(Long imageId) {
List<ModelCommentVo> modelCommentVoList = new ArrayList<>();

11
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java
View File

@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@Service
@ -58,4 +59,14 @@ public class ModelImageLikeServiceImpl extends ServiceImpl<ModelImageLikeMapper,
modelImage.setLikeNum(modelImage.getLikeNum() + 1);
modelImageMapper.updateById(modelImage);
}
@Override
public void setModelImageTop(Long id, boolean isTop) {
modelImageMapper.setModelImageTop(id,isTop?0:1);
}
@Override
public List<ModelImage> fetchModelImageSortedByTopStatus() {
return modelImageMapper.fetchModelImageSortedByTopStatus();
}
}

2
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.resource.domain.ModelImage;
import com.mcwl.resource.domain.ModelImageComment;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.dto.ModelImageCommentRes;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.dto.ModelImageRes;
@ -155,5 +156,4 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
}
}

22
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
View File

@ -59,7 +59,27 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
@Autowired
private ISysUserService sysUserService;
/**
* 设置模型置顶状态
*
* @param modelId 模型ID
* @param isTop 是否置顶
*/
@Override
public void setModelTop(Long id, boolean isTop) {
postMapper.updateTopStatus(id, isTop ? 1 : 0);
}
/**
* 获取模型列表
*
* @param
* @return 模型列表
*/
@Override
public List<ModelProduct> fetchModelsSortedByTopStatus() {
return postMapper.selectAllModelsSortedByTopStatus();
}
@Override
public Page<ModelProduct> selectByUserId(MallProductVo mallProductVo) {
@ -236,4 +256,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
}
}

10
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java
View File

@ -386,5 +386,15 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
}
@Override
public void setworkFlowTop(Long id, boolean isTop) {
flowMapper.setworkFlowTop(id,isTop?0:1);
}
@Override
public List<WorkFlow> fetchWorkFlowSortedByTopStatus() {
return flowMapper.fetchWorkFlowSortedByTopStatus();
}
}

6
mcwl-resource/src/main/resources/mapper/resource/ModelImageMapper.xml
View File

@ -3,6 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.ModelImageMapper">
<update id="setModelImageTop">
UPDATE model_image SET is_top = #{isTop} WHERE image_id = #{imageId}
</update>
<update id="fetchModelImageSortedByTopStatus">
SELECT is_top FROM model_image ORDER BY is_top DESC;
</update>
<select id="sumLikeNumber" resultType="java.lang.Long">
SELECT sum(like_num)sum FROM model_image where user_id = #{userId} ORDER BY(user_id);

6
mcwl-resource/src/main/resources/mapper/resource/ModelMapper.xml
View File

@ -69,6 +69,9 @@
</set>
where id = #{id}
</update>
<update id="updateTopStatus">
update model set is_top = #{isTop} where id = #{id}
</update>
<select id="sumNumber" resultType="java.lang.Long">
@ -81,5 +84,8 @@
<select id="sumRunNumber" resultType="java.lang.Long">
SELECT sum(reals)sum FROM model where user_id = #{userId} ORDER BY(user_id);
</select>
<select id="selectAllModelsSortedByTopStatus" resultType="com.mcwl.resource.domain.ModelProduct">
SELECT is_top FROM model ORDER BY is_top DESC;
</select>
</mapper>

3
mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml
View File

@ -31,4 +31,7 @@
</set>
WHERE id = #{id}
</update>
<select id="fetchWorkFlowSortedByTopStatus" resultType="com.mcwl.resource.domain.WorkFlow">
SELECT is_top FROM work_flow ORDER BY is_top DESC;
</select>
</mapper>