Commit Graph

  • 50787c22fe 修改beta模块saveToDB接口问题 修改gamma模块saveToDB接口问题 修改beta模块saveToTXT,saveToExcel,saveToHtml问题 qiaoqinzheng 2023-09-21 17:20:34 +0800
  • 720e1bf975 修改beta模块saveToDB接口问题 修改gamma模块saveToDB接口问题 修改beta模块saveToTXT,saveToExcel,saveToHtml问题 qiaoqinzheng 2023-09-21 17:20:29 +0800
  • 7feca0fdef 修改beta模块saveToDB接口问题 修改gamma模块saveToDB接口问题 修改beta模块saveToTXT,saveToExcel,saveToHtml问题 qiaoqinzheng 2023-09-21 17:20:10 +0800
  • 699a8b068b fix:报警日志绑定当前报警规则,非最新规则 nieziyan 2023-09-21 16:05:20 +0800
  • fd2c65209c Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-21 14:08:34 +0800
  • 3201a13cc8 fix:记录报警日志缺少RuleId nieziyan 2023-09-21 14:08:15 +0800
  • f7e8a4ed02 fix:优化header和title生成 xiaoguangbin 2023-09-21 11:20:38 +0800
  • 5eb536c21d Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-20 19:20:14 +0800
  • 80f3a55812 feat:saveTo* nieziyan 2023-09-20 19:19:56 +0800
  • 9bf98b819c NameStandUtil移动到公用工具类中 修改Gamma模块下SaveToDB接口问题 qiaoqinzheng 2023-09-20 19:13:44 +0800
  • bec2a892a1 GammaFileUtil修改文件内容获取错误问题 NameStandUtil修改文件路径错误问题 修改Gamma模块saveToDB接口 qiaoqinzheng 2023-09-20 17:13:23 +0800
  • 5e5474eb2f Energy,Resolution,Efficiency功能的call增加判断 qiaoqinzheng 2023-09-20 16:29:31 +0800
  • 59d063d415 GammaController功能Energy Calibration,Resolution Calibration, Efficiency Calibration功能新增width字段进行计算 GammaController新增导入本地文件临时加载Energy Calibration,Resolution Calibration, Efficiency Calibration功能 qiaoqinzheng 2023-09-20 16:21:48 +0800
  • 89d24abd35 fix:1.修改从filesource跑文件生成报告是报错问题 panbaolin 2023-09-20 14:42:25 +0800
  • f20fdb4271 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-19 20:11:25 +0800
  • 055147f72d feat:back nieziyan 2023-09-19 20:11:07 +0800
  • 8b924996c4 fix: gamma 自动处理 orgin 2023-09-19 15:54:58 +0800
  • 90fc91fcff GammaFileUtil新增格式化数组内容方法 GammaServiceImpl修改RRR导出返回内容 qiaoqinzheng 2023-09-19 12:49:54 +0800
  • 82674b613c PHDFileUtil移除多余分析结果返回代码 qiaoqinzheng 2023-09-19 11:13:51 +0800
  • 93c34a433f auto模块GammaFileUtil报错解决 auto模块实体类包下新增StructInsertInput,StructInsertOutput,TablePeaks文件 auto模块移动CalVluesOut实体类位置 auto模块引入CalValuesHandler代码 auto模块引入ejml包 SpectrumAnalysisServiceImpl去掉多余返回内容 GammaServiceImpl修改Energy,Resolution,Efficiency模块返回内容问题 qiaoqinzheng 2023-09-19 11:12:51 +0800
  • 500387e88a Merge remote-tracking branch 'xiaoguangbin/station' into station orgin 2023-09-19 08:55:11 +0800
  • 9e745b6d84 fix: gamma 自动处理 orgin 2023-09-19 08:55:05 +0800
  • b1abdedf89 update:back nieziyan 2023-09-18 20:29:00 +0800
  • b4178e071a Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-18 20:07:52 +0800
  • 5835ef9543 feat:saveTo* nieziyan 2023-09-18 19:58:08 +0800
  • 0d33209b60 GammaFileUtil查询数据库方法修改 qiaoqinzheng 2023-09-18 19:26:48 +0800
  • a794d8f357 fix: 能谱log日志生成工具 orgin 2023-09-18 19:08:11 +0800
  • e2598e14ef fix: 能谱log日志生产工具 orgin 2023-09-18 17:16:24 +0800
  • cf39240cf0 fix:1.完成重新执行undeal文件夹里PHD文件功能2.完成重新执行filesource文件夹PHD文件功能 panbaolin 2023-09-18 15:18:30 +0800
  • 79e05be0e0 Merge remote-tracking branch 'xiaoguangbin/station' into station orgin 2023-09-18 15:16:38 +0800
  • 674fc6f78b fix: 能谱log日志生产工具 orgin 2023-09-18 15:16:31 +0800
  • 0cfcd0bb72 fitting参数新增qcFi了Name,tabName进行区分数据并进行保存 新声明一个本地缓存工具betaCache PHDFileUtil文件保存路劲多出/符移除 GammaController新增保存Energy Calibration,Resolution Calibration,Efficiency Calibration数据接口 GammaController新增导出ARR报告接口 GammaController新增导出RRR报告接口 BgDataAnlyseResultIn实体类内容修改 qiaoqinzheng 2023-09-18 14:57:37 +0800
  • ed7493423b Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-09-15 10:12:47 +0800
  • 6dde566838 beta功能saveToDB修改 beta功能增加分析文件方法 gamma新增saveDataEnergy接口 qiaoqinzheng 2023-09-15 10:12:37 +0800
  • 023ca06a9d Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-15 10:06:17 +0800
  • d8289d4d12 fix:Alarm nieziyan 2023-09-15 10:05:31 +0800
  • 78ce76d6c3 zeroTime解析问题修改 qiaoqinzheng 2023-09-15 10:04:51 +0800
  • 8dc6922ff2 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-13 19:22:31 +0800
  • 17d73df309 feat:format nieziyan 2023-09-13 19:22:14 +0800
  • 77178c6a61 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-09-13 19:21:30 +0800
  • 244c1645fd 查询用户是否对某个台站有过排班任务 修改BgDataAnalyseResultIn实体类 saveToDB修改 qiaoqinzheng 2023-09-13 19:21:23 +0800
  • 0ac87eb273 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-13 17:09:00 +0800
  • 1b16ceca8f feat:format nieziyan 2023-09-13 17:08:37 +0800
  • a06fbed52a fix: 修改 redis 初始化GardsNuclLinesLib数据 orgin 2023-09-13 16:34:28 +0800
  • 561533c6c3 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-13 15:33:23 +0800
  • 492795c445 fix:Gamma RLR nieziyan 2023-09-13 15:33:09 +0800
  • 34ae278463 根据sampleFileName获取文件名称接口修改 XeData返回内容增加flag字段数据 qiaoqinzheng 2023-09-13 15:27:40 +0800
  • 5f7cc6be38 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-09-13 10:50:52 +0800
  • b7c256a044 新增SysUserColor实体类 GammaFileUtil部分颜色保持与用户存储颜色一致 GammaController新增主页面点击peakInformation接口 GammaController新增查询颜色配置信息接口 GammaController新增修改颜色配置信息接口 SpectrumAnalysisMapper增加新增ROIResults表数据sql qiaoqinzheng 2023-09-13 10:50:44 +0800
  • 61da5a5c50 fix:1.优化存储邮件解析日志功能2.修改原始库、分析库数据存储条件3.修改统一异常报错处理逻辑 panbaolin 2023-09-13 10:24:28 +0800
  • c9fed16807 fix:修改变量类型 orgin 2023-09-13 09:17:54 +0800
  • 46a1be1479 fix:修改变量类型 orgin 2023-09-13 09:16:31 +0800
  • ae2dfc2697 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-13 08:54:44 +0800
  • 78d14289f4 feat:Beta RLR nieziyan 2023-09-13 08:54:29 +0800
  • 6390dc224a fix:1.完成B分析生成报告功能 panbaolin 2023-09-12 15:16:20 +0800
  • 3707146ad2 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-12 10:25:17 +0800
  • 7b9ce715fb fix:Bug Fix nieziyan 2023-09-12 10:10:01 +0800
  • 66013338fe SpectrumAnalysisMapper.xml方法名getUserNuclideNames错误修改 qiaoqinzheng 2023-09-12 10:04:00 +0800
  • b4e0bd30e7 NameStandUtil文件名称日期格式的小数部分规则修改 qiaoqinzheng 2023-09-12 09:22:47 +0800
  • f74a2a8358 fix:Bug Fix nieziyan 2023-09-11 22:11:13 +0800
  • 136920dfeb fix:Code Merge nieziyan 2023-09-11 19:46:08 +0800
  • 21a706a263 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-11 19:28:30 +0800
  • 46f3299f07 feat:RLR Export nieziyan 2023-09-11 19:20:09 +0800
  • 881f8664da beta增加文件名称等传参 GammaController新增initValue接口,修改查看Energy Calibration数据,修改查看Resolution Calibration数据 AnalyseData修改dbName为dbNames,新增sampleFileNames,gasFileNames,detFileNames字段 StatisticsQueryData新增detectorId字段 BgDataAnlyseResultIn新增bProcessed字段 新增RRRLogInfo实体类 GardsCalibrationPairsSpectrum,GardsCalibrationSpectrum,GardsROIChannelSpectrum新增dataType字段 getDetectorList新增返回字段detectorId qiaoqinzheng 2023-09-11 19:18:44 +0800
  • d98a4de4b1 feat:RLR Export nieziyan 2023-09-09 17:23:31 +0800
  • c9ccba3a7e fix:分页Bug feat:模板文件 nieziyan 2023-09-08 11:32:18 +0800
  • 609852532a fix:.gitignore nieziyan 2023-09-07 20:09:42 +0800
  • 72b017a650 feat:Export Excel nieziyan 2023-09-07 19:04:39 +0800
  • 5cc898bf83 gammaController层增加方法注解 实现InteractiveTool页面新增行数确定新增接口 实现InteractiveTool页面delete按钮 实现Config User Library页面save按钮 实现InteractiveTool页面增加核素信息接口 实现InteractiveTool页面删除核素信息接口 实现InteractiveTool页面查看峰对应备注信息接口 实现InteractiveTool页面add峰对应备注信息接口 实现InteractiveTool页面查看备注信息接口 实现InteractiveTool页面add备注信息接口 查看Gamma Viewer Log页面数据修改接口内容 DBUtil存放位置修改 GammaFileUtil增加InitPeakTable方法 GammaFileUtil增加CalcNuclideMDA方法 GammaFileUtil增加ReCalcMdaMdc方法 NameStandUtil方法内容修改 PHDFileUtil新增FileNameByStandardForm方法 PHDFileUtil新增GetMatchFile方法 PHDFileUtil新增GetQCPHD方法 PeakInfo实体类comments增加默认赋值 新增AcceptInfo,AnalyseBetaInfo,CommentsInfo,NuclideInfo,UserLibraryInfo实体类 修改GardsXeResultsSpectrum实体类 新增deleteNuclidesByUserName方法 qiaoqinzheng 2023-09-07 16:54:40 +0800
  • 868f0b7a93 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-09-07 15:03:40 +0800
  • d1dcb4b5cc logMange树形结构问题修改 qiaoqinzheng 2023-09-07 15:03:31 +0800
  • 919bae79f7 fix:1.完成B分析功能数据存储功能 panbaolin 2023-09-07 09:32:26 +0800
  • 61f328d577 feat:ExportFile nieziyan 2023-09-06 20:07:10 +0800
  • a210b75205 feat:Sample_G_Analysis nieziyan 2023-09-05 22:37:09 +0800
  • fb4b563aee fix:NullPointException nieziyan 2023-09-05 16:23:12 +0800
  • d78267f219 fix:合并冲突 nieziyan 2023-09-05 16:00:27 +0800
  • 110f986fc1 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-05 15:57:13 +0800
  • 842b544b43 fix:Sample_G_Analysis nieziyan 2023-09-05 15:55:24 +0800
  • d8ec995ecf Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-09-04 17:17:45 +0800
  • e82a59dd38 移动并修改vo实体类引入 实现gamma模块下saveToDB qiaoqinzheng 2023-09-04 17:17:37 +0800
  • ad740f6aae fix:更换数据库插件 解决无法nacos无法打包问题 xiaoguangbin 2023-09-04 15:49:49 +0800
  • 1a56e3e664 NameStandUtil增加Component注解 qiaoqinzheng 2023-09-04 10:50:15 +0800
  • 521f45a799 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-04 09:29:46 +0800
  • ba02a0567f fix:Sample_G_Analysis nieziyan 2023-09-04 09:29:28 +0800
  • 49b0e7791f baseLine,Lc,Scac路径赋值 qiaoqinzheng 2023-09-04 09:28:25 +0800
  • 866cc35790 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-01 18:56:01 +0800
  • 0b61778dc3 fix:Sample_G_Analysis nieziyan 2023-09-01 18:55:37 +0800
  • e930c07e65 DataType增加log日志相关数据 GammaFileUtil实现GetMiddleData方法缺失部分 新增NameStandUtil qiaoqinzheng 2023-09-01 18:46:55 +0800
  • ee174a95bb Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-01 18:05:24 +0800
  • 73dc624d51 fix:Sample_G_Analysis nieziyan 2023-09-01 18:05:01 +0800
  • a1dc41ff44 查询关注台站信息列表增加根据用户id过滤条件 qiaoqinzheng 2023-09-01 17:10:30 +0800
  • 7edab0412f GammaFileUtil下GetMiddleData方法遗漏字段增加 SpectrumAnalysisServiceImpl下ViewRRR接口增加日期格式化 qiaoqinzheng 2023-09-01 15:57:18 +0800
  • 807c8270ee Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-01 15:48:41 +0800
  • 7a17501078 fix: nieziyan 2023-09-01 15:47:29 +0800
  • 5844e6480e 修改实体类 qiaoqinzheng 2023-09-01 15:46:49 +0800
  • 0a2c847b7a 实体类修改 qiaoqinzheng 2023-09-01 15:32:53 +0800
  • a1c64c5f26 SpectrumPathProperties新增用户上传文件路径 修改base.vo下实体类内容 新增GammaDataBase.db文件 新增查看当前用户是否有过当前台站的排班任务方法 新增DBUtil实现读取DB文件内容 新增gammaByFile接口,实现从本地读取文件内容 qiaoqinzheng 2023-09-01 15:25:53 +0800
  • b50cf9325b Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-01 14:41:46 +0800
  • f4a5f7a1b9 fix:移除无用import nieziyan 2023-09-01 14:41:02 +0800
  • 2989d8076f fix:vo迁移至base nieziyan 2023-09-01 14:36:05 +0800