|
@@ -1,27 +1,14 @@
|
|
|
package com.cyksj.service.midjourney.impl;
|
|
package com.cyksj.service.midjourney.impl;
|
|
|
|
|
|
|
|
-import cn.hutool.core.collection.CollectionUtil;
|
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
import cn.hutool.core.date.DateTime;
|
|
|
-import cn.hutool.core.date.DateUnit;
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.lang.UUID;
|
|
import cn.hutool.core.lang.UUID;
|
|
|
-import cn.hutool.core.map.MapUtil;
|
|
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
-import cn.hutool.http.HttpRequest;
|
|
|
|
|
-import cn.hutool.http.HttpUtil;
|
|
|
|
|
-import cn.hutool.json.JSONArray;
|
|
|
|
|
-import cn.hutool.json.JSONObject;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
-import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
|
|
|
|
|
-import com.cyksj.common.util.Jsons;
|
|
|
|
|
import com.cyksj.common.util.StringUtil;
|
|
import com.cyksj.common.util.StringUtil;
|
|
|
import com.cyksj.mapper.*;
|
|
import com.cyksj.mapper.*;
|
|
|
-import com.cyksj.model.dto.BlendDimensions;
|
|
|
|
|
-import com.cyksj.model.dto.MessageButton;
|
|
|
|
|
import com.cyksj.model.entity.*;
|
|
import com.cyksj.model.entity.*;
|
|
|
-import com.cyksj.model.response.SubmitResult;
|
|
|
|
|
import com.cyksj.redis.RedisService;
|
|
import com.cyksj.redis.RedisService;
|
|
|
import com.cyksj.service.midjourney.MidjourneyService;
|
|
import com.cyksj.service.midjourney.MidjourneyService;
|
|
|
import com.cyksj.service.sys.SysConfigService;
|
|
import com.cyksj.service.sys.SysConfigService;
|
|
@@ -29,17 +16,10 @@ import com.cyksj.service.user.UserBindRelationService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
-import javax.imageio.stream.FileImageOutputStream;
|
|
|
|
|
-import java.io.IOException;
|
|
|
|
|
-import java.nio.file.Files;
|
|
|
|
|
-import java.nio.file.Path;
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
-import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* @author zwhui
|
|
* @author zwhui
|
|
@@ -173,7 +153,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
|
|
|
midjourneyUser.setMjRelaxNum(0);
|
|
midjourneyUser.setMjRelaxNum(0);
|
|
|
} else {
|
|
} else {
|
|
|
midjourneyUser.setMjFastNum(goodsDonSku.getMjFastNum());
|
|
midjourneyUser.setMjFastNum(goodsDonSku.getMjFastNum());
|
|
|
- midjourneyUser.setMjRelaxNum((goodsDonSku.getMjRelaxNum() == null || goodsDonSku.getMjRelaxNum() == 0) ? null : goodsDonSku.getMjRelaxNum());
|
|
|
|
|
|
|
+ midjourneyUser.setMjRelaxNum(goodsDonSku.getMjRelaxNum() == null ? null : goodsDonSku.getMjRelaxNum());
|
|
|
}
|
|
}
|
|
|
midjourneyUser.setAqType(groupsRelation.getAqType());
|
|
midjourneyUser.setAqType(groupsRelation.getAqType());
|
|
|
try {
|
|
try {
|