Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.echars图生成调整

Browse Source
This commit is contained in:
wr
2023-11-07 16:56:22 +08:00
parent 67984723c6
commit aacea4ca01
3 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pqs-common/common-event/src/main/java/com/njcn/event/file/component/WavePicComponent.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.FileUtil;
import com.njcn.echarts.pojo.constant.PicCommonData;
import com.njcn.echarts.util.DrawPicUtil;
import com.njcn.event.file.pojo.bo.WaveDataDetail;
import com.njcn.event.file.pojo.dto.WaveDataDTO;
@@ -189,8 +190,11 @@ public class WavePicComponent {
String secondPic;
if (waveDataDetails.size() == 1) {
//将图片上传到minioss
InputStream instantStream = IoUtil.toStream(firstPic, CharsetUtil.UTF_8);
picPath = fileStorageUtil.uploadStream(instantStream, OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
if (firstPic.contains(PicCommonData.PNG_PREFIX)) {
firstPic = firstPic.replace(PicCommonData.PNG_PREFIX, "");
}
byte[] bytes = Base64.getDecoder().decode(firstPic);
picPath = fileStorageUtil.uploadStream(new ByteArrayInputStream(bytes), OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
} else if (waveDataDetails.size() == 2) {
//绘制第二个电压瞬时波形图
waveDataDetail = waveDataDetails.get(1);
@@ -225,8 +229,11 @@ public class WavePicComponent {
String secondPic;
if (waveDataDetails.size() == 1) {
//将图片上传到minioss
InputStream instantStream = IoUtil.toStream(firstPic, CharsetUtil.UTF_8);
picPath = fileStorageUtil.uploadStream(instantStream, OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
if (firstPic.contains(PicCommonData.PNG_PREFIX)) {
firstPic = firstPic.replace(PicCommonData.PNG_PREFIX, "");
}
byte[] bytes = Base64.getDecoder().decode(firstPic);
picPath = fileStorageUtil.uploadStream(new ByteArrayInputStream(bytes), OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
} else if (waveDataDetails.size() == 2) {
//绘制第二个电压瞬时波形图
waveDataDetail = waveDataDetails.get(1);
@@ -287,8 +294,10 @@ public class WavePicComponent {
*/
public String generateSteadyTargetImage(String title, Map<String ,List<List<Object>>> values, String limitName, List<List<Object>> limit) {
String firstPic = drawPicUtil.drawSteadyTargetPic(title,values,limitName,limit);
//将图片上传到minioss
InputStream instantStream = IoUtil.toStream(firstPic, CharsetUtil.UTF_8);
return fileStorageUtil.uploadStream(instantStream, OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
if (firstPic.contains(PicCommonData.PNG_PREFIX)) {
firstPic = firstPic.replace(PicCommonData.PNG_PREFIX, "");
}
byte[] bytes = Base64.getDecoder().decode(firstPic);
return fileStorageUtil.uploadStream(new ByteArrayInputStream(bytes), OssPath.EVENT_WAVE_PIC, FileUtil.generateFileName("png"));
}
}