Commit Graph

Select branches

Hide Pull Requests

SelfStation

SelfStation-pgsql

SelfStation-testdll

master

mdc

mdc-merge

noFtp

noFtp-F

noFtp-seflStation

onlyDownload

sleepDownload

Mono Color

• c6d4eb2381 新增CalName,MiddleDataType,RoleType枚举类 CalType枚举类新增字段TOTALEFFICIENCY_CAL qiaoqinzheng 2023-09-01 14:34:52 +0800
• bcc56847aa Merge remote-tracking branch 'origin/station' into station nieziyan 2023-09-01 10:45:14 +0800
• d6a7df1c3a fix：Gamma nieziyan 2023-09-01 10:44:53 +0800
• f70cc10b55 新增Gamma模块存储数据库实体类 qiaoqinzheng 2023-09-01 10:12:37 +0800
• 30d8b5d13d 新增XeNuclideName枚举类 qiaoqinzheng 2023-08-31 15:29:50 +0800
• 5852d2f686 新增CalType枚举类 qiaoqinzheng 2023-08-31 14:34:46 +0800
• fd04d6bc2d 新增fittingType枚举类 qiaoqinzheng 2023-08-30 19:03:42 +0800
• 26ec3e3f19 fix:1.添加能谱文件未找到自定义异常 panbaolin 2023-08-30 18:58:46 +0800
• 37b1eecd7d fix:1.移动枚举位置，提供多个模块公用 panbaolin 2023-08-30 18:57:44 +0800
• 585d51afe9 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station panbaolin 2023-08-30 17:23:01 +0800
• b5cdc53181 fix:1.优化能谱处理类结构 panbaolin 2023-08-30 17:22:12 +0800
• e8a2b70334 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-30 17:19:48 +0800
• 26f16fc210 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station panbaolin 2023-08-30 17:18:22 +0800
• 81b4ebb878 fix:1.添加分析库service panbaolin 2023-08-30 17:13:27 +0800
• dc6ef1a3c4 fix：完善 nieziyan 2023-08-30 16:29:28 +0800
• c2f303b5fb Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-29 09:13:03 +0800
• 68d113f0ab feat：谱文件排序 nieziyan 2023-08-29 09:12:45 +0800
• d6f40d1025 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-08-28 17:14:52 +0800
• 1164b9c9ea 台站运行管理查询有效率接口新增used返回字段内容 qiaoqinzheng 2023-08-28 17:14:36 +0800
• 376be83157 Merge branch 'station' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station panbaolin 2023-08-28 16:45:42 +0800
• b44497f968 fix:1.优化代码中文件路径、换行符等代码换成常量及系统API提高可移植性 panbaolin 2023-08-28 16:45:21 +0800
• ebf03f6949 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-28 16:09:36 +0800
• c6cf8e8570 feat：谱文件 nieziyan 2023-08-28 16:09:08 +0800
• 101c851b34 新增ComputePeakRange方法 qiaoqinzheng 2023-08-28 15:14:56 +0800
• fc757f9f3e 新增insertPeaks方法 新增calFitPara方法 qiaoqinzheng 2023-08-28 15:12:23 +0800
• 81a0ccf569 fix:1.优化ftp工具结构，每个线程内只打开一次ftp，使用完毕关闭ftp 2.完成各能谱正常情况下执行步骤日志存储 panbaolin 2023-08-27 14:22:20 +0800
• 2ffe64f352 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-24 17:07:36 +0800
• 736210780b feat：谱文件上传 nieziyan 2023-08-24 17:07:19 +0800
• 77701a5d2b feat：nacos pgsql数据库表结构 orgin 2023-08-23 15:09:39 +0800
• eb726a9061 Merge remote-tracking branch 'origin/station' into station orgin 2023-08-23 15:06:49 +0800
• d0a088791f feat：解决nacos 无法持久化到 pgsql的问题 orgin 2023-08-23 15:06:37 +0800
• 24910d27f4 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-22 16:53:38 +0800
• 77bea6bda4 feat：持久化监控项 nieziyan 2023-08-22 16:52:26 +0800
• b0925663ab 自动处理相关配置信息增加日志路径 新增公用实体类GardsNuclLinesLib 新增实体类LocalCache缓存信息到本地jvm 新增实体类分别处理对应数据 实现查询InteractiveTool，ZeroTime，Korsum，KorSumInput，energyCalibration，resolutionCalibration，EfficiencyCalibration，NuclideLibrary，configUserLibrary，viewComment，peakInformation，viewARR，viewRRR，radionuclideActivity，Spectrum，sampleInformation，viewQCResult，viewRLR，viewAutomaticAnalysisLog，viewGammaviewerLog接口 qiaoqinzheng 2023-08-21 16:46:29 +0800
• 72a8d901ea Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-18 17:10:54 +0800
• 2a8ccef920 feat：完善 nieziyan 2023-08-18 17:10:34 +0800
• 9b9af8a481 feat：解决定时器启动时卡死问题 orgin 2023-08-18 17:07:59 +0800
• d39247d991 fix:1.完成各能谱原始库数据存储、原始eml邮件存储、能谱文件存储、邮件日志存储 panbaolin 2023-08-18 11:10:19 +0800
• da69a39e95 feat：后端接口 nieziyan 2023-08-17 20:24:10 +0800
• 2bc6d4352b Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-08-16 08:55:48 +0800
• b58fa3dceb 新增information实体类 qiaoqinzheng 2023-08-16 08:55:39 +0800
• 5fd4e44a6c Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-16 08:48:09 +0800
• 29ecd492e9 feat：预警结果保存|通知 nieziyan 2023-08-16 08:47:46 +0800
• cef2f3d410 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-08-14 14:34:21 +0800
• 0b7a03f283 该峰处的探测效率不确定度字段名称修改 关闭流修改 qiaoqinzheng 2023-08-14 14:34:09 +0800
• cdfdbc374a Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-11 18:37:48 +0800
• 321e0e19bd feat：分析结果预警 nieziyan 2023-08-11 18:37:07 +0800
• ff969e71a4 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-08-10 08:47:47 +0800
• 08d2602c69 实现公式计算新的曲线接口 新增获取gamma对应count数据接口 新增gamma页面查询DB接口返回折线图接口 实现configure按钮接口 qiaoqinzheng 2023-08-10 08:47:39 +0800
• ba319f5246 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-04 16:03:29 +0800
• f4167456b7 feat：分析结果预警 nieziyan 2023-08-04 16:03:03 +0800
• cf0888d172 feat：增加 系统管理-核素默认配置分页查询接口 orgin 2023-08-04 15:59:08 +0800
• 614e0205d0 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-08-02 10:36:07 +0800
• 1e9c2b156d 计算台站数据的质量 qiaoqinzheng 2023-08-02 10:36:00 +0800
• 694162ed78 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-01 21:28:53 +0800
• 8e9f2fc4e1 update：完善 nieziyan 2023-08-01 21:28:36 +0800
• 23265b3046 根据新的参数计算新的曲线数据接口实现 qiaoqinzheng 2023-08-01 17:15:46 +0800
• 24b115744a 截取数组多截取问题修改 qiaoqinzheng 2023-08-01 16:04:52 +0800
• 6314f037e4 fix:1.删除邮件管理器@Compoint注解，添加能谱解析状态枚举 panbaolin 2023-08-01 15:11:52 +0800
• 996c487908 feat：合并 nieziyan 2023-08-01 11:56:48 +0800
• e4fa2ada44 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-01 11:29:50 +0800
• e01beceacf 报警模块工具类冲突导致问题修改 qiaoqinzheng 2023-08-01 11:29:30 +0800
• 4636d5038c Merge remote-tracking branch 'origin/station' into station nieziyan 2023-08-01 11:17:04 +0800
• e390fda254 feat：合并 nieziyan 2023-08-01 10:57:33 +0800
• aad350fe9c 报警模块实体类引入内容修改 qiaoqinzheng 2023-08-01 10:50:50 +0800
• 566e11aaf3 报警模块实体类引入修改 redis缓存工具类移动 qiaoqinzheng 2023-08-01 10:48:22 +0800
• 8194e89326 实体类内容修改 qiaoqinzheng 2023-08-01 10:42:52 +0800
• 2d8b68e25a web-statistics模块下实体类移动到base-core下 qiaoqinzheng 2023-08-01 08:58:52 +0800
• 3c1b3f2c80 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-07-31 20:30:22 +0800
• d8e13a803c feat：功能完善 nieziyan 2023-07-31 20:19:54 +0800
• 1667b43218 台站运行管理模块下实体类移动到base-core下 qiaoqinzheng 2023-07-31 17:22:47 +0800
• 016cca95f0 系统类下实体类移动到base-core下 qiaoqinzheng 2023-07-31 17:11:52 +0800
• ed146db779 新增人工交互实体类 qiaoqinzheng 2023-07-31 16:47:14 +0800
• 6607b34729 abnormal-alarm模块下实体类移动 qiaoqinzheng 2023-07-31 16:44:32 +0800
• fb320c6888 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-07-28 19:33:36 +0800
• afd110d2b4 feat：新功能 nieziyan 2023-07-28 19:31:26 +0800
• 97e65bfaa6 SpectrumData新增字段SampleId,Status 新增方法根据文件路径查询对应的样品数据 散点图返回内容横纵坐标调换 qiaoqinzheng 2023-07-26 14:29:51 +0800
• 2d4197ab2c SpectrumData新增字段SampleId,Status qiaoqinzheng 2023-07-26 11:39:26 +0800
• 09e1d791d4 Histogram取值修改 qiaoqinzheng 2023-07-26 11:38:42 +0800
• 7ad22f79a1 台站不选择情况下传值修改 qiaoqinzheng 2023-07-26 11:00:19 +0800
• 9b747338d7 人工交互分析，自动处理分页查询修改 qiaoqinzheng 2023-07-26 10:58:44 +0800
• dc39e67308 增加值非空判断 qiaoqinzheng 2023-07-26 10:18:24 +0800
• 81592abac1 下拉框查询台站编码，探测器编码接口修改 分页查询样品数据接口修改 qiaoqinzheng 2023-07-26 08:54:38 +0800
• c1a9a43f91 Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-07-24 10:51:05 +0800
• 09902eaec3 FTPUtil新增获取ftp登录用户名，ftp登录密码，ftp字符集方法 PHDFileUtil实现查询按钮灯颜色方法，读取行数据方法，修改获取数据方法 新增UserTaskUtil工具类判断当前用户是否有排班任务权限操作当前台站信息 实现删除折线图缓存数据接口，查看comment数据接口，新增comment接口，查看ARR报告接口，查看RRR报告接口，查看Spectrum数据接口，查看SampleInformation数据接口，查看QC Result数据接口，查看RLR数据接口 新增部分实体类 修改探测器相关文件名称解决重名冲突问题 ReadLineUtil切换文件路径方式修改 新增查询用户排班任务接口 qiaoqinzheng 2023-07-24 10:50:57 +0800
• 1d3e2253aa Merge remote-tracking branch 'origin/station' into station nieziyan 2023-07-24 09:47:59 +0800
• d08a34895b feat：alarm nieziyan 2023-07-24 09:47:40 +0800
• 45f4df3ab6 properties配置文件移动到base-core公用包下 qiaoqinzheng 2023-07-24 09:02:51 +0800
• 4a87591bb3 报警联系人组分页查询切换分页不生效问题修改 qiaoqinzheng 2023-07-24 09:01:16 +0800
• 4b113079ca 新增删除报警人联系人组下单独联系人接口 qiaoqinzheng 2023-07-21 10:53:47 +0800
• 42c9bf9bea 查看联系人组详情接口修改 qiaoqinzheng 2023-07-21 10:41:12 +0800
• 2d28a7d005 新增修改 qiaoqinzheng 2023-07-21 10:17:09 +0800
• 82783edbcc feat：系统预警 nieziyan 2023-07-20 10:26:55 +0800
• dcb82ce493 Merge remote-tracking branch 'origin/station' into station nieziyan 2023-07-19 08:51:06 +0800
• a704571b04 feat：导出功能完善 nieziyan 2023-07-19 08:50:49 +0800
• 4a9486ab43 fix:新增BetaGamma的analyse算法 orgin 2023-07-18 14:50:24 +0800
• 917a76da41 实体类部分参数未使用驼峰命名修改 查询折线图接口调用方法名称修改 qiaoqinzheng 2023-07-13 10:26:22 +0800
• 4250ff26fe 折线图接参不使用数组接收 qiaoqinzheng 2023-07-13 10:07:35 +0800
• 2c7a47f4bb Merge remote-tracking branch 'origin/station' into station qiaoqinzheng 2023-07-13 10:06:02 +0800
• fec6b24164 新增实体类封装b-gEfficiency相关信息 新增查询QC文件路径接口 新增计算得到折线图对应Energy数据信息方法 新增封装XeData相关信息 qiaoqinzheng 2023-07-13 10:05:51 +0800