修改提取的sketch

2024-09-27 15:40:30 +08:00
parent 33d5d3a2ea
commit f432b8cce6
10 changed files with 68 additions and 43 deletions
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -995,7 +995,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
        // 未迁移过的进行迁移，注意模特数据迁移打点信息以及转换模特格式
    }

-    public void updateCredits(Long accountId, String value) {
+    public void updateCreditsAndEndTime(Long accountId, String value) {
        Account account = new Account();
        account.setId(accountId);
        account.setCredits(new BigDecimal(value));
@@ -1006,7 +1006,10 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
        Account account = new Account();
        account.setId(accountId);
        account.setCredits(new BigDecimal(value));
-        account.setValidEndTime(toDayEnd(endTime));
+        if (!Objects.isNull(endTime)){
+            account.setValidEndTime(toDayEnd(endTime));
+        }
+        account.setUpdateDate(new Date());
        accountMapper.updateById(account);
    }

--- a/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java
@@ -51,7 +51,7 @@ public class CreditsServiceImpl extends ServiceImpl<CreditsDetailMapper, Credits
        BigDecimal existingCredits = accountMapper.selectById(accountId).getCredits();
        BigDecimal newCredits = new BigDecimal(CreditsEventsEnum.BUY_CREDITS.getValue()).multiply(new BigDecimal(quantity));
        BigDecimal added = existingCredits.add(newCredits);
-        accountService.updateCredits(accountId, added.toString());
+        accountService.updateCreditsAndEndTime(accountId, added.toString(), null);
        return Boolean.TRUE;
    }

@@ -71,7 +71,7 @@ public class CreditsServiceImpl extends ServiceImpl<CreditsDetailMapper, Credits
        }
        BigDecimal existingCredits = accountMapper.selectById(accountId).getCredits();
        BigDecimal add = new BigDecimal(event.getValue()).add(existingCredits);
-        accountService.updateCredits(accountId, add.toString());
+        accountService.updateCreditsAndEndTime(accountId, add.toString(), null);
    }

    @Override
@@ -91,7 +91,7 @@ public class CreditsServiceImpl extends ServiceImpl<CreditsDetailMapper, Credits
        }
        BigDecimal existingCredits = accountMapper.selectById(accountId).getCredits();
        BigDecimal subtract = existingCredits.subtract(new BigDecimal(event.getValue()));
-        accountService.updateCredits(accountId, subtract.toString());
+        accountService.updateCreditsAndEndTime(accountId, subtract.toString(), null);
    }

    @Override
@@ -105,7 +105,7 @@ public class CreditsServiceImpl extends ServiceImpl<CreditsDetailMapper, Credits
        BigDecimal newCredits = new BigDecimal(CreditsEventsEnum.BUY_CREDITS.getValue()).multiply(new BigDecimal(quantity));
        BigDecimal subtracted = existingCredits.subtract(newCredits);
        // 更新t_account表
-        accountService.updateCredits(accountId, subtracted.toString());
+        accountService.updateCreditsAndEndTime(accountId, subtracted.toString(), null);
        // 更新t_credits_details表
        // 添加积分变更记录
        insertToCreditsDetail(accountId,
@@ -255,7 +255,7 @@ public class CreditsServiceImpl extends ServiceImpl<CreditsDetailMapper, Credits
        // 2、操作数据库，扣除积分
        BigDecimal existingCredits = accountMapper.selectById(accountId).getCredits();
        BigDecimal subtract = existingCredits.subtract(new BigDecimal(value));
-        accountService.updateCredits(accountId, subtract.toString());
+        accountService.updateCreditsAndEndTime(accountId, subtract.toString(), null);

        // 3、从redis中移除当前待扣积分
        redisUtil.removeFromString(key);
@@ -272,13 +272,13 @@ public class CreditsServiceImpl extends ServiceImpl<CreditsDetailMapper, Credits
    }

    @Override
