diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java new file mode 100644 index 0000000000..d843903c10 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java @@ -0,0 +1,66 @@ +package com.epmet.resi.group.dto; + +import lombok.Data; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +/** + * @description: + * @author: liushaowen + * @date: 2020/11/16 13:52 + */ +@Data +public class QRCodeMultipartFileDTO implements MultipartFile { + + private String name; + + private String originalFilename; + + private String contentType; + + private byte[] bytes; + + @Override + public String getName() { + return this.name; + } + + @Override + public String getOriginalFilename() { + return this.originalFilename; + } + + @Override + public String getContentType() { + return this.contentType; + } + + @Override + public boolean isEmpty() { + return ArrayUtils.isEmpty(bytes)?true:false; + } + + @Override + public long getSize() { + return ArrayUtils.isEmpty(bytes)?bytes.length:0; + } + + @Override + public byte[] getBytes() { + return this.bytes; + } + + @Override + public InputStream getInputStream() { + return null; + } + + @Override + public void transferTo(File file) { + + } +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java index fe80b0e406..65fed60b0a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.modules.group.entity.ResiGroupCodeEntity; import com.epmet.modules.group.redis.ResiGroupCodeRedis; import com.epmet.modules.group.service.ResiGroupCodeService; import com.epmet.modules.utils.ModuleConstant; +import com.epmet.resi.group.dto.QRCodeMultipartFileDTO; import com.epmet.resi.group.dto.group.ResiGroupCodeDTO; import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO; import com.epmet.resi.group.dto.group.form.GetGroupCodeFormDTO; @@ -49,6 +50,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import java.io.UnsupportedEncodingException; import java.util.Arrays; @@ -170,10 +172,10 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl uploadResult = ossFeignClient.uploadBytes(uploadBytesFormDTO); + QRCodeMultipartFileDTO qrCodeMultipartFile = new QRCodeMultipartFileDTO(); + qrCodeMultipartFile.setBytes(buffer); + qrCodeMultipartFile.setOriginalFilename("qrcode.jpg"); + Result uploadResult = ossFeignClient.uploadQrCode(qrCodeMultipartFile); if (uploadResult.success()) { result = uploadResult.getData().getUrl(); //存表