Compare commits

..

5 Commits

Author SHA1 Message Date
ChenYan 2d0a5dcb38 feat: 2025-01-13 17:04:11 +08:00
ChenYan c8bc835644 feat: 2025-01-13 15:12:50 +08:00
ChenYan 9ef5a22665 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-13 11:48:30 +08:00
Diyu0904 821dce5654 Merge branch 'feature/admin' into preview 2025-01-13 11:46:41 +08:00
Diyu0904 db353dbb83 新增工作流业务 2025-01-13 11:45:47 +08:00
19 changed files with 474 additions and 30 deletions

View File

@ -7,6 +7,8 @@ import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestModel;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.MallProductVo;
import com.mcwl.resource.service.ModelService;
import com.mcwl.system.service.ISysUserService;
@ -31,8 +33,7 @@ import java.util.List;
@RestController
@RequestMapping("/model")
public class MallProductController extends BaseController {
@Autowired
private ISysUserService sysUserService;
@Autowired
private ModelService modelService;
@ -103,26 +104,29 @@ public class MallProductController extends BaseController {
}
@PostMapping("insert")
public AjaxResult insert(@RequestBody ModelProduct modelVersion)
{
@PostMapping("/insert")
public AjaxResult addupdateModel(@RequestBody RequestModel requestModel){
ModelProduct modelProduct = requestModel.getModelProduct();
Long userId = SecurityUtils.getUserId();
modelVersion.setUserId(userId);
modelVersion.setCreateBy(getUsername());
modelService.save(modelVersion);
return AjaxResult.success();
modelProduct.setUserId(userId);
modelProduct.setCreateBy(getUsername());
return modelService.addModel(requestModel);
}
@PostMapping("update")
public AjaxResult update(@RequestBody ModelProduct modelVersion)
{
@PostMapping("/update")
public AjaxResult updateModel(@RequestBody RequestModel requestModel){
ModelProduct modelProduct = requestModel.getModelProduct();
Long userId = SecurityUtils.getUserId();
modelVersion.setUserId(userId);
modelVersion.setUpdateBy(getUsername());
modelService.updateById(modelVersion);
return AjaxResult.success();
modelProduct.setUserId(userId);
modelProduct.setUpdateBy(getUsername());
modelService.updaModel(requestModel);
return AjaxResult.success("修改成功");
}
@PostMapping("delete")
public AjaxResult delete(@RequestBody ModelProduct modelVersion)
{

View File

@ -2,11 +2,11 @@ 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.request.RequestWorkFlow;
import com.mcwl.resource.service.impl.WorkFlowServiceImpl;
import com.mcwl.web.controller.common.OssUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -25,9 +25,10 @@ import org.springframework.web.multipart.MultipartFile;
public class WorkFlowController extends BaseController {
@Autowired
private WorkFlowServiceImpl workFlowService;
/***
*
*
* @param file
* @return
@ -39,7 +40,6 @@ public class WorkFlowController extends BaseController {
return AjaxResult.success(s);
}
/***
*
* zip
@ -53,8 +53,6 @@ public class WorkFlowController extends BaseController {
}
/***
*
* zip
@ -68,6 +66,20 @@ public class WorkFlowController extends BaseController {
}
// @PostMapping("/add")
// public AjaxResult
@PostMapping("/addWorkFlow")
public AjaxResult addWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow){
return workFlowService.addWorkFlow(requestWorkFlow);
}
@PostMapping("/updateWorkFlow")
public AjaxResult updateWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow){
workFlowService.updateWorkFlow(requestWorkFlow);
return AjaxResult.success("修改成功");
}
}

View File

@ -56,4 +56,29 @@ public class WorkFlow {
*/
private String del_flag;
/**
* 0 1- 2- 3 4
*/
private Integer auditStatus = 0;
/**
*
*/
private String auditText;
/**
*
*/
private String authorName;
/**
* 使
*/
private Long useNumber = 0L;
/**
*
*/
private Long downloadNumber = 0L;
}

View File

@ -44,9 +44,74 @@ public class WorkFlowVersion {
/**
*
*/
private String hideGenInfo;
private Integer hideGenInfo;
/**
* 0 2
*/
private String delFlag;
/**
* 0 1- 2- 3 4
*/
private Integer auditStatus = 0;
/**
*
*/
private String auditText;
/**
* ID
*/
private Long workFlowId;
/**
*
*/
private Integer basicModel;
/**
*
*/
private Integer jurisdiction;
/**
*使(0 1
*/
private Integer itselfUse;
/**
* 使(0 1)
*/
private Integer subordinateUse;
/**
* (0 1)
*/
private Integer download;
/**
* (0 1)
*/
private Integer fuse;
/**
* (0 1)
*/
private Integer sell;
/**
* (0 1)
*/
private Integer fuseSell;
/**
* (0 1)
*/
private Integer exclusive;
/**
*
*/
private String fileName;
}

View File

@ -0,0 +1,31 @@
package com.mcwl.resource.domain.request;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ModelVersion;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.WorkFlowVersion;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* +
* @author DaiZibo
* @date 2025/1/9
* @apiNote
*/
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Data
public class RequestModel {
private ModelProduct modelProduct;
private List<ModelVersion> modelVersionList;
}

View File

@ -0,0 +1,29 @@
package com.mcwl.resource.domain.request;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.WorkFlowVersion;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* +
* @author DaiZibo
* @date 2025/1/9
* @apiNote
*/
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Data
public class RequestWorkFlow {
private WorkFlow workFlow;
private List<WorkFlowVersion> workFlowVersionList;
}

View File

@ -27,5 +27,6 @@ public interface MallProductMapper extends BaseMapper<ModelProduct> {
Long sumNumber(@Param("userId") Long userId);
void updateModel(ModelProduct modelProduct);
}

View File

@ -1,8 +1,12 @@
package com.mcwl.resource.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ModelVersion;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @AuthorChenYan
@ -14,4 +18,8 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ModelVersionMapper extends BaseMapper<ModelVersion> {
void addModelVersion(@Param("modelProduct") ModelProduct modelProduct, @Param("modelVersionList") List<ModelVersion> modelVersionList);
}

View File

@ -14,5 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface WorkFlowMapper extends BaseMapper<WorkFlow> {
void updateWorkFlow(WorkFlow workFlow);
}

View File

@ -1,8 +1,12 @@
package com.mcwl.resource.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.WorkFlowVersion;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
@ -13,4 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface WorkFlowVersionMapper extends BaseMapper<WorkFlowVersion> {
void addWorkFlowVersion(@Param("workFlow") WorkFlow workFlow, @Param("list") List<WorkFlowVersion> workFlowVersionList);
void updateWorkFlowVersion(WorkFlowVersion workFlowVersion);
}

View File

@ -2,11 +2,13 @@ package com.mcwl.resource.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.domain.IdsParam;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ModelVersion;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestModel;
import com.mcwl.resource.domain.vo.MallProductVo;
import java.util.List;
@ -27,4 +29,9 @@ public interface ModelService extends IService<ModelProduct> {
TableDataInfo listByPage(ModelImagePageRes imagePageRes);
AjaxResult addModel(RequestModel requestModel);
void updaModel(RequestModel requestModel);
}

View File

@ -1,5 +1,8 @@
package com.mcwl.resource.service;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.resource.domain.request.RequestWorkFlow;
/**
*
* @author DaiZibo
@ -8,4 +11,8 @@ package com.mcwl.resource.service;
*/
public interface WorkFlowService {
AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow);
void updateWorkFlow(RequestWorkFlow requestWorkFlow);
}

View File

@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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.core.redis.RedisCache;
@ -15,13 +17,20 @@ import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.resource.domain.ModelImage;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ModelVersion;
import com.mcwl.resource.domain.WorkFlowVersion;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
import com.mcwl.resource.domain.request.RequestModel;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.domain.vo.MallProductVo;
import com.mcwl.resource.domain.vo.ModelImageVo;
import com.mcwl.resource.mapper.MallProductMapper;
import com.mcwl.resource.mapper.ModelVersionMapper;
import com.mcwl.resource.service.ModelService;
import com.mcwl.system.service.ISysUserService;
import lombok.extern.log4j.Log4j;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -38,11 +47,14 @@ import java.util.Objects;
* @Description TODO
* @Date2024/12/30 18:22
*/
@Log4j2
@Service
public class MallProductServiceImpl extends ServiceImpl<MallProductMapper,ModelProduct> implements ModelService {
@Autowired
private RedisCache redisCache;
@Autowired
private ModelVersionMapper modelVersionMapper;
@Autowired
private MallProductMapper postMapper;
@Autowired
@ -137,6 +149,41 @@ public class MallProductServiceImpl extends ServiceImpl<MallProductMapper,ModelP
return rspData;
}
@Override
public AjaxResult addModel(RequestModel requestModel) {
//添加模型表数据
postMapper.insert(requestModel.getModelProduct());
log.info("获取到的入参:{}",requestModel.getModelProduct());
//批量添加版本
modelVersionMapper.addModelVersion(requestModel.getModelProduct(),requestModel.getModelVersionList());
return AjaxResult.success("添加成功,等待审核");
}
@Override
public void updaModel(RequestModel requestModel) {
//修改模版的信息
ModelProduct modelProduct = requestModel.getModelProduct();
if (ObjectUtils.isEmpty(modelProduct)){
}
if (StringUtils.isNotNull(modelProduct.getId())){
modelProduct.setAuditSatus(3);
postMapper.updateModel(requestModel.getModelProduct());
}
//修改工作流版本的信息
if (requestModel.getModelVersionList().size() != 0){
//批量修改
for (ModelVersion modelVersion : requestModel.getModelVersionList()) {
modelVersion.setAuditSatus(3);
modelVersionMapper.updateById(modelVersion);
}
}
}
}

View File

@ -1,6 +1,13 @@
package com.mcwl.resource.service.impl;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.resource.domain.WorkFlowVersion;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.mapper.WorkFlowMapper;
import com.mcwl.resource.mapper.WorkFlowVersionMapper;
import com.mcwl.resource.service.WorkFlowService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@ -10,8 +17,48 @@ import org.springframework.stereotype.Service;
* @apiNote
*/
@Slf4j
@Service
public class WorkFlowServiceImpl implements WorkFlowService {
@Autowired
private WorkFlowMapper flowMapper;
@Autowired
private WorkFlowVersionMapper workFlowVersionMapper;
@Override
public AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow) {
//添加模型表数据
flowMapper.insert(requestWorkFlow.getWorkFlow());
log.info("获取到的入参:{}",requestWorkFlow.getWorkFlow());
//批量添加版本
workFlowVersionMapper.addWorkFlowVersion(requestWorkFlow.getWorkFlow(),requestWorkFlow.getWorkFlowVersionList());
return AjaxResult.success("添加成功,等待审核");
}
@Override
public void updateWorkFlow(RequestWorkFlow requestWorkFlow) {
//修改工作流的信息
if (requestWorkFlow.getWorkFlow().getId() != null){
requestWorkFlow.getWorkFlow().setAuditStatus(3);
flowMapper.updateWorkFlow(requestWorkFlow.getWorkFlow());
}
//修改工作流版本的信息
if (requestWorkFlow.getWorkFlowVersionList().size() != 0){
//批量修改
for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) {
workFlowVersion.setAuditStatus(3);
workFlowVersionMapper.updateWorkFlowVersion(workFlowVersion);
}
}
}
}