-    public void preInsert(Long accountId, String changeEventName, String taskId) {
+    public void preInsert(Long accountId, String changeEventName, String taskId, Boolean isPreInsert, String changedCredits) {
        CreditsDetail creditsDetail = new CreditsDetail();
        Account account = accountMapper.selectById(accountId);
        creditsDetail.setAccountId(accountId);
        creditsDetail.setTaskId(taskId);
        creditsDetail.setChangeEvent(changeEventName);
-        creditsDetail.setChangedCredits("-0");
+        creditsDetail.setChangedCredits(isPreInsert ? "-0" : "-" + changedCredits);
        creditsDetail.setCredits(account.getCredits());
        creditsDetail.setCreateTime(LocalDateTime.now());

--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -22,16 +22,14 @@ import com.google.gson.Gson;
 import io.minio.errors.MinioException;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
 import java.io.IOException;
-import java.time.LocalDate;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;

 import static com.ai.da.common.enums.CollectionLevel1TypeEnum.*;
@@ -88,10 +86,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
    @Value("${access.python.generate_sr_port}")
    private String generateServicePort;

+    @Resource
+    private AccountService accountService;
+
    // 创建 Random 对象
    Random random = new Random();
-    @Autowired
-    private ProductServiceImpl productServiceImpl;

    @Override
    public GenerateCaptionVO generateCaption(Long sketchElementId) {
@@ -591,7 +590,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
        // 6、添加预扣除积分到redis
        creditsService.addRecordToCreditsDeduction(generateThroughImageTextDTO.getUserId(), uuid, creditsEventsEnum);
        // 6.1 添加积分扣除记录到db
-        creditsService.preInsert(generateThroughImageTextDTO.getUserId(), creditsEventsEnum.getName(), uuid);
+        creditsService.preInsert(generateThroughImageTextDTO.getUserId(), creditsEventsEnum.getName(), uuid, Boolean.TRUE, null);

        // 7、返回唯一id
        return new PrepareForGenerateVO(taskIdList, 2);
@@ -772,6 +771,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
    @Override
    @Transactional(rollbackFor = Exception.class)
    public GenerateResultVO imageToSketch(ImageToSketchDTO imageToSketchDTO) {
+
        String bucket = userBucket;
        Long accountId = UserContext.getUserHolder().getId();
        log.info("imageToSketch parameter : {}", imageToSketchDTO);
@@ -819,7 +819,12 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
        generateDetailMapper.insert(generateDetail);

        String clothCategory = pythonService.getClothCategory(sketchPath, imageToSketchDTO.getGender());
-        clothCategory = BusinessException.getMessageFromResource(clothCategory.toUpperCase());
+
+        CreditsEventsEnum event = CreditsEventsEnum.IMAGE_TO_SKETCH;
+        BigDecimal existingCredits = accountService.getById(accountId).getCredits();
+        BigDecimal subtract = existingCredits.subtract(new BigDecimal(event.getValue()));
+        accountService.updateCreditsAndEndTime(accountId, subtract.toString(), null);
+        creditsService.preInsert(accountId, event.getName(), null, Boolean.FALSE, event.getValue());

        return new GenerateResultVO(generateDetail.getId(), minioUtil.getPreSignedUrl(sketchPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME), "Success", clothCategory);
    }
@@ -828,7 +833,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
    // 输入 base64，以及 性别 分类，将图片添加到library
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public CollectionElementVO modifySketch(GenerateModifyDTO generateModifyDTO) {
+    public GenerateResultVO modifySketch(GenerateModifyDTO generateModifyDTO) {
        log.info("修改提取出的sketch,并加入到library");
        Long accountId = UserContext.getUserHolder().getId();
        String base64 = generateModifyDTO.getBase64();
@@ -836,28 +841,32 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
        String category = generateModifyDTO.getCategory();

        // 将base64上传到minio
-        String path = accountId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" + UUID.randomUUID();
+        String path;
+        GenerateDetail originalDetail = generateDetailMapper.selectById(generateModifyDTO.getOriginalId());
+        Long generateDetailId = originalDetail.getId();
+        if (generateModifyDTO.getIsOverride()){
+            path = originalDetail.getUrl();
+        }else {
+            path = accountId + "/sketchboard/" + gender.toLowerCase() + "/" + category + "/" + UUID.randomUUID();
+        }
+
        String minioPath = minioUtil.base64UploadToPath(base64, userBucket, path);

        log.info("修改后的图片 ： {}", minioPath);

-        // 存入db 保存到t_collection_element
-        CollectionElement collectionElement = new CollectionElement();
-        collectionElement.setAccountId(accountId);
-        collectionElement.setCollectionId(0L);
-        collectionElement.setLevel1Type(SKETCH_BOARD.getRealName());
-        collectionElement.setLevel2Type(generateModifyDTO.getCategory());
-        collectionElement.setName(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-        collectionElement.setUrl(minioPath);
-        collectionElement.setHasPin((byte)0);
-        collectionElement.setMd5(MD5Utils.encryptFile(minioUtil.getPreSignedUrl(minioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME), Boolean.FALSE));
-        collectionElement.setCreateDate(new Date());
-        collectionElementService.save(collectionElement);
+        // 存入db 保存到t_generate_detail
+        if (!generateModifyDTO.getIsOverride()){
+            GenerateDetail generateDetail = new GenerateDetail();
+            generateDetail.setGenerateId(originalDetail.getGenerateId());
+            generateDetail.setUrl(path);
+            generateDetail.setIsLike((byte)0);
+            generateDetail.setMd5(MD5Utils.encryptFile(minioUtil.getPreSignedUrl(minioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME), Boolean.FALSE));
+            generateDetail.setCreateDate(LocalDateTime.now());
+            generateDetailMapper.insert(generateDetail);

-        CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class);
-        collectionElementVO.setMinIOPath(collectionElementVO.getUrl());
-        collectionElementVO.setUrl(minioUtil.getPreSignedUrl(collectionElementVO.getUrl(), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-        collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
-        return collectionElementVO;
+            generateDetailId = generateDetail.getId();
+        }
+
+        return new GenerateResultVO(generateDetailId, minioUtil.getPreSignedUrl(minioPath, CommonConstant.MINIO_IMAGE_EXPIRE_TIME), "Success", category);
    }
 }