Compare commits
No commits in common. "2d0a5dcb385cc8c2e167f3522fe88fdebd1baa7f" and "573ccd5ef8cdc0b001fbab5aa158844e88918fea" have entirely different histories.
2d0a5dcb38
...
573ccd5ef8
|
@ -7,8 +7,6 @@ import com.mcwl.common.core.page.TableDataInfo;
|
||||||
import com.mcwl.common.utils.SecurityUtils;
|
import com.mcwl.common.utils.SecurityUtils;
|
||||||
import com.mcwl.resource.domain.ModelProduct;
|
import com.mcwl.resource.domain.ModelProduct;
|
||||||
import com.mcwl.resource.domain.dto.ModelImagePageRes;
|
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.MallProductVo;
|
||||||
import com.mcwl.resource.service.ModelService;
|
import com.mcwl.resource.service.ModelService;
|
||||||
import com.mcwl.system.service.ISysUserService;
|
import com.mcwl.system.service.ISysUserService;
|
||||||
|
@ -33,7 +31,8 @@ import java.util.List;
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/model")
|
@RequestMapping("/model")
|
||||||
public class MallProductController extends BaseController {
|
public class MallProductController extends BaseController {
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService sysUserService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ModelService modelService;
|
private ModelService modelService;
|
||||||
|
@ -104,29 +103,26 @@ public class MallProductController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@PostMapping("insert")
|
||||||
@PostMapping("/insert")
|
public AjaxResult insert(@RequestBody ModelProduct modelVersion)
|
||||||
public AjaxResult addupdateModel(@RequestBody RequestModel requestModel){
|
{
|
||||||
ModelProduct modelProduct = requestModel.getModelProduct();
|
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getUserId();
|
||||||
modelProduct.setUserId(userId);
|
modelVersion.setUserId(userId);
|
||||||
modelProduct.setCreateBy(getUsername());
|
modelVersion.setCreateBy(getUsername());
|
||||||
return modelService.addModel(requestModel);
|
modelService.save(modelVersion);
|
||||||
|
return AjaxResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/update")
|
@PostMapping("update")
|
||||||
public AjaxResult updateModel(@RequestBody RequestModel requestModel){
|
public AjaxResult update(@RequestBody ModelProduct modelVersion)
|
||||||
ModelProduct modelProduct = requestModel.getModelProduct();
|
{
|
||||||
|
|
||||||
Long userId = SecurityUtils.getUserId();
|
Long userId = SecurityUtils.getUserId();
|
||||||
modelProduct.setUserId(userId);
|
modelVersion.setUserId(userId);
|
||||||
modelProduct.setUpdateBy(getUsername());
|
modelVersion.setUpdateBy(getUsername());
|
||||||
modelService.updaModel(requestModel);
|
modelService.updateById(modelVersion);
|
||||||
|
return AjaxResult.success();
|
||||||
return AjaxResult.success("修改成功");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("delete")
|
@PostMapping("delete")
|
||||||
public AjaxResult delete(@RequestBody ModelProduct modelVersion)
|
public AjaxResult delete(@RequestBody ModelProduct modelVersion)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,11 +2,11 @@ package com.mcwl.web.controller.resource;
|
||||||
|
|
||||||
import com.mcwl.common.core.controller.BaseController;
|
import com.mcwl.common.core.controller.BaseController;
|
||||||
import com.mcwl.common.core.domain.AjaxResult;
|
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 com.mcwl.web.controller.common.OssUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,10 +25,9 @@ import org.springframework.web.multipart.MultipartFile;
|
||||||
public class WorkFlowController extends BaseController {
|
public class WorkFlowController extends BaseController {
|
||||||
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private WorkFlowServiceImpl workFlowService;
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
|
*
|
||||||
* 图片
|
* 图片
|
||||||
* @param file
|
* @param file
|
||||||
* @return
|
* @return
|
||||||
|
@ -40,6 +39,7 @@ public class WorkFlowController extends BaseController {
|
||||||
return AjaxResult.success(s);
|
return AjaxResult.success(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
*
|
*
|
||||||
* zip
|
* zip
|
||||||
|
@ -53,6 +53,8 @@ public class WorkFlowController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
*
|
*
|
||||||
* 下载zip
|
* 下载zip
|
||||||
|
@ -66,20 +68,6 @@ public class WorkFlowController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/addWorkFlow")
|
// @PostMapping("/add")
|
||||||
public AjaxResult addWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow){
|
// public AjaxResult
|
||||||
|
|
||||||
return workFlowService.addWorkFlow(requestWorkFlow);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/updateWorkFlow")
|
|
||||||
public AjaxResult updateWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow){
|
|
||||||
|
|
||||||
workFlowService.updateWorkFlow(requestWorkFlow);
|
|
||||||
|
|
||||||
return AjaxResult.success("修改成功");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,29 +56,4 @@ public class WorkFlow {
|
||||||
*/
|
*/
|
||||||
private String del_flag;
|
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;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,74 +44,9 @@ public class WorkFlowVersion {
|
||||||
/**
|
/**
|
||||||
* 是否隐藏图片生成信息
|
* 是否隐藏图片生成信息
|
||||||
*/
|
*/
|
||||||
private Integer hideGenInfo;
|
private String hideGenInfo;
|
||||||
/**
|
/**
|
||||||
* 删除标志(0代表存在 2代表删除)
|
* 删除标志(0代表存在 2代表删除)
|
||||||
*/
|
*/
|
||||||
private String delFlag;
|
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;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -27,6 +27,5 @@ public interface MallProductMapper extends BaseMapper<ModelProduct> {
|
||||||
Long sumNumber(@Param("userId") Long userId);
|
Long sumNumber(@Param("userId") Long userId);
|
||||||
|
|
||||||
|
|
||||||
void updateModel(ModelProduct modelProduct);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
package com.mcwl.resource.mapper;
|
package com.mcwl.resource.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.mcwl.resource.domain.ModelProduct;
|
|
||||||
import com.mcwl.resource.domain.ModelVersion;
|
import com.mcwl.resource.domain.ModelVersion;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author:ChenYan
|
* @Author:ChenYan
|
||||||
|
@ -18,8 +14,4 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface ModelVersionMapper extends BaseMapper<ModelVersion> {
|
public interface ModelVersionMapper extends BaseMapper<ModelVersion> {
|
||||||
void addModelVersion(@Param("modelProduct") ModelProduct modelProduct, @Param("modelVersionList") List<ModelVersion> modelVersionList);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface WorkFlowMapper extends BaseMapper<WorkFlow> {
|
public interface WorkFlowMapper extends BaseMapper<WorkFlow> {
|
||||||
|
|
||||||
void updateWorkFlow(WorkFlow workFlow);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
package com.mcwl.resource.mapper;
|
package com.mcwl.resource.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.mcwl.resource.domain.WorkFlow;
|
|
||||||
import com.mcwl.resource.domain.WorkFlowVersion;
|
import com.mcwl.resource.domain.WorkFlowVersion;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工作流版本 业务实现层
|
* 工作流版本 业务实现层
|
||||||
|
@ -17,9 +13,4 @@ import java.util.List;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface WorkFlowVersionMapper extends BaseMapper<WorkFlowVersion> {
|
public interface WorkFlowVersionMapper extends BaseMapper<WorkFlowVersion> {
|
||||||
|
|
||||||
void addWorkFlowVersion(@Param("workFlow") WorkFlow workFlow, @Param("list") List<WorkFlowVersion> workFlowVersionList);
|
|
||||||
|
|
||||||
void updateWorkFlowVersion(WorkFlowVersion workFlowVersion);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,11 @@ package com.mcwl.resource.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
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.core.page.TableDataInfo;
|
||||||
import com.mcwl.common.domain.IdsParam;
|
import com.mcwl.common.domain.IdsParam;
|
||||||
import com.mcwl.resource.domain.ModelProduct;
|
import com.mcwl.resource.domain.ModelProduct;
|
||||||
import com.mcwl.resource.domain.ModelVersion;
|
import com.mcwl.resource.domain.ModelVersion;
|
||||||
import com.mcwl.resource.domain.dto.ModelImagePageRes;
|
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.MallProductVo;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -29,9 +27,4 @@ public interface ModelService extends IService<ModelProduct> {
|
||||||
|
|
||||||
TableDataInfo listByPage(ModelImagePageRes imagePageRes);
|
TableDataInfo listByPage(ModelImagePageRes imagePageRes);
|
||||||
|
|
||||||
AjaxResult addModel(RequestModel requestModel);
|
|
||||||
|
|
||||||
|
|
||||||
void updaModel(RequestModel requestModel);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
package com.mcwl.resource.service;
|
package com.mcwl.resource.service;
|
||||||
|
|
||||||
import com.mcwl.common.core.domain.AjaxResult;
|
|
||||||
import com.mcwl.resource.domain.request.RequestWorkFlow;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工作流 业务层
|
* 工作流 业务层
|
||||||
* @author DaiZibo
|
* @author DaiZibo
|
||||||
|
@ -11,8 +8,4 @@ import com.mcwl.resource.domain.request.RequestWorkFlow;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public interface WorkFlowService {
|
public interface WorkFlowService {
|
||||||
AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow);
|
|
||||||
|
|
||||||
void updateWorkFlow(RequestWorkFlow requestWorkFlow);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,11 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
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.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.mcwl.common.constant.HttpStatus;
|
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.domain.entity.SysUser;
|
||||||
import com.mcwl.common.core.page.TableDataInfo;
|
import com.mcwl.common.core.page.TableDataInfo;
|
||||||
import com.mcwl.common.core.redis.RedisCache;
|
import com.mcwl.common.core.redis.RedisCache;
|
||||||
|
@ -17,20 +15,13 @@ import com.mcwl.common.utils.SecurityUtils;
|
||||||
import com.mcwl.common.utils.StringUtils;
|
import com.mcwl.common.utils.StringUtils;
|
||||||
import com.mcwl.resource.domain.ModelImage;
|
import com.mcwl.resource.domain.ModelImage;
|
||||||
import com.mcwl.resource.domain.ModelProduct;
|
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.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.MallProductVo;
|
||||||
import com.mcwl.resource.domain.vo.ModelImageVo;
|
import com.mcwl.resource.domain.vo.ModelImageVo;
|
||||||
import com.mcwl.resource.mapper.MallProductMapper;
|
import com.mcwl.resource.mapper.MallProductMapper;
|
||||||
|
|
||||||
import com.mcwl.resource.mapper.ModelVersionMapper;
|
|
||||||
import com.mcwl.resource.service.ModelService;
|
import com.mcwl.resource.service.ModelService;
|
||||||
import com.mcwl.system.service.ISysUserService;
|
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.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@ -47,14 +38,11 @@ import java.util.Objects;
|
||||||
* @Description TODO
|
* @Description TODO
|
||||||
* @Date:2024/12/30 18:22
|
* @Date:2024/12/30 18:22
|
||||||
*/
|
*/
|
||||||
@Log4j2
|
|
||||||
@Service
|
@Service
|
||||||
public class MallProductServiceImpl extends ServiceImpl<MallProductMapper,ModelProduct> implements ModelService {
|
public class MallProductServiceImpl extends ServiceImpl<MallProductMapper,ModelProduct> implements ModelService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private RedisCache redisCache;
|
private RedisCache redisCache;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ModelVersionMapper modelVersionMapper;
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private MallProductMapper postMapper;
|
private MallProductMapper postMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
@ -149,41 +137,6 @@ public class MallProductServiceImpl extends ServiceImpl<MallProductMapper,ModelP
|
||||||
return rspData;
|
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,6 @@
|
||||||
package com.mcwl.resource.service.impl;
|
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 com.mcwl.resource.service.WorkFlowService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,48 +10,8 @@ import org.springframework.stereotype.Service;
|
||||||
* @apiNote
|
* @apiNote
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@Service
|
@Service
|
||||||
public class WorkFlowServiceImpl implements WorkFlowService {
|
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package com.mcwl.resource.service.impl;
|
package com.mcwl.resource.service.impl;
|
||||||
|
|
||||||
import com.mcwl.resource.service.WorkFlowVersionService;
|
import com.mcwl.resource.service.WorkFlowService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -11,6 +11,6 @@ import org.springframework.stereotype.Service;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class WorkFlowVersionServiceImpl implements WorkFlowVersionService {
|
public class WorkFlowVersionServiceImpl implements WorkFlowService {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,72 +3,7 @@
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.mcwl.resource.mapper.MallProductMapper">
|
<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">
|
<select id="sumNumber" resultType="java.lang.Long">
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
<?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>
|
|
|
@ -1,34 +0,0 @@
|
||||||
<?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>
|
|
|
@ -1,22 +0,0 @@
|
||||||
<?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>
|
|
Loading…
Reference in New Issue