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

Compare commits

base: CY:d49115ec61b7d5feda06cbf01548313a45526913
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment
..
compare: CY:421ca7dc9da78707d8a63b7e89f2d9c8609f5c12
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment

No commits in common. "d49115ec61b7d5feda06cbf01548313a45526913" and "421ca7dc9da78707d8a63b7e89f2d9c8609f5c12" have entirely different histories.
d49115ec61 ... 421ca7dc9d

12 changed files with 96 additions and 252 deletions
Show Stats Expand all files Collapse all files

2
mcwl-system/src/main/java/com/mcwl/system/init/DictInit.java → mcwl-admin/src/main/java/com/mcwl/web/controller/init/DictInit.java
View File

@ -1,4 +1,4 @@
package com.mcwl.system.init;
package com.mcwl.web.controller.init;
import com.mcwl.common.core.domain.entity.SysDictData;
import com.mcwl.system.mapper.SysDictDataMapper;

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

@ -1,10 +1,8 @@
package com.mcwl.web.controller.resource;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mcwl.common.core.controller.BaseController;
import com.mcwl.common.core.domain.AjaxResult;
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.ModelProduct;
@ -14,7 +12,6 @@ import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.MallProductVo;
import com.mcwl.resource.service.ModelImageService;
import com.mcwl.resource.service.ModelService;
import com.mcwl.resource.service.WorkFlowService;
import com.mcwl.system.service.ISysUserService;
import com.mcwl.web.controller.common.OssUtil;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,7 +23,6 @@ import java.util.List;
/**
* 商品
*
* @Author：ChenYan
* @Project：McWl
* @Package：com.mcwl.web.controller.resource
@ -46,9 +42,6 @@ public class MallProductController extends BaseController {
@Autowired
private ModelImageService modelImageService;
@Autowired
private WorkFlowService workFlowService;
/***
*
@ -77,6 +70,8 @@ public class MallProductController extends BaseController {
}
/***
*
* 下载zip
@ -90,6 +85,9 @@ public class MallProductController extends BaseController {
}
/**
* 模型列表
*/
@ -100,13 +98,17 @@ public class MallProductController extends BaseController {
}
@PostMapping("finbyid")
public AjaxResult finbyid(@RequestBody ModelProduct modelVersion) {
public AjaxResult finbyid(@RequestBody ModelProduct modelVersion)
{
ModelProduct modelVersion1 = modelService.getById(modelVersion.getId());
return AjaxResult.success(modelVersion1);
}
@PostMapping("/insert")
public AjaxResult addupdateModel(@RequestBody RequestModel requestModel){
ModelProduct modelProduct = requestModel.getModelProduct();
@ -130,37 +132,40 @@ public class MallProductController extends BaseController {
@PostMapping("delete")
public AjaxResult delete(@RequestBody ModelProduct modelVersion) {
public AjaxResult delete(@RequestBody ModelProduct modelVersion)
{
modelService.removeById(modelVersion.getId());
return AjaxResult.success();
}
/**
* 查询模型详情
* @param id
* 查看用户发布的作品
* @return
*/
@GetMapping("/selectModelById")
public AjaxResult selectModelById(@RequestParam Long id){
@PostMapping("/selectByUserId")
public AjaxResult selectByUserId(@RequestBody MallProductVo mallProductVo){
return modelService.selectModelById(id);
Page<ModelProduct> mallProductList = modelService.selectByUserId(mallProductVo);
return AjaxResult.success(mallProductList);
}
/**
* 我的发布-模型
*/
@PostMapping("/selectByUserIdModel")
public TableDataInfo selectByUserIdModel(@RequestBody ModelImagePageRes imagePageRes) {
public AjaxResult selectByUserIdModel(@RequestBody MallProductVo mallProductVo){
return modelService.listByPage(imagePageRes);
return AjaxResult.success();
}
/**
* 我的发布-工作流
*/
@PostMapping("/selectByUserIdWorkFlow")
public TableDataInfo selectByUserIdWorkFlow(@RequestBody ModelImagePageRes imagePageRes) {
public AjaxResult selectByUserIdWorkFlow(@RequestBody MallProductVo mallProductVo){
return workFlowService.listByPage(imagePageRes);
return AjaxResult.success();
}
/**
@ -171,39 +176,4 @@ public class MallProductController extends BaseController {
return modelImageService.listByPage(imagePageRes);
}
/**
* 点赞-模型
*/
@PostMapping("/likeModel")
public TableDataInfo likeModel(@RequestBody PageDomain pageDomain) {
ModelImagePageRes imagePageRes = new ModelImagePageRes();
BeanUtil.copyProperties(pageDomain, imagePageRes);
imagePageRes.setUserId(SecurityUtils.getUserId());
return modelService.listByPage(imagePageRes);
}
/**
* 点赞-工作流
*/
@PostMapping("/likeWorkFlow")
public TableDataInfo likeWorkFlow(@RequestBody PageDomain pageDomain) {
ModelImagePageRes imagePageRes = new ModelImagePageRes();
BeanUtil.copyProperties(pageDomain, imagePageRes);
imagePageRes.setUserId(SecurityUtils.getUserId());
return workFlowService.listByPage(imagePageRes);
}
/**
* 点赞-图片
*/
@PostMapping("/likeImage")
public TableDataInfo likeImage(@RequestBody PageDomain pageDomain) {
ModelImagePageRes imagePageRes = new ModelImagePageRes();
BeanUtil.copyProperties(pageDomain, imagePageRes);
imagePageRes.setUserId(SecurityUtils.getUserId());
return modelImageService.listByPage(imagePageRes);
}
}

2
mcwl-resource/pom.xml
View File

@ -40,7 +40,7 @@
<dependency>
<groupId>com.mcwl</groupId>
<artifactId>mcwl-system</artifactId>
<artifactId>mcwl-admin</artifactId>
<version>3.8.8</version>
</dependency>

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

@ -79,10 +79,6 @@ public class ModelProduct extends BaseEntity {
* 生图次数
*/
private Integer reals;
/**
* 封面图
*/
private String surfaceUrl;
/**
* 下载次数
*/
@ -108,9 +104,14 @@ public class ModelProduct extends BaseEntity {
*/
private String delFlag;
/**
* 翻译后主体
*/
@TableField(exist = false)
private List<String> themeList;
/**
* 翻译后标签
* 翻译后风格
*/
@TableField(exist = false)
private List<String> styleList;

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

@ -35,10 +35,6 @@ public class WorkFlow {
*/
@TableId
private Long id;
/**
* 用户id
*/
private Long userId;
/**
* 名称（最多30字）
*/

1
mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/MallProductVo.java
View File

@ -1,7 +1,6 @@
package com.mcwl.resource.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mcwl.common.core.page.PageDomain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

54
mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelVo.java
View File

@ -5,17 +5,9 @@ import lombok.Data;
@Data
public class ModelVo {
/**
* 模型id
* 图片ID
*/
private Long id;
/**
* 模型名称
*/
private String modelName;
/**
* 封面图
*/
private String surfaceUrl;
/**
* 用户ID
*/
@ -28,14 +20,54 @@ public class ModelVo {
* 用户头像
*/
private String userAvatar;
/**
* 图片地址（最多8张，切割）
*/
private String imagePaths;
/**
* 是否添加水印
*/
private Integer hasWatermark;
/**
* 是否会员下载
*/
private Integer isMemberDownload;
/**
* 是否不可下载
*/
private Integer isNotDownloadable;
/**
* 是否隐藏生成信息
*/
private Integer hideGenInfo;
/**
* 图片标题（最多30字）
*/
private String title;
/**
* 图片标签（多个，切割）
*/
private String tags;
/**
* 描述信息（最多500）
*/
private String description;
/**
* 在线生成数
*/
private Integer reals;
private Integer onlineGenNum;
/**
* 下载数
*/
private Integer numbers;
private Integer downloadNum;
/**
* 返图数
*/
private Integer returnNum;
/**
* 点赞数
*/
private Integer likeNum;

42
mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/WorkFlowVo.java
View File

@ -1,42 +0,0 @@
package com.mcwl.resource.domain.vo;
import lombok.Data;
@Data
public class WorkFlowVo {
/**
* 工作流id
*/
private Long id;
/**
* 工作流名称
*/
private String workflowName;
/**
* 封面图
*/
private String coverPath;
/**
* 用户ID
*/
private Long userId;
/**
* 用户名称
*/
private String userName;
/**
* 用户头像
*/
private String userAvatar;
/**
* 在线生成数
*/
private Integer useNumber;
/**
* 下载数
*/
private Integer downloadNumber;
}

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

@ -34,6 +34,4 @@ public interface ModelService extends IService<ModelProduct> {
void updaModel(RequestModel requestModel);
AjaxResult selectModelById(Long id);
}

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

@ -1,10 +1,6 @@
package com.mcwl.resource.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.PageVo;
@ -15,7 +11,7 @@ import com.mcwl.resource.domain.vo.PageVo;
* @apiNote
*/
public interface WorkFlowService extends IService<WorkFlow> {
public interface WorkFlowService {
AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow);
void updateWorkFlow(RequestWorkFlow requestWorkFlow);
@ -25,8 +21,4 @@ public interface WorkFlowService extends IService<WorkFlow> {
AjaxResult selectWorkFlow(PageVo pageVo);
AjaxResult selectWorkFlowById(Long id);
TableDataInfo listByPage(ModelImagePageRes imagePageRes);
}

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

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mcwl.common.constant.DictConstants;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.entity.SysUser;
@ -16,15 +15,15 @@ import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ModelVersion;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestModel;
import com.mcwl.resource.domain.vo.MallProductVo;
import com.mcwl.resource.domain.vo.ModelVo;
import com.mcwl.resource.domain.vo.ModelImageVo;
import com.mcwl.resource.mapper.ModelMapper;
import com.mcwl.resource.mapper.ModelVersionMapper;
import com.mcwl.resource.service.ModelService;
import com.mcwl.resource.service.ToActivityService;
import com.mcwl.system.init.DictInit;
import com.mcwl.system.service.ISysUserService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
@ -50,8 +49,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
@Autowired
private RedisCache redisCache;
@Autowired
private ToActivityService toActivityService;
@Autowired
private ModelVersionMapper modelVersionMapper;
@Autowired
@ -117,6 +114,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
LambdaQueryWrapper<ModelProduct> lqw = new LambdaQueryWrapper<>();
lqw.eq(imagePageRes.getStatus() != null, ModelProduct::getAuditSatus, imagePageRes.getStatus())
.eq(imagePageRes.getUserId() != null, ModelProduct::getUserId, imagePageRes.getUserId())
.eq(imagePageRes.getPageNum() != null, ModelProduct::getUserId, imagePageRes.getUserId())
.ge(imagePageRes.getStartTime() != null, ModelProduct::getCreateTime, imagePageRes.getStartTime())
.le(imagePageRes.getEndTime() != null, ModelProduct::getCreateTime, imagePageRes.getEndTime());
@ -125,23 +123,23 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
List<ModelProduct> modelImageList = page.getRecords();
// Model数据转为ModelPageVo
List<ModelVo> modelVoList = new ArrayList<>();
List<ModelImageVo> modelImageVoList = new ArrayList<>();
for (ModelProduct modelImage : modelImageList) {
ModelVo modelVo = new ModelVo();
BeanUtil.copyProperties(modelImage, modelVo);
ModelImageVo modelImageVo = new ModelImageVo();
BeanUtil.copyProperties(modelImage, modelImageVo);
// 获取用户信息
SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId());
modelVo.setUserId(sysUser.getUserId());
modelVo.setUserName(sysUser.getUserName());
modelVo.setUserAvatar(sysUser.getAvatar());
modelVoList.add(modelVo);
modelImageVo.setUserId(sysUser.getUserId());
modelImageVo.setUserName(sysUser.getUserName());
modelImageVo.setUserAvatar(sysUser.getAvatar());
modelImageVoList.add(modelImageVo);
}
// 封装分页数据
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
rspData.setRows(modelVoList);
rspData.setRows(modelImageVoList);
rspData.setTotal(page.getTotal());
return rspData;
@ -153,7 +151,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
String filePath = requestModel.getModelVersionList().get(0).getFilePath();
String[] split = filePath.split(",");
ModelProduct modelProduct = requestModel.getModelProduct();
modelProduct.setSurfaceUrl(split[0]);
modelProduct.setCategory(split[0]);
modelProduct.setCreateTime(new Date());
@ -199,41 +197,4 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
}
@Override
public AjaxResult selectModelById(Long id) {
//查询详情
ModelProduct modelProduct = postMapper.selectById(id);
//翻译属性 垂类
if (StringUtils.isNotEmpty(modelProduct.getCategory())){
modelProduct.setCategory(DictInit.getDictValue(DictConstants.MODEL_CHILD_CATEGORY,modelProduct.getCategory()));
}
//标签
if (StringUtils.isNotEmpty(modelProduct.getTags())){
ArrayList<String> strings = new ArrayList<>();
String[] split = modelProduct.getTags().split(",");
for (String s : split) {
if (s != ""){
strings.add(s);
}
}
modelProduct.setStyleList(strings);
}
//功能
if (StringUtils.isNotEmpty(modelProduct.getFunctions())){
modelProduct.setCategory(DictInit.getDictValue(DictConstants.WORK_FLOW_FUNCTIONS,modelProduct.getFunctions()));
}
//活动
if (StringUtils.isNotEmpty(modelProduct.getActivityId())){
modelProduct.setActivityId(toActivityService.getById(modelProduct.getActivityId()).getActivityName());
}
return AjaxResult.success(modelProduct);
}
}

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

@ -1,38 +1,27 @@
package com.mcwl.resource.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mcwl.common.constant.DictConstants;
import com.mcwl.common.constant.HttpStatus;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.WorkFlowVersion;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.PageVo;
import com.mcwl.resource.domain.vo.WorkFlowVo;
import com.mcwl.resource.mapper.WorkFlowMapper;
import com.mcwl.resource.mapper.WorkFlowVersionMapper;
import com.mcwl.resource.service.ToActivityService;
import com.mcwl.resource.service.WorkFlowService;
import com.mcwl.system.init.DictInit;
import com.mcwl.system.service.ISysUserService;
import com.mcwl.web.controller.init.DictInit;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* 工作流 业务实现层
@ -43,7 +32,7 @@ import java.util.Objects;
@Slf4j
@Service
public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> implements WorkFlowService {
public class WorkFlowServiceImpl implements WorkFlowService {
@Autowired
private WorkFlowMapper flowMapper;
@ -54,9 +43,6 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
@Autowired
private ToActivityService toActivityService;
@Autowired
private ISysUserService sysUserService;
@Override
public AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow) {
@ -187,53 +173,4 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
return AjaxResult.success(workFlow);
}
@Override
public TableDataInfo listByPage(ModelImagePageRes imagePageRes) {
Page<WorkFlow> page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize());
if (StringUtils.isEmpty(imagePageRes.getOrderByColumn())) {
imagePageRes.setOrderByColumn("create_time");
}
// 设置排序
boolean isAsc = Objects.equals(imagePageRes.getIsAsc(), "asc");
OrderItem orderItem = new OrderItem(imagePageRes.getOrderByColumn(), isAsc);
page.addOrder(orderItem);
LambdaQueryWrapper<WorkFlow> lqw = new LambdaQueryWrapper<>();
lqw.eq(imagePageRes.getStatus() != null, WorkFlow::getAuditStatus, imagePageRes.getStatus())
.eq(imagePageRes.getUserId() != null, WorkFlow::getUserId, imagePageRes.getUserId())
.ge(imagePageRes.getStartTime() != null, WorkFlow::getCreateTime, imagePageRes.getStartTime())
.le(imagePageRes.getEndTime() != null, WorkFlow::getCreateTime, imagePageRes.getEndTime());
baseMapper.selectPage(page, lqw);
// 获取分页数据
List<WorkFlow> workFlowList = page.getRecords();
// WorkFlow数据转为WorkFlowVo
List<WorkFlowVo> workFlowVoList = new ArrayList<>();
for (WorkFlow workFlow : workFlowList) {
WorkFlowVo workFlowVo = new WorkFlowVo();
BeanUtil.copyProperties(workFlow, workFlowVo);
// 获取用户信息
SysUser sysUser = sysUserService.selectUserById(workFlow.getUserId());
workFlowVo.setUserId(sysUser.getUserId());
workFlowVo.setUserName(sysUser.getUserName());
workFlowVo.setUserAvatar(sysUser.getAvatar());
workFlowVoList.add(workFlowVo);
}
// 封装分页数据
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
rspData.setRows(workFlowVoList);
rspData.setTotal(page.getTotal());
return rspData;
}
}