View File

@ -1,6 +1,6 @@
package com.mcwl.resource.service.impl;
import com.mcwl.resource.service.WorkFlowService;
import com.mcwl.resource.service.WorkFlowVersionService;
import org.springframework.stereotype.Service;
/**
@ -11,6 +11,6 @@ import org.springframework.stereotype.Service;
*/
@Service
public class WorkFlowVersionServiceImpl implements WorkFlowService {
public class WorkFlowVersionServiceImpl implements WorkFlowVersionService {
}

View File

@ -3,7 +3,72 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.MallProductMapper">
<update id="updateModel">
update model
<set>
<if test="modelName != null and modelName != ''">
model_name = #{modelName},
</if>
<if test="versionDescription != null and versionDescription != ''">
version_description = #{versionDescription},
</if>
<if test="updateBy != null and updateBy != ''">
update_by = #{updateBy},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="modelTypeId != null">
model_type_id = #{modelTypeId},
</if>
<if test="category != null and category != ''">
category = #{category},
</if>
<if test="functions != null and functions != ''">
functions = #{functions},
</if>
<if test="tags != null and tags != ''">
tags = #{tags},
</if>
<if test="activityId != null and activityId != ''">
activity_id = #{activityId},
</if>
<if test="isOriginal != null">
is_original = #{isOriginal},
</if>
<if test="originalAuthorName != null and originalAuthorName != ''">
original_author_name = #{originalAuthorName},
</if>
<if test="reals != null">
reals = #{reals},
</if>
<if test="numbers != null">
numbers = #{numbers},
</if>
<if test="auditSatus != null">
audit_satus = #{auditSatus},
</if>
<if test="isRecommend != null">
is_recommend = #{isRecommend},
</if>
<if test="delFlag != null and delFlag != ''">
del_flag = #{delFlag},
</if>
<if test="remark != null and remark != ''">
remark = #{remark},
</if>
<if test="auditText != null and auditText != ''">
audit_text = #{auditText},
</if>
<if test="userId != null">
user_id = #{userId},
</if>
<if test="versionId != null">
version_id = #{versionId},
</if>
</set>
where id = #{id}
</update>
<select id="sumNumber" resultType="java.lang.Long">

View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.ModelVersionMapper">
<insert id="addModelVersion">
INSERT INTO model_version (
version_name, model_type, file_path, trigger_words, sampling, high, vae, cfg,
is_free, is_public, is_encrypt, is_online_use, allow_download_image,
allow_software_use, allow_fusion, allow_commercial_use, allow_usage,
is_exclusive_model, sample_image_paths, hide_image_gen_info, audit_status,
audit_text, del_flag
)
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.versionName}, #{item.modelType}, #{item.filePath}, #{item.triggerWords},
#{item.sampling}, #{item.high}, #{item.vae}, #{item.cfg},
#{item.isFree}, #{item.isPublic}, #{item.isEncrypt}, #{item.isOnlineUse},
#{item.allowDownloadImage}, #{item.allowSoftwareUse}, #{item.allowFusion},
#{item.allowCommercialUse}, #{item.allowUsage}, #{item.isExclusiveModel},
#{item.sampleImagePaths}, #{item.hideImageGenInfo}, #{item.auditStatus},
#{item.auditText}, #{item.delFlag}
)
</foreach>
</insert>
</mapper>

