From 421ca7dc9da78707d8a63b7e89f2d9c8609f5c12 Mon Sep 17 00:00:00 2001 From: ChenYan <3139166962@qq.com> Date: Tue, 14 Jan 2025 18:11:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(resource):=20=E6=96=B0=E5=A2=9E=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E4=BA=A7=E5=93=81=E5=92=8C=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++---- .../mcwl/common/core/domain/BaseEntity.java | 2 ++ .../mcwl/resource/domain/ModelProduct.java | 24 +++++++++++++++---- .../mcwl/resource/domain/ModelVersion.java | 7 +++++- .../service/impl/ModelServiceImpl.java | 17 +++++++++++++ .../service/impl/WorkFlowServiceImpl.java | 17 ++++++++----- 6 files changed, 58 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4943b14..05e6922 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,8 @@ * 后端采用Spring Boot、Spring Security、Redis & Jwt。 * 权限认证使用Jwt，支持多终端认证系统。 * 支持加载动态权限菜单，多方式轻松权限控制。 -* 高效率开发，使用代码生成器可以一键生成前后端代码。 -* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[McWl-Vue3](https://gitcode.com/yangzongzhuan/McWl-Vue3)，保持同步更新。 -* 提供了单应用版本[McWl-Vue-fast](https://gitcode.com/yangzongzhuan/McWl-Vue-fast)，Oracle版本[McWl-Vue-Oracle](https://gitcode.com/yangzongzhuan/McWl-Vue-Oracle)，保持同步更新。 -* 不分离版本，请移步[McWl](https://gitee.com/y_project/McWl)，微服务版本，请移步[McWl-Cloud](https://gitee.com/y_project/McWl-Cloud) -* 阿里云折扣场：[点我进入](http://aly.mcwl.vip)，腾讯云秒杀场：[点我进入](http://txy.mcwl.vip)   + + ## 内置功能 1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 diff --git a/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java b/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java index 73d7409..e65f6ce 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java +++ b/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java @@ -10,12 +10,14 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; /** * Entity基类 * * @author mcwl */ + public class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java index 0977b8a..b50826d 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java @@ -1,11 +1,18 @@ package com.mcwl.resource.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.mcwl.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 模型表 @@ -19,6 +26,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Data +@Builder @TableName("model") public class ModelProduct extends BaseEntity { @@ -27,10 +35,6 @@ public class ModelProduct extends BaseEntity { */ @TableId private Long id; - /** - * 版本ID - */ - private Long versionId; /** * 名称 */ @@ -100,5 +104,17 @@ public class ModelProduct extends BaseEntity { */ private String delFlag; + /** + * 翻译后主体 + */ + @TableField(exist = false) + private List themeList; + + /** + * 翻译后风格 + */ + @TableField(exist = false) + private List styleList; + } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java index fb853d3..a49c2aa 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java @@ -2,6 +2,7 @@ package com.mcwl.resource.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.mcwl.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,13 +20,17 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @Data @TableName("model_version") -public class ModelVersion { +public class ModelVersion extends BaseEntity { /** * 主键ID */ @TableId private Long id; + /** + * 版本名称 + */ + private Long modelId; /** * 版本名称 */ diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java index f50a53a..c84e4a3 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java @@ -15,6 +15,7 @@ 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; @@ -29,6 +30,7 @@ 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; @@ -145,6 +147,14 @@ public class ModelServiceImpl extends ServiceImpl impl @Override public AjaxResult addModel(RequestModel requestModel) { + //获取封面图 + String filePath = requestModel.getModelVersionList().get(0).getFilePath(); + String[] split = filePath.split(","); + ModelProduct modelProduct = requestModel.getModelProduct(); + modelProduct.setCategory(split[0]); + modelProduct.setCreateTime(new Date()); + + //添加模型表数据 postMapper.insert(requestModel.getModelProduct()); @@ -176,6 +186,13 @@ public class ModelServiceImpl extends ServiceImpl impl modelVersion.setAuditSatus(3); modelVersionMapper.updateById(modelVersion); } + + ModelProduct model = ModelProduct.builder(). + id(requestModel.getModelVersionList().get(0). + getModelId()).build(); + model.setUpdateTime(new Date()); + postMapper.updateById(model); + } } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java index f715fa3..b858567 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java @@ -1,6 +1,7 @@ package com.mcwl.resource.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mcwl.common.constant.DictConstants; @@ -50,8 +51,9 @@ public class WorkFlowServiceImpl implements WorkFlowService { String[] split = filePath.split(","); - requestWorkFlow.getWorkFlow().setCoverPath(split[0]); - requestWorkFlow.getWorkFlow().setCreateTime(new Date()); + WorkFlow workFlow = requestWorkFlow.getWorkFlow(); + workFlow .setCoverPath(split[0]); + workFlow.setCreateTime(new Date()); //添加模型表数据 flowMapper.insert(requestWorkFlow.getWorkFlow()); @@ -65,11 +67,14 @@ public class WorkFlowServiceImpl implements WorkFlowService { @Override public void updateWorkFlow(RequestWorkFlow requestWorkFlow) { - + WorkFlow workFlows = requestWorkFlow.getWorkFlow(); //修改工作流的信息 - if (requestWorkFlow.getWorkFlow().getId() != null){ + if (ObjectUtils.isEmpty(workFlows)){ - requestWorkFlow.getWorkFlow().setAuditStatus(3); + } + if (StringUtils.isNotNull(workFlows.getId() )){ + + workFlows.setAuditStatus(3); // flowMapper.updateWorkFlow(requestWorkFlow.getWorkFlow()); flowMapper.updateById(requestWorkFlow.getWorkFlow()); } @@ -85,7 +90,7 @@ public class WorkFlowServiceImpl implements WorkFlowService { } WorkFlow workFlow = WorkFlow.builder().id(requestWorkFlow.getWorkFlowVersionList().get(0).getWorkFlowId()) - .createTime(new Date()).build(); + .updateTime(new Date()).build(); //更新时间 flowMapper.updateById(workFlow);