zhongwei

8b14fb1fc2 add:智谱分析，增加结果解析 luyie 2024-08-14 10:37:17 +0800
af327bd1a6 Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506 ty 2024-08-13 20:12:03 +0800
a5bc7b52e5 修正：统计月报两票统计合格率 ty 2024-08-13 20:11:26 +0800
88b1ecc2b8 add: 海康摄像头截图上传minio工具类 haungxing 2024-08-13 19:53:10 +0800
34858782f7 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-13 17:08:48 +0800
115f0e52b5 add: 数据库维护配置 haungxing 2024-08-13 17:07:44 +0800
5653e37549 Merge branch 'prod-20240506' of http://175.6.40.68:8081/Jone/hzims-back into prod-20240506 liwen 2024-08-13 16:32:20 +0800
7d9690fc60 Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3 liwen 2024-08-13 15:52:55 +0800
4cfbbdda45 update: 安全工器具类型优化 liwen 2024-08-13 15:52:23 +0800
c1cfd0c0ac 修正：交接班巡检开始和结束前30分钟提醒 ty 2024-08-13 15:37:58 +0800
a044293217 add:修改配置模版文件，添加大模型配置 luyie 2024-08-13 15:25:28 +0800
97564777c6 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-13 15:11:52 +0800
fd4dea2701 add: 大模型swagger配置 haungxing 2024-08-13 15:11:25 +0800
daa880ea8a Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 liwen 2024-08-13 11:27:26 +0800
62add639e7 update: 安全工器具类型优化 liwen 2024-08-13 11:27:07 +0800
997d3e2b2c add:智谱对接增加数据，调试 luyie 2024-08-13 11:14:55 +0800
8e00751c70 Merge branch 'prod-20240506' of http://175.6.40.68:8081/Jone/hzims-back into prod-20240506 liwen 2024-08-13 09:08:48 +0800
dbd5fb04dd fix: 培训年度统计站点重复的问题 liwen 2024-08-13 09:08:00 +0800
8432640f2e Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3 liwen 2024-08-13 08:49:58 +0800
242fc8195e update: 安全工器具类型新增机构字段 liwen 2024-08-13 08:49:33 +0800
be39e6f21b add:调整逻辑，兼容文件与url，增加配置信息的管理 luyie 2024-08-12 21:25:42 +0800
d3a9d08b94 #定时刷新数据任务运行堵塞邮件发送 yang_shj 2024-08-12 17:07:38 +0800
b00c9d2254 add:大模型feign接口 luyie 2024-08-12 16:21:26 +0800
02dd1fece2 #定时刷新数据任务运行堵塞邮件发送 yang_shj 2024-08-12 15:56:27 +0800
39af876ab1 fix:删除多余提交 luyie 2024-08-12 15:33:19 +0800
dc0bd08cb8 add:智谱大模型对接 luyie 2024-08-12 14:28:48 +0800
b542238a02 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-12 14:09:22 +0800
982f4b50db #集团电量报表 yang_shj 2024-08-12 14:09:08 +0800
1ef7c3070c fix: 视频数据同步向量数据库 haungxing 2024-08-12 11:57:49 +0800
31fa080e7f Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506 yang_shj 2024-08-12 08:37:20 +0800
e71ee9a69f #定时任务线程优化 yang_shj 2024-08-12 08:37:06 +0800
2a0bd04bf5 fix: 解决风险排查查询报错问题 haungxing 2024-08-09 17:35:15 +0800
7aae190cca Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-09 17:27:17 +0800
e0fd05cef1 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-09 17:25:08 +0800
ba9d530715 #分析数据功能 yang_shj 2024-08-09 17:24:55 +0800
f36a452424 修正：风险排查流程bug ty 2024-08-09 17:22:59 +0800
cf8f6896ca 删除iml文件 Jone 2024-08-09 16:32:52 +0800
e9659cf247 增加fdp历史状态图的注释 ty 2024-08-09 10:30:34 +0800
44b1e25b16 #告警日志打印修改 yang_shj 2024-08-08 20:01:35 +0800
0a6c8d6d43 #任务阻塞导致线程重复创建 yang_shj 2024-08-08 17:23:38 +0800
0952830d01 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-08 16:11:40 +0800
68ac4c613d #电量报表功能 yang_shj 2024-08-08 16:09:48 +0800
e229c4de91 fix: 大模型简称重命名 haungxing 2024-08-08 10:10:42 +0800
af75e80563 fix: 大模型简称重命名 haungxing 2024-08-08 09:58:51 +0800
03abcb90f9 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-07 19:11:54 +0800
6266b924a4 修正:巡检提前30分钟提醒 ty 2024-08-07 19:11:34 +0800
66aa807444 修正:物品类别台账导入 ty 2024-08-07 19:11:04 +0800
ebbb029582 fix: 车辆台账年检时间格式化 haungxing 2024-08-07 18:51:22 +0800
961afa2565 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-07 18:27:54 +0800
164cfb21ff fix: 车辆台账年检时间格式化 haungxing 2024-08-07 18:27:28 +0800
bcce380d27 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 Jone 2024-08-07 17:07:23 +0800
72e7b5e76c 修复不规范的代码 Jone 2024-08-07 17:06:46 +0800
e000daa790 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-07 15:24:12 +0800
09352a6ccc fix: 合并master分支 haungxing 2024-08-07 15:14:20 +0800
e3313a099a fix: 合并master分支 haungxing 2024-08-07 14:33:15 +0800
8a578ae500 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-07 14:09:52 +0800
74f119bfdf 修复:巡检任务统计保留两位小数 ty 2024-08-07 14:09:37 +0800
d232690c38 #风险评估默认状态 yang_shj 2024-08-07 13:35:23 +0800
b1f05edd5e Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-07 11:38:17 +0800
93c13d394c #日志打印修改 yang_shj 2024-08-07 11:38:06 +0800
0e8cf93ac0 修复:导出非空判断 ty 2024-08-07 11:11:54 +0800
39d1799b04 #日志打印修改 yang_shj 2024-08-07 11:04:56 +0800
547cf9eb5d 修复:智能诊断状态修改时，增加创建用户 ty 2024-08-07 09:59:50 +0800
8e058885f9 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-07 08:35:37 +0800
deec08f8f4 fix: 工作票添加站点机构筛选条件 haungxing 2024-08-07 08:35:07 +0800
fb0a77b92f Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-07 08:11:34 +0800
23eb635e97 #文件命名冲突 yang_shj 2024-08-07 08:11:19 +0800
804ad760c8 fix: 工作票站点机构筛选 haungxing 2024-08-06 21:47:58 +0800
aa19f555c6 fix: 离线巡检任务查看详情报错问题 haungxing 2024-08-06 20:10:02 +0800
5a639d31b0 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-06 19:46:26 +0800
ab491d0682 fix: 调拨单、工具领用导出接口 haungxing 2024-08-06 19:45:59 +0800
c0a8ae19c6 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-06 19:40:54 +0800
0d06667bb9 修复：水电站生产月报图片大小 ty 2024-08-06 19:40:24 +0800
a9d5521efc Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-06 19:23:56 +0800
2680202ac7 #安全管理功能&bug解决 yang_shj 2024-08-06 19:23:44 +0800
c846ca4a6a fix: 解决培训管理成绩单及格率计算错误的问题 liwen 2024-08-06 19:04:32 +0800
ecb881825d Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-06 17:11:32 +0800
7e5a31c091 修复：生产月报增加非空判断 ty 2024-08-06 17:11:00 +0800
524393ca5d fix: 大模型controller层重命名 haungxing 2024-08-06 14:29:12 +0800
a575c3b6a1 fix: 修复APP点击进入设备档案报错问题 haungxing 2024-08-06 13:58:38 +0800
724e1de145 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-06 13:58:02 +0800
06727dc08c fix: 修复巡检本站月报导出失败问题 haungxing 2024-08-06 13:57:33 +0800
f434a20a47 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-06 12:01:20 +0800
40e9e4aa4e #安全管理功能 yang_shj 2024-08-06 12:01:03 +0800
2a029ebbbb Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-06 08:49:06 +0800
8aef0a14e6 fix: 资产管理入库单导出接口修改 haungxing 2024-08-06 08:48:18 +0800
d41195227c Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-06 08:40:24 +0800
002cc7ec37 fix: 工具领用导出接口 haungxing 2024-08-05 21:15:22 +0800
edfd1006d0 add: 新增入库单导出接口 liwen 2024-08-05 21:12:07 +0800
c048f619a2 修复：隐患流程修复 ty 2024-08-05 20:21:42 +0800
01dfccab9b fix: 解决年度里程统计导出报错的问题 liwen 2024-08-05 20:20:23 +0800
d8c4faec7d Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-05 19:19:41 +0800
5a3c04d294 修复：智能诊断页面查询增加用户权限 ty 2024-08-05 19:19:30 +0800
7e07d9b381 fix:体系文件保存报错问题解决 fix：日常维护记录添加站点编号筛选条件 fix：隐患排查计划详情查询负责人名称添加 fix：巡检路径新增提出无法使用的巡检模板选择 fix：设备定义保存报错问题解决 haungxing 2024-08-05 18:36:04 +0800
59ab838c20 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-05 18:11:24 +0800
2f9a9435ee fix: 解决会议记录查询结果异常的问题 liwen 2024-08-05 17:18:52 +0800
1891c92b14 Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3 liwen 2024-08-05 16:21:53 +0800
43ae7e8cad fix: 解决维保记录结束时间查询报错的问题 liwen 2024-08-05 16:21:42 +0800
a25ee54511 修正：缺陷流程入库失败代码修正 ty 2024-08-05 15:14:54 +0800
f75d5a9d7c Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 Jone 2024-08-05 14:15:30 +0800

Commit Graph Select branches Hide Pull Requests zhongwei Mono Color

Commit Graph

Select branches

Hide Pull Requests

zhongwei