BUGFIX:对项目进行各种生成修改时没有更新项目更新时间
This commit is contained in:
@@ -40,6 +40,9 @@ public class DesignSingleIncludeLayersDTO implements Serializable {
|
|||||||
@ApiModelProperty("模特类型 System || Library")
|
@ApiModelProperty("模特类型 System || Library")
|
||||||
private String modelType;
|
private String modelType;
|
||||||
|
|
||||||
|
@ApiModelProperty("项目id")
|
||||||
|
private Long projectId;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "DesignSingleIncludeLayersDTO{" +
|
return "DesignSingleIncludeLayersDTO{" +
|
||||||
|
|||||||
@@ -1,19 +1,9 @@
|
|||||||
package com.ai.da.service;
|
package com.ai.da.service;
|
||||||
|
|
||||||
import com.ai.da.mapper.primary.entity.Design;
|
|
||||||
import com.ai.da.mapper.primary.entity.Project;
|
import com.ai.da.mapper.primary.entity.Project;
|
||||||
import com.ai.da.model.dto.*;
|
|
||||||
import com.ai.da.model.vo.CollectionSketchVO;
|
|
||||||
import com.ai.da.model.vo.DesignCollectionVO;
|
|
||||||
import com.ai.da.model.vo.DesignItemDetailVO;
|
|
||||||
import com.ai.da.model.vo.DesignLikeVO;
|
|
||||||
import com.ai.da.python.vo.DesignPythonObjects;
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -31,4 +21,6 @@ public interface ProjectService extends IService<Project> {
|
|||||||
Integer getOrCreateSequence();
|
Integer getOrCreateSequence();
|
||||||
|
|
||||||
void clearLockedSequence(Long accountId);
|
void clearLockedSequence(Long accountId);
|
||||||
|
|
||||||
|
void modifyProjectUpdateTime(Long projectId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,6 +93,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
private String partialDesignBucket;
|
private String partialDesignBucket;
|
||||||
@Autowired
|
@Autowired
|
||||||
private RedisUtil redisUtil;
|
private RedisUtil redisUtil;
|
||||||
|
@Resource
|
||||||
|
private ProjectService projectService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Long saveOne(DesignItem designItem) {
|
public Long saveOne(DesignItem designItem) {
|
||||||
@@ -593,11 +595,11 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
// 如果当前item被like过,需要更新t_user_like表和t_user_like_group表
|
// 如果当前item被like过,需要更新t_user_like表和t_user_like_group表
|
||||||
if (!designSingleIncludeLayersDTO.getIsPreview()){
|
if (!designSingleIncludeLayersDTO.getIsPreview()){
|
||||||
updateUserLikeDate(designSingleIncludeLayersDTO.getDesignItemId(),designSingleIncludeLayersDTO.getTimeZone());
|
updateUserLikeDate(designSingleIncludeLayersDTO.getDesignItemId(),designSingleIncludeLayersDTO.getTimeZone());
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(designSingleIncludeLayersDTO.getProjectId());
|
||||||
}else {
|
}else {
|
||||||
updateUserLikeConvertStatus(designSingleIncludeLayersDTO.getDesignItemId(),designSingleIncludeLayersDTO.getTimeZone());
|
updateUserLikeConvertStatus(designSingleIncludeLayersDTO.getDesignItemId(),designSingleIncludeLayersDTO.getTimeZone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return assembleDesignSingleResponse(designItem.getId(),
|
return assembleDesignSingleResponse(designItem.getId(),
|
||||||
minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
|
minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
|
||||||
outfit.getString("synthesis_url"),
|
outfit.getString("synthesis_url"),
|
||||||
|
|||||||
@@ -1225,6 +1225,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
designItemService.updateLikeStatus(designLikeDTO.getDesignItemId(), (byte) 1);
|
designItemService.updateLikeStatus(designLikeDTO.getDesignItemId(), (byte) 1);
|
||||||
// 记录喜欢的系统sketch
|
// 记录喜欢的系统sketch
|
||||||
addSystemLikeSketch(designItem);
|
addSystemLikeSketch(designItem);
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(designLikeDTO.getProjectId());
|
||||||
return new DesignLikeVO(userLikeSortId, userGroupId, groupDetailId, pictureName, userLike.getId(), userLikeSort.getSort());
|
return new DesignLikeVO(userLikeSortId, userGroupId, groupDetailId, pictureName, userLike.getId(), userLikeSort.getSort());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1373,6 +1375,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
deleteCollectionSort(userLike.getId(), CollectionType.DESIGN.getValue(), disDesignLikeDTO.getProjectId(), null);
|
deleteCollectionSort(userLike.getId(), CollectionType.DESIGN.getValue(), disDesignLikeDTO.getProjectId(), null);
|
||||||
//删除对应的history
|
//删除对应的history
|
||||||
userLikeService.removeById(disDesignLikeDTO.getGroupDetailId());
|
userLikeService.removeById(disDesignLikeDTO.getGroupDetailId());
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(disDesignLikeDTO.getProjectId());
|
||||||
return Boolean.TRUE;
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -95,6 +95,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
|
|||||||
private SketchReconstructionMapper sketchReconstructionMapper;
|
private SketchReconstructionMapper sketchReconstructionMapper;
|
||||||
@Resource
|
@Resource
|
||||||
private SendRequestUtil sendRequestUtil;
|
private SendRequestUtil sendRequestUtil;
|
||||||
|
@Resource
|
||||||
|
private ProjectService projectService;
|
||||||
|
|
||||||
@Value("${redis.key.orderForGenerate}")
|
@Value("${redis.key.orderForGenerate}")
|
||||||
private String consumptionOrderKey;
|
private String consumptionOrderKey;
|
||||||
@@ -1176,6 +1178,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
|
|||||||
ToProductImageResultVO toProductImageResultVO = new ToProductImageResultVO();
|
ToProductImageResultVO toProductImageResultVO = new ToProductImageResultVO();
|
||||||
toProductImageResultVO.setTaskId(taskId);
|
toProductImageResultVO.setTaskId(taskId);
|
||||||
toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort);
|
toProductImageResultVO.setSort(Objects.isNull(reSort) ? sort : reSort);
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(projectId);
|
||||||
return toProductImageResultVO;
|
return toProductImageResultVO;
|
||||||
}
|
}
|
||||||
throw new BusinessException("pose transformation error", ResultEnum.ERROR.getCode());
|
throw new BusinessException("pose transformation error", ResultEnum.ERROR.getCode());
|
||||||
@@ -1351,6 +1355,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(collectionSort)) {
|
if (Objects.nonNull(collectionSort)) {
|
||||||
|
projectService.modifyProjectUpdateTime(projectId);
|
||||||
return collectionSort;
|
return collectionSort;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.ai.da.mapper.primary.*;
|
|||||||
import com.ai.da.mapper.primary.entity.*;
|
import com.ai.da.mapper.primary.entity.*;
|
||||||
import com.ai.da.service.*;
|
import com.ai.da.service.*;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -92,4 +93,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|||||||
.set(BatchTaskSequence::getLockedSeq, null)
|
.set(BatchTaskSequence::getLockedSeq, null)
|
||||||
.eq(BatchTaskSequence::getAccountId, accountId));
|
.eq(BatchTaskSequence::getAccountId, accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void modifyProjectUpdateTime(Long projectId){
|
||||||
|
baseMapper.update(null,
|
||||||
|
new UpdateWrapper<Project>()
|
||||||
|
.eq("id", projectId)
|
||||||
|
.set("update_time", LocalDateTime.now())
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -110,7 +110,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
@Resource
|
@Resource
|
||||||
private ClassificationService classificationService;
|
private ClassificationService classificationService;
|
||||||
@Resource
|
@Resource
|
||||||
private ProjectMapper projectMapper;
|
// private ProjectMapper projectMapper;
|
||||||
|
private ProjectService projectService;
|
||||||
@Resource
|
@Resource
|
||||||
private PortfolioService portfolioService;
|
private PortfolioService portfolioService;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -261,7 +262,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
@Override
|
@Override
|
||||||
public ProjectChooseVO choose(ProjectDTO projectDTO) {
|
public ProjectChooseVO choose(ProjectDTO projectDTO) {
|
||||||
|
|
||||||
Project project = projectMapper.selectById(projectDTO.getId());
|
Project project = projectService.getById(projectDTO.getId());
|
||||||
|
|
||||||
Long workspaceId = workspaceService.getByProjectId(project.getId());
|
Long workspaceId = workspaceService.getByProjectId(project.getId());
|
||||||
WorkspaceVO workspaceVO = new WorkspaceVO();
|
WorkspaceVO workspaceVO = new WorkspaceVO();
|
||||||
@@ -551,6 +552,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
// 添加积分扣除记录到db
|
// 添加积分扣除记录到db
|
||||||
creditsService.preInsert(userHolder.getId(), creditsEventsEnum.getName(), taskId, Boolean.TRUE, null);
|
creditsService.preInsert(userHolder.getId(), creditsEventsEnum.getName(), taskId, Boolean.TRUE, null);
|
||||||
}
|
}
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(toProductImageDTO.getProjectId());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -696,6 +699,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
collectionSort = designService.addCollectionSort(toProductImageResult1.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), productImageLikeDTO.getProjectId(), productImageLikeDTO.getCollectionSortParentId());
|
collectionSort = designService.addCollectionSort(toProductImageResult1.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), productImageLikeDTO.getProjectId(), productImageLikeDTO.getCollectionSortParentId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(productImageLikeDTO.getProjectId());
|
||||||
return collectionSort;
|
return collectionSort;
|
||||||
}
|
}
|
||||||
@Resource
|
@Resource
|
||||||
@@ -718,7 +723,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
}
|
}
|
||||||
// 判断当任务从哪个模型获取结果
|
// 判断当任务从哪个模型获取结果
|
||||||
if (!StringUtil.isNullOrEmpty(toProductImageResult.getModelName()) && toProductImageResult.getModelName().equals("flux")){
|
if (!StringUtil.isNullOrEmpty(toProductImageResult.getModelName()) && toProductImageResult.getModelName().equals("flux")){
|
||||||
Project project = projectMapper.selectById(toProductImageResult.getProjectId());
|
Project project = projectService.getById(toProductImageResult.getProjectId());
|
||||||
if (Objects.isNull(project)){
|
if (Objects.isNull(project)){
|
||||||
throw new BusinessException("unknown project");
|
throw new BusinessException("unknown project");
|
||||||
}
|
}
|
||||||
@@ -964,6 +969,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60));
|
toProductImageResultVO.setSourceUrl(minioUtil.getPreSignedUrl(toProductImageResult1.getUrl(), 24 * 60));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(toProductImageDTO.getProjectId());
|
||||||
return toProductImageResultVOS;
|
return toProductImageResultVOS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -985,6 +992,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(productImageLikeDTO.getProjectId());
|
||||||
return Boolean.TRUE;
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1173,7 +1182,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
// 添加积分扣除记录到db
|
// 添加积分扣除记录到db
|
||||||
creditsService.preInsert(userHolder.getId(), creditsEventsEnum.getName(), taskId, Boolean.TRUE, null);
|
creditsService.preInsert(userHolder.getId(), creditsEventsEnum.getName(), taskId, Boolean.TRUE, null);
|
||||||
}
|
}
|
||||||
|
// 更新项目更新时间
|
||||||
|
projectService.modifyProjectUpdateTime(toProductImageDTO.getProjectId());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1191,7 +1201,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
// 判断当任务从哪个模型获取结果
|
// 判断当任务从哪个模型获取结果
|
||||||
if (!StringUtil.isNullOrEmpty(toProductImageResult.getModelName())
|
if (!StringUtil.isNullOrEmpty(toProductImageResult.getModelName())
|
||||||
&& toProductImageResult.getModelName().equals("flux")){
|
&& toProductImageResult.getModelName().equals("flux")){
|
||||||
Project project = projectMapper.selectById(toProductImageResult.getProjectId());
|
Project project = projectService.getById(toProductImageResult.getProjectId());
|
||||||
if (Objects.isNull(project)){
|
if (Objects.isNull(project)){
|
||||||
throw new BusinessException("unknown project");
|
throw new BusinessException("unknown project");
|
||||||
}
|
}
|
||||||
@@ -1610,7 +1620,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
}else {
|
}else {
|
||||||
queryWrapper.orderByDesc("update_time");
|
queryWrapper.orderByDesc("update_time");
|
||||||
}
|
}
|
||||||
IPage<Project> page = projectMapper.selectPage(
|
IPage<Project> page = projectService.page(
|
||||||
new Page<>(query.getPage(), query.getSize()), queryWrapper);
|
new Page<>(query.getPage(), query.getSize()), queryWrapper);
|
||||||
if (CollectionUtils.isEmpty(page.getRecords())) {
|
if (CollectionUtils.isEmpty(page.getRecords())) {
|
||||||
return new Page<>();
|
return new Page<>();
|
||||||
@@ -2057,7 +2067,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
ModuleChooseVO result = new ModuleChooseVO();
|
ModuleChooseVO result = new ModuleChooseVO();
|
||||||
Long accountId = UserContext.getUserHolder().getId();
|
Long accountId = UserContext.getUserHolder().getId();
|
||||||
Long projectId = moduleSaveDTO.getProjectId();
|
Long projectId = moduleSaveDTO.getProjectId();
|
||||||
Project project = projectMapper.selectById(projectId);
|
Project project = projectService.getById(projectId);
|
||||||
|
|
||||||
boolean boundingBox = false;
|
boolean boundingBox = false;
|
||||||
if (Objects.nonNull(moduleSaveDTO.getMoodBoard())) {
|
if (Objects.nonNull(moduleSaveDTO.getMoodBoard())) {
|
||||||
@@ -2422,7 +2432,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
result.setBoundingBox(voList);
|
result.setBoundingBox(voList);
|
||||||
}
|
}
|
||||||
project.setUpdateTime(LocalDateTime.now());
|
project.setUpdateTime(LocalDateTime.now());
|
||||||
projectMapper.updateById(project);
|
projectService.updateById(project);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2689,7 +2699,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean delete(Long projectId) {
|
public Boolean delete(Long projectId) {
|
||||||
projectMapper.deleteById(projectId);
|
projectService.removeById(projectId);
|
||||||
return Boolean.TRUE;
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user