|
@@ -14,14 +14,16 @@ import com.poteviohealth.cgp.statistics.mapper.DistinctionMapper;
|
|
|
import com.poteviohealth.cgp.statistics.model.Distinction;
|
|
import com.poteviohealth.cgp.statistics.model.Distinction;
|
|
|
import com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO;
|
|
import com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO;
|
|
|
import com.poteviohealth.cgp.statistics.service.IDistinctionService;
|
|
import com.poteviohealth.cgp.statistics.service.IDistinctionService;
|
|
|
|
|
+import com.poteviohealth.cgp.statistics.utils.OssUtils;
|
|
|
import lombok.extern.log4j.Log4j2;
|
|
import lombok.extern.log4j.Log4j2;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
-import java.io.InputStream;
|
|
|
|
|
|
|
+import java.io.IOException;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
@@ -39,11 +41,14 @@ public class DistinctionServiceImpl extends BaseServiceImpl<DistinctionMapper, D
|
|
|
private CacheService cacheService;
|
|
private CacheService cacheService;
|
|
|
@Value("${sync.dbName}")
|
|
@Value("${sync.dbName}")
|
|
|
private String dbName;
|
|
private String dbName;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private OssUtils ossUtils;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public DistinctionDTO checkImg(InputStream inputStream, Long orderId, List<String> uidList) {
|
|
|
|
|
|
|
+ public DistinctionDTO checkImg(MultipartFile file, Long orderId, List<String> uidList) throws IOException {
|
|
|
DistinctionDTO dto = new DistinctionDTO();
|
|
DistinctionDTO dto = new DistinctionDTO();
|
|
|
- String uid = ImageUtils.readImagePix(inputStream);
|
|
|
|
|
|
|
+ file = ossUtils.videoConvertImg(file);
|
|
|
|
|
+ String uid = ImageUtils.readImagePix(file.getInputStream());
|
|
|
dto.setUid(uid);
|
|
dto.setUid(uid);
|
|
|
if("0".equals(orderCacheVal(CgpTool.CACHE_ORDER_PHOTO_CHECK))){
|
|
if("0".equals(orderCacheVal(CgpTool.CACHE_ORDER_PHOTO_CHECK))){
|
|
|
return dto;
|
|
return dto;
|