caozehui
|
d92544f7c4
|
Merge branch 'qr_branch'
# Conflicts:
# detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
# detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
# detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
# detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
# detection/src/main/java/com/njcn/gather/report/utils/BookmarkUtil.java
# detection/src/main/java/com/njcn/gather/report/utils/Docx4jUtil.java
# detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
# entrance/src/main/resources/application.yml
|
2025-12-22 08:52:13 +08:00 |
|
caozehui
|
4b7c1259a7
|
ICD映射上传路径微调
|
2025-12-16 16:18:02 +08:00 |
|
caozehui
|
de1496389e
|
微调
|
2025-12-11 16:19:26 +08:00 |
|
caozehui
|
c3443fcc91
|
切换数据处理原则
|
2025-12-10 11:15:43 +08:00 |
|
caozehui
|
5105e77823
|
微调
|
2025-12-10 09:17:31 +08:00 |
|
caozehui
|
eb068b76a4
|
报告模板路径调整
|
2025-12-09 16:18:53 +08:00 |
|
|
|
9f11f7ec11
|
河北报告定制化改动
|
2025-12-02 13:52:07 +08:00 |
|
|
|
2012221b73
|
河北报告定制化改动
|
2025-12-02 13:37:35 +08:00 |
|
caozehui
|
9ab5d42439
|
微调
|
2025-12-01 19:14:29 +08:00 |
|
|
|
7abcaefeb1
|
增加回路额定电流描述
|
2025-11-27 20:03:11 +08:00 |
|
caozehui
|
f4df52dd1c
|
暂态只有a项时，当a相无数据时判断为不符合
|
2025-11-27 18:36:38 +08:00 |
|
|
|
db115bb27d
|
调整电流的小数位
|
2025-11-27 17:08:49 +08:00 |
|
caozehui
|
68d96e67aa
|
重新计算、更换误差体系接口调整，cp95处理原则调整、检测结果原始数据调整
|
2025-11-26 18:33:35 +08:00 |
|
|
|
3f94012faa
|
修复数模式的相序校验电流加量问题
|
2025-11-26 10:34:25 +08:00 |
|
|
|
41c557118c
|
Merge remote-tracking branch 'origin/qr_branch' into qr_branch
|
2025-11-26 10:22:15 +08:00 |
|
|
|
6596a572d6
|
修复数模式的相序校验电流加量问题
|
2025-11-26 10:17:33 +08:00 |
|
caozehui
|
ab236cd34f
|
微调
|
2025-11-21 10:09:48 +08:00 |
|
caozehui
|
21d2c2b7a7
|
报告调整
|
2025-11-19 13:20:17 +08:00 |
|
caozehui
|
48fa4c2390
|
报告日期格式根据参数动态变化
|
2025-11-19 10:43:52 +08:00 |
|
caozehui
|
033330b005
|
微调
|
2025-11-19 09:35:49 +08:00 |
|
caozehui
|
f81123c3f7
|
监测点修改同步状态调整、脚本新增福禄克专用字段
|
2025-11-17 16:32:52 +08:00 |
|
caozehui
|
5539cb2887
|
微调
|
2025-11-14 10:16:08 +08:00 |
|
caozehui
|
1df9c8d703
|
微调
|
2025-11-13 14:20:50 +08:00 |
|
caozehui
|
1cbed2a620
|
icd上传映射文件
|
2025-11-13 08:37:52 +08:00 |
|
|
|
89667367ea
|
添加水印
|
2025-11-12 11:45:21 +08:00 |
|
|
|
92b95dd86d
|
微调
|
2025-11-11 13:18:42 +08:00 |
|
caozehui
|
6b7e38fef6
|
处理源未知异常
|
2025-11-10 14:45:23 +08:00 |
|
caozehui
|
f10debe2f2
|
比对-被检设备导入微调
|
2025-11-07 15:13:07 +08:00 |
|
caozehui
|
9d15351fba
|
微调
|
2025-11-06 09:25:09 +08:00 |
|
caozehui
|
2339a006ec
|
补充源未知异常推送消息
|
2025-11-06 08:51:54 +08:00 |
|
caozehui
|
7fd904ab79
|
系数校准接收数据个数调整
|
2025-11-05 16:02:53 +08:00 |
|
caozehui
|
61f149b562
|
系数校准接收数据个数调整
|
2025-11-05 13:51:47 +08:00 |
|
caozehui
|
57ee3a4d43
|
调整接口注释
|
2025-11-04 14:35:16 +08:00 |
|
|
|
563eb80b65
|
swagger调整
|
2025-11-04 10:34:08 +08:00 |
|
caozehui
|
dae10378dd
|
监测点变化时同步更新设备状态、计划状态
|
2025-11-04 09:36:42 +08:00 |
|
caozehui
|
40cb153656
|
报告模板调整
|
2025-11-03 08:38:57 +08:00 |
|
caozehui
|
af4f000b13
|
微调
|
2025-10-30 14:49:22 +08:00 |
|
caozehui
|
f922ee97aa
|
报告路径，报告名称修改
|
2025-10-30 09:06:40 +08:00 |
|
贾同学
|
321ec97130
|
fix(device):修改通道编号拼接逻辑
|
2025-10-29 10:07:14 +08:00 |
|
caozehui
|
0dd3502942
|
数模-检测项树表
|
2025-10-29 09:05:12 +08:00 |
|
caozehui
|
26c5e933f5
|
微调
|
2025-10-29 09:01:45 +08:00 |
|
caozehui
|
40e39d651b
|
微调
|
2025-10-28 10:31:39 +08:00 |
|
贾同学
|
02c8164b7e
|
fix(device):优化监测点线路号过滤与重复检查逻辑
|
2025-10-28 10:01:28 +08:00 |
|
caozehui
|
2c59defdc2
|
修改原始数据表结构、监测点检测结果加入统计数据逻辑
|
2025-10-27 13:58:46 +08:00 |
|
caozehui
|
57c419eb70
|
微调
|
2025-10-24 16:25:21 +08:00 |
|
贾同学
|
98f4ecef6c
|
Merge remote-tracking branch 'origin/master'
|
2025-10-24 09:28:40 +08:00 |
|
贾同学
|
20e07712cb
|
ADD: 添加统计检测结果
|
2025-10-24 09:28:28 +08:00 |
|
caozehui
|
ac1d98efdc
|
微调
|
2025-10-23 15:15:49 +08:00 |
|
caozehui
|
5d161acfad
|
导入测试后数据，查看数据报错BUG
|
2025-10-23 13:28:14 +08:00 |
|
caozehui
|
1534327f6f
|
Merge remote-tracking branch 'origin/master'
|
2025-10-23 13:27:56 +08:00 |
|