View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.WorkFlowMapper">
<update id="updateWorkFlow">
UPDATE work_flow
<set>
<if test="workflowName != null and workflowName != ''">
workflow_name = #{workflowName},
</if>
<if test="category != null and category != ''">
category = #{category},
</if>
<if test="theme != null and theme != ''">
theme = #{theme},
</if>
<if test="style != null and style != ''">
style = #{style},
</if>
<if test="functions != null and functions != ''">
functions = #{functions},
</if>
<if test="activityParticipation != null">
activity_participation = #{activityParticipation}
</if>
<if test="auditStatus != null and auditStatus != ''">
audit_status = #{auditStatus}
</if>
</set>
WHERE id = #{id}
</update>
</mapper>

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.WorkFlowVersionMapper">
<insert id="addWorkFlowVersion">
INSERT INTO work_flow_version (version_name,version_description,file_path,image_paths,hide_gen_info,del_flag,
audit_status,work_flow_id,basic_model,jurisdiction,itself_use,subordinate_use,
download,fuse,sell,fuse_sell,exclusive,file_name)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.versionName}, #{item.versionDescription}, #{item.filePath}, #{item.imagePaths},#{item.hideGenInfo},
0,#{item.auditStatus},#{workFlow.id},#{item.basicModel},#{item.jurisdiction},#{item.itselfUse},
#{item.subordinateUse},#{item.download},#{item.fuse},#{item.sell},#{item.fuseSell},#{item.exclusive},#{item.fileName})
</foreach>
</insert>
<update id="updateWorkFlowVersion">
-- update work_flow_version
</update>
</mapper>