diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index d101e593..2891313e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -437,6 +437,8 @@ public class FTPUtil { public File downloadFile(String fromPath, String toPath) { FTPClient ftpClient = null; InputStream inputStream = null; + // 声明一个临时文件 + File tempFile = null; try { ftpClient = LoginFTP(); // 切换被动模式 @@ -446,10 +448,11 @@ public class FTPUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); inputStream = ftpClient.retrieveFileStream(fromPath); - // 声明一个临时文件 - File tempFile = File.createTempFile(toPath, null); - // 将FTP文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, tempFile); + if (Objects.nonNull(inputStream)) { + tempFile = File.createTempFile(toPath, null); + // 将FTP文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, tempFile); + } return tempFile; } catch (IOException e) { e.printStackTrace(); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 0787d5a1..7c448ca5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -32,8 +32,8 @@ public class GammaController { @GetMapping("initValue") @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据") - public Result initValue(Integer sampleId, String dbName, String fileName, HttpServletRequest request) { - return gammaService.initValue(sampleId, dbName, fileName, request); + public Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) { + return gammaService.initValue(sampleId, dbName, analyst, fileName, request); } @@ -43,8 +43,8 @@ public class GammaController { } @GetMapping("gammaByDB") - public Result gammaByDB(Integer sampleId, String dbName, HttpServletRequest request){ - return gammaService.gammaByDB(dbName, sampleId, request); + public Result gammaByDB(Integer sampleId, String dbName, String analyst, HttpServletRequest request){ + return gammaService.gammaByDB(dbName, sampleId, analyst, request); } @GetMapping("gammaByFile") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index 312732e4..8abeac18 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -26,8 +26,8 @@ public class SpectrumAnalysesController { @GetMapping("getDBSearchList") @ApiOperation(value = "查询查询条件数据接口", notes = "查询查询条件数据接口") - public Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes) { - return spectrumAnalysisService.getDBSearchList(request, AllUsers, dbName, menuTypes); + public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) { + return spectrumAnalysisService.getDBSearchList(request, AllUsers); } @GetMapping("getDBSpectrumList") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java index 8360d816..a5ce048a 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java @@ -31,6 +31,9 @@ public class GardsSampleDataSpectrum extends GardsSampleData { @TableField(exist = false) private String dbName; + @TableField(exist = false) + private String analyst; + @TableField(exist = false) @Excel(name = "NO" ,orderNum = "1") private Integer no; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java index 02306622..bf837927 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java @@ -12,11 +12,11 @@ import java.util.List; public interface IGammaService{ - Result initValue(Integer sampleId, String dbName, String fileName, HttpServletRequest request); + Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request); Result testFun(String fileName, HttpServletRequest request); - Result gammaByDB(String dbName, Integer sampleId, HttpServletRequest request); + Result gammaByDB(String dbName, Integer sampleId, String analyst, HttpServletRequest request); Result gammaByFile(String fileName, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index 9a57ecc5..b2c23688 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -14,7 +14,7 @@ import java.util.List; public interface ISpectrumAnalysisService { - Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes); + Result getDBSearchList(HttpServletRequest request, boolean AllUsers); Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, Date startDate, Date endDate, HttpServletRequest request); 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 5fd36fd0..928330e0 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 @@ -140,7 +140,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi private IGardsAnalySettingSpectrumService analySettingSpectrumService; @Override - public Result initValue(Integer sampleId, String dbName, String samfileName, HttpServletRequest request) { + public Result initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) { Result result = new Result(); //获取用户名 String userName = JwtUtil.getUserNameByToken(request); @@ -168,7 +168,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (dbName.equals("auto")) { gammaFileUtil.SetBaseInfo(phd, "RNAUTO"); } else if (dbName.equals("man")) { - gammaFileUtil.SetBaseInfo(phd, userName); + gammaFileUtil.SetBaseInfo(phd, analyst); } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); @@ -433,7 +433,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } @Override - public Result gammaByDB(String dbName, Integer sampleId, HttpServletRequest request) { + public Result gammaByDB(String dbName, Integer sampleId, String analyst, HttpServletRequest request) { Result result = new Result(); // 通过token获取用户名 String userName = JwtUtil.getUserNameByToken(request); @@ -466,7 +466,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (dbName.equals("auto")) { gammaFileUtil.SetBaseInfo(phd, "RNAUTO"); } else if (dbName.equals("man")) { - gammaFileUtil.SetBaseInfo(phd, userName); + gammaFileUtil.SetBaseInfo(phd, analyst); } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); @@ -1459,13 +1459,13 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } if (!tablePeaksList.get(j).isNetAreaB()) { - Af.add(Integer.valueOf(tablePeaksList.get(j).getLab())); + Af.add(Integer.valueOf(tablePeaksList.get(j).getLab())-1); } if (!tablePeaksList.get(j).isCentroid()) { - Cf.add(Integer.valueOf(tablePeaksList.get(j).getLab())); + Cf.add(Integer.valueOf(tablePeaksList.get(j).getLab())-1); } if (!tablePeaksList.get(j).isFwhmB()) { - Ff.add(Integer.valueOf(tablePeaksList.get(j).getLab())); + Ff.add(Integer.valueOf(tablePeaksList.get(j).getLab())-1); } } ObjectMapper mapper = new ObjectMapper(); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index d83553a6..d3abab0c 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.cache.Cache; +import io.swagger.models.auth.In; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.shiro.SecurityUtils; @@ -108,26 +109,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements @Autowired private IGardsHistogramSpectrumService histogramService; - @Autowired - private JdbcTemplate jdbcTemplate; - @Override - public Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes) { + public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) { Result result = new Result(); Map> map = new HashMap<>(); - List menuTypeList = Arrays.asList(menuTypes); - //查询谱对应的台站类型 - if (CollectionUtils.isEmpty(menuTypeList)){ - result.error500("The spectrum type cannot be empty"); - return result; - } - List stationTypes = sysDictService.findStationType(menuTypeList); - if (CollectionUtils.isEmpty(stationTypes)) { - result.error500("Please add the station type corresponding to the current system type in the data dictionary"); - return result; - } + //获取台站编码 + List stationCodes = new LinkedList<>(); + List detectorCodes = new LinkedList<>(); + //根据台站id查询台站名称 + Map stationMap = (Map)redisUtil.get("stationMap"); + //从redis中获取探测器信息 + Map detectorInfoMap = (Map)redisUtil.get("detectorsMap"); + //获取台站信息 List userStations = new LinkedList<>(); //如果没有勾选AllUsers if (Objects.nonNull(AllUsers) && !AllUsers){ @@ -137,23 +132,43 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements return result; } userStations = userTaskUtil.findUserStation(userName); + //判断当前用户在当天是否有排班任务的台站信息 + if (CollectionUtils.isNotEmpty(userStations)) { + if (CollectionUtils.isNotEmpty(stationMap)){ + for (Map.Entry entry:stationMap.entrySet()) { + if (userStations.contains(entry.getKey())) { + stationCodes.add(entry.getValue()); + } + } + } + if (CollectionUtils.isNotEmpty(detectorInfoMap)) { + for (Map.Entry entry:detectorInfoMap.entrySet()) { + if (String.valueOf(entry.getKey()).length() <= 3) { + if (userStations.contains(String.valueOf(entry.getKey()))) { + detectorCodes.add(entry.getValue()); + } + } else { + if (userStations.contains(String.valueOf(entry.getKey()).substring(0, 3))) { + detectorCodes.add(entry.getValue()); + } + } + } + } + } + } else { + if (CollectionUtils.isNotEmpty(stationMap)) { + for (Map.Entry entry: stationMap.entrySet()) { + stationCodes.add(entry.getValue()); + } + } + if (CollectionUtils.isNotEmpty(detectorInfoMap)) { + for (Map.Entry entry: detectorInfoMap.entrySet()) { + detectorCodes.add(entry.getValue()); + } + } } - if (dbName.equalsIgnoreCase("auto")){ - dbName = "RNAUTO.GARDS_ANALYSES"; - }else if (dbName.equalsIgnoreCase("man")){ - dbName = "RNMAN.GARDS_ANALYSES"; - }else { - result.error500("The database type does not exist"); - return result; - } - List sampleData = spectrumAnalysisMapper.getDBSearchList(dbName, stationTypes, userStations, AllUsers); - //获取台站编码 - List stationCodes = new LinkedList<>(); - List detectorCodes = new LinkedList<>(); - if (CollectionUtils.isNotEmpty(sampleData)){ - stationCodes = sampleData.stream().map(GardsSampleDataSpectrum::getStationName).distinct().collect(Collectors.toList()); - detectorCodes = sampleData.stream().map(GardsSampleDataSpectrum::getDetectorsName).distinct().collect(Collectors.toList()); - } + stationCodes = stationCodes.stream().sorted().collect(Collectors.toList()); + detectorCodes = detectorCodes.stream().sorted().collect(Collectors.toList()); map.put("stationCode", stationCodes); map.put("detectorCode", detectorCodes); result.setSuccess(true); @@ -191,9 +206,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements String tempDBName = dbName; if (dbName.equalsIgnoreCase("auto")){ dbName = "RNAUTO.GARDS_ANALYSES"; - }else if (dbName.equalsIgnoreCase("man")){ + } else if (dbName.equalsIgnoreCase("man")){ dbName = "RNMAN.GARDS_ANALYSES"; - }else { + } else { result.error500("The database type does not exist"); return result; } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java index 55584910..45d583f7 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java @@ -105,6 +105,12 @@ public class WebStatisticsController { return readLineUtil.readFtpFile(filePath,response); } + @GetMapping("downloadFile") + @ApiOperation("查看Radionuclide的文件") + public void downloadFile(@RequestParam Integer sampleId, HttpServletResponse response){ + gardsSampleDataWebService.downloadFile(sampleId, response); + } + @GetMapping("sohFile") @ApiOperation(value = "查看RMSSHO的文件",notes = "查看RMSSHO的文件") public Result sohFile(@RequestParam Integer sohId, diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java index f72fad43..5df1870d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsBgEfficiencyPairs; +@Mapper public interface GardsBgEfficiencyPairsMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java index fac494db..9c107734 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; +@Mapper public interface GardsCalibrationPairsOrigMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java index 073419c8..834a9d30 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsHistogram; +@Mapper public interface GardsHistogramMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java index 7a0d900e..b46872d0 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsRoiLimits; +@Mapper public interface GardsRoiLimitsMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java index 2652a089..b5903b28 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleCertLine; +@Mapper public interface GardsSampleCertLineMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java index 8bd77ef0..3df55a56 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleCert; +@Mapper public interface GardsSampleCertMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java index a84c4edf..b2a22057 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java @@ -3,8 +3,10 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.entity.GardsSampleDataWeb; +import org.jeecg.modules.entity.vo.SpectrumFileRecord; import java.util.List; @@ -17,4 +19,12 @@ public interface GardsSampleDataWebMapper extends BaseMapper Page findParticulatePage(String dataType, String spectralQualifie, String startDate, String endDate, List stationIdList, Page page); + Integer getAnalysisID(@Param(value = "sampleId") Integer sampleId); + + SpectrumFileRecord getDBSpectrumFilePath(Integer sampleId, Integer analysisID); + + String getQCFilePath(String siteDetCode, String collectStartStr); + + Integer getSampleId(@Param(value = "filePathName") String filePathName); + } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java index 1e1ff9a5..12e07c25 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleDescription; +@Mapper public interface GardsSampleDescriptionMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java index 87c424fc..8ac8dc3d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleRatios; +@Mapper public interface GardsSampleRatiosMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java index 2fafc897..c0ca6b56 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSpectrum; +@Mapper public interface GardsSpectrumMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml index ac6fd63e..df8797a6 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml @@ -126,4 +126,44 @@ ORDER BY ACQUISITION_START DESC + + + + + + + + \ No newline at end of file diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java index bfe900d6..66d4af30 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java @@ -1,6 +1,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; +import io.swagger.models.auth.In; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.GardsSampleDataWeb; @@ -33,6 +34,7 @@ public interface IGardsSampleDataWebService extends IService Result sampleInfo(Integer sampleId); + void downloadFile(Integer sampleId, HttpServletResponse response); GardsSampleDataWeb getOneSample(Integer sampleId); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java index b70f9c96..eae41235 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java @@ -5,23 +5,26 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ZipUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.properties.ParameterProperties; +import org.jeecg.common.properties.SpectrumPathProperties; +import org.jeecg.common.util.*; import org.jeecg.modules.base.enums.SampleFileHeader; -import org.jeecg.common.util.DateUtils; -import org.jeecg.common.util.ExportUtil; -import org.jeecg.common.util.ReadLineUtil; -import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.base.entity.original.*; import org.jeecg.modules.entity.GardsSampleDataWeb; import org.jeecg.modules.entity.data.*; +import org.jeecg.modules.entity.vo.SpectrumFileRecord; import org.jeecg.modules.mapper.*; import org.jeecg.modules.service.IGardsSampleDataWebService; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -30,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; +import java.net.URLEncoder; import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -66,6 +69,12 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl