diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index e2dc8c44..55ae44f0 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -16,10 +16,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import com.google.common.cache.Cache; +import org.apache.commons.lang3.time.StopWatch; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; @@ -74,11 +76,13 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; import static org.jeecg.modules.base.enums.ExportTemplate.*; +@Slf4j @Service(value = "gammaService") @DS("ora") public class GammaServiceImpl extends AbstractLogOrReport implements IGammaService { @@ -5330,7 +5334,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi "2、The format of file is error."; return; } + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); String iecValue = fileFtransitUtil.WriteIEC(datas); + stopWatch.stop(); + log.info("{}处理耗时为:{}毫秒",ImsName,stopWatch.getTime(TimeUnit.MILLISECONDS)); // 设置响应类型 response.setContentType("application/octet-stream"); // 解决中文不能生成文件 @@ -5376,7 +5384,11 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi "2、The format of file is error."; return; } + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); String imsValue = fileFtransitUtil.WriteIMS(datas); + stopWatch.stop(); + log.info("{}处理耗时为:{}毫秒",IecName,stopWatch.getTime(TimeUnit.MILLISECONDS)); // 设置响应类型 response.setContentType("application/octet-stream"); // 解决中文不能生成文件 @@ -5416,7 +5428,12 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi FileUtils.copyInputStreamToFile(inputStream, spcFile); if (!fileFtransitUtil.ReadSPC(spcFile, datas)) return; + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); String imsValue = fileFtransitUtil.WriteIMS(datas); + stopWatch.stop(); + log.info("{}处理耗时为:{}毫秒",SpcName,stopWatch.getTime(TimeUnit.MILLISECONDS)); + String suffix = nameStandUtil.GetSuffix(datas.getData_type(), datas.getQuantity(), String.valueOf(datas.getAcq_live())); String ImsName = datas.getDetector()+StringPool.DASH+datas.getAcq_date().replace(StringPool.SLASH, StringPool.EMPTY)+StringPool.UNDERSCORE+ datas.getAcq_time().substring(0, 5).replace(StringPool.COLON, StringPool.EMPTY)+ suffix; @@ -5462,7 +5479,13 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi inputStream = file.getInputStream(); FileUtils.copyInputStreamToFile(inputStream, imsFile); if (!fileFtransitUtil.ReadIMS(imsFile, datas)) return; + + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); fileFtransitUtil.WriteSPC(spcFile, datas); + stopWatch.stop(); + log.info("{}处理耗时为:{}毫秒",ImsName,stopWatch.getTime(TimeUnit.MILLISECONDS)); + // 获取文件输入流 spcInputStream = new FileInputStream(spcFile); // 获取响应输出流 @@ -5506,7 +5529,12 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi FileUtils.copyInputStreamToFile(inputStream, spcFile); if (!fileFtransitUtil.ReadSPC(spcFile, datas)) return; + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); String iecValue = fileFtransitUtil.WriteIEC(datas); + stopWatch.stop(); + log.info("{}处理耗时为:{}毫秒",SpcName,stopWatch.getTime(TimeUnit.MILLISECONDS)); + // 设置响应类型 response.setContentType("application/octet-stream"); // 解决中文不能生成文件 @@ -5549,7 +5577,13 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi inputStream = file.getInputStream(); FileUtils.copyInputStreamToFile(inputStream, iecFile); if (!fileFtransitUtil.ReadIEC(iecFile, datas)) return; + + StopWatch stopWatch = new StopWatch(); + stopWatch.start(); fileFtransitUtil.WriteSPC(spcFile, datas); + stopWatch.stop(); + log.info("{}处理耗时为:{}毫秒",IecName,stopWatch.getTime(TimeUnit.MILLISECONDS)); + // 获取文件输入流 spcInputStream = new FileInputStream(spcFile); // 获取响应输出流