xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263 Commits 10 Branches 0 Tags 40 MiB
2ffe64f352
Commit Graph

76 Commits

Author SHA1 Message Date
nieziyan
736210780b feat：谱文件上传 2023-08-24 17:07:19 +08:00
nieziyan
24910d27f4 Merge remote-tracking branch 'origin/station' into station 2023-08-22 16:53:38 +08:00
nieziyan
77bea6bda4 feat：持久化监控项 2023-08-22 16:52:26 +08:00
qiaoqinzheng
b0925663ab 自动处理相关配置信息增加日志路径 
新增公用实体类GardsNuclLinesLib
新增实体类LocalCache缓存信息到本地jvm
新增实体类分别处理对应数据
实现查询InteractiveTool，ZeroTime，Korsum，KorSumInput，energyCalibration，resolutionCalibration，EfficiencyCalibration，NuclideLibrary，configUserLibrary，viewComment，peakInformation，viewARR，viewRRR，radionuclideActivity，Spectrum，sampleInformation，viewQCResult，viewRLR，viewAutomaticAnalysisLog，viewGammaviewerLog接口
 2023-08-21 16:46:29 +08:00
nieziyan
72a8d901ea Merge remote-tracking branch 'origin/station' into station 2023-08-18 17:10:54 +08:00
nieziyan
2a8ccef920 feat：完善 2023-08-18 17:10:34 +08:00
panbaolin
d39247d991 fix:1.完成各能谱原始库数据存储、原始eml邮件存储、能谱文件存储、邮件日志存储 2023-08-18 11:10:19 +08:00
nieziyan
da69a39e95 feat：后端接口 2023-08-17 20:24:10 +08:00
nieziyan
5fd4e44a6c Merge remote-tracking branch 'origin/station' into station 2023-08-16 08:48:09 +08:00
nieziyan
29ecd492e9 feat：预警结果保存|通知 2023-08-16 08:47:46 +08:00
qiaoqinzheng
cef2f3d410 Merge remote-tracking branch 'origin/station' into station 2023-08-14 14:34:21 +08:00
qiaoqinzheng
0b7a03f283 该峰处的探测效率不确定度字段名称修改 
关闭流修改
 2023-08-14 14:34:09 +08:00
nieziyan
cdfdbc374a Merge remote-tracking branch 'origin/station' into station 2023-08-11 18:37:48 +08:00
nieziyan
321e0e19bd feat：分析结果预警 2023-08-11 18:37:07 +08:00
qiaoqinzheng
ff969e71a4 Merge remote-tracking branch 'origin/station' into station 2023-08-10 08:47:47 +08:00
qiaoqinzheng
08d2602c69 实现公式计算新的曲线接口 
新增获取gamma对应count数据接口
新增gamma页面查询DB接口返回折线图接口
实现configure按钮接口
 2023-08-10 08:47:39 +08:00
nieziyan
ba319f5246 Merge remote-tracking branch 'origin/station' into station 2023-08-04 16:03:29 +08:00
nieziyan
f4167456b7 feat：分析结果预警 2023-08-04 16:03:03 +08:00
orgin
cf0888d172 feat：增加 系统管理-核素默认配置分页查询接口 2023-08-04 15:59:08 +08:00
nieziyan
8e9f2fc4e1 update：完善 2023-08-01 21:28:36 +08:00
panbaolin
6314f037e4 fix:1.删除邮件管理器@Compoint注解，添加能谱解析状态枚举 2023-08-01 15:11:52 +08:00
nieziyan
996c487908 feat：合并 2023-08-01 11:56:48 +08:00
nieziyan
e4fa2ada44 Merge remote-tracking branch 'origin/station' into station 2023-08-01 11:29:50 +08:00
qiaoqinzheng
e01beceacf 报警模块工具类冲突导致问题修改 2023-08-01 11:29:30 +08:00
nieziyan
4636d5038c Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
#	jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java
 2023-08-01 11:17:04 +08:00
nieziyan
e390fda254 feat：合并 2023-08-01 10:57:33 +08:00
qiaoqinzheng
566e11aaf3 报警模块实体类引入修改 
redis缓存工具类移动
 2023-08-01 10:48:22 +08:00
qiaoqinzheng
8194e89326 实体类内容修改 2023-08-01 10:42:52 +08:00
qiaoqinzheng
2d8b68e25a web-statistics模块下实体类移动到base-core下 2023-08-01 08:58:52 +08:00
nieziyan
3c1b3f2c80 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
 2023-07-31 20:30:22 +08:00
nieziyan
d8e13a803c feat：功能完善 2023-07-31 20:19:54 +08:00
qiaoqinzheng
1667b43218 台站运行管理模块下实体类移动到base-core下 2023-07-31 17:22:47 +08:00
qiaoqinzheng
016cca95f0 系统类下实体类移动到base-core下 2023-07-31 17:11:52 +08:00
qiaoqinzheng
ed146db779 新增人工交互实体类 2023-07-31 16:47:14 +08:00
qiaoqinzheng
6607b34729 abnormal-alarm模块下实体类移动 2023-07-31 16:44:32 +08:00
nieziyan
fb320c6888 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
 2023-07-28 19:33:36 +08:00
nieziyan
afd110d2b4 feat：新功能 2023-07-28 19:31:26 +08:00
qiaoqinzheng
c1a9a43f91 Merge remote-tracking branch 'origin/station' into station 2023-07-24 10:51:05 +08:00
qiaoqinzheng
09902eaec3 FTPUtil新增获取ftp登录用户名，ftp登录密码，ftp字符集方法 
PHDFileUtil实现查询按钮灯颜色方法，读取行数据方法，修改获取数据方法
新增UserTaskUtil工具类判断当前用户是否有排班任务权限操作当前台站信息
实现删除折线图缓存数据接口，查看comment数据接口，新增comment接口，查看ARR报告接口，查看RRR报告接口，查看Spectrum数据接口，查看SampleInformation数据接口，查看QC Result数据接口，查看RLR数据接口
新增部分实体类
修改探测器相关文件名称解决重名冲突问题
ReadLineUtil切换文件路径方式修改
新增查询用户排班任务接口
 2023-07-24 10:50:57 +08:00
nieziyan
1d3e2253aa Merge remote-tracking branch 'origin/station' into station 2023-07-24 09:47:59 +08:00
nieziyan
d08a34895b feat：alarm 2023-07-24 09:47:40 +08:00
qiaoqinzheng
45f4df3ab6 properties配置文件移动到base-core公用包下 2023-07-24 09:02:51 +08:00
nieziyan
82783edbcc feat：系统预警 2023-07-20 10:26:55 +08:00
nieziyan
a704571b04 feat：导出功能完善 2023-07-19 08:50:49 +08:00
nieziyan
8928607514 Merge remote-tracking branch 'origin/station' into station 2023-07-12 17:02:00 +08:00
nieziyan
cc8830a749 文件查看 2023-07-12 17:01:36 +08:00
qiaoqinzheng
c73825b92d 日期转换json增加时区相关注解 2023-07-12 15:44:40 +08:00
qiaoqinzheng
0b286a9af2 spectrum-analysis模块实现查询折线图相关接口 2023-07-11 15:36:02 +08:00
qiaoqinzheng
6003bc8cf8 用户管理模块增加根据用户名查询用户信息 
字典管理模块增加根据名称查询对应台站数据接口
web-statistics模块新增根据名称查询对应台站数据调用feign客户端
web-statistics模块新增报警状态数据实体类
web-statistics模块新增报警状态数据mapper
web-statistics模块新增分页查询报警状态数据信息接口
状态数据实体类开始时间，操作时间，结束时间列增加时区
 2023-07-10 16:51:15 +08:00
nieziyan
a340345cd8 Merge remote-tracking branch 'origin/station' into station 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
 2023-07-10 16:45:31 +08:00