Commit Graph

834 Commits

Author SHA1 Message Date
扈兆增
ba64f8a223 Merge branch 'main_hzz' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-10 23:52:59 +08:00
扈兆增
a71f8f0676 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-10 23:52:57 +08:00
扈兆增
57a6cf9e81 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-10 17:56:23 +08:00
扈兆增
8d17118b40 三维修改 2026-07-10 17:56:16 +08:00
tangwei
6bf379f7d4 Merge branch 'dev-tw' 2026-07-10 17:14:18 +08:00
王兴凯
fce3a5907a 推送管理 2026-07-10 17:13:10 +08:00
王兴凯
890584921f 推送管理 2026-07-10 17:11:58 +08:00
tangwei
9280dde3e5 fix: 站点查询 2026-07-10 16:21:36 +08:00
tangwei
71eab1423a fix: 优化流量站缓存数据 2026-07-10 15:18:07 +08:00
tangwei
e362d42410 fix: 优化生态流量限制 2026-07-10 14:40:55 +08:00
tangwei
14930678e6 fix: 优化水温站锚点数据获取 2026-07-10 13:54:04 +08:00
tangwei
f2e6b406fa fix: 优化电站锚点数据获取 2026-07-10 12:22:40 +08:00
tangwei
693408a59a fix: 优化水质锚点数据获取 2026-07-10 11:17:30 +08:00
tangwei
b1bdb4cf66 fix: 优化锚点查询 2026-07-10 08:53:57 +08:00
tangwei
3a85ad9cfe fix: 优化锚点查询 2026-07-09 16:17:08 +08:00
tangwei
1d120cd170 fix: 优化电站基本数据查询 2026-07-09 15:18:18 +08:00
扈兆增
b708a53b46 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform 2026-07-09 14:58:39 +08:00
扈兆增
90bd2bac1f 基础信息后台对接, 2026-07-09 14:58:14 +08:00
tangwei
527eb5ea86 fix: 优化定时任务逻辑 2026-07-09 13:59:04 +08:00
tangwei
fd37d1c78e fix: 优化定时任务逻辑 2026-07-09 13:44:58 +08:00
tangwei
b3d97c7cda Merge branch 'main' into dev-tw 2026-07-09 11:40:18 +08:00
tangwei
4f44e7ae26 fix: 优化推送消息逻辑 2026-07-09 11:37:37 +08:00
扈兆增
ddaa39c811 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform 2026-07-09 11:33:08 +08:00
扈兆增
b52ca56fd3 地图加载优化,地图接口更新 2026-07-09 11:33:04 +08:00
tangwei
9bf01de0bb fix: 优化推送消息逻辑 2026-07-09 11:27:02 +08:00
tangwei
dfca986d97 feat: 新增消息推送初始化逻辑 2026-07-09 10:40:08 +08:00
tangwei
2f92eeef1a feat: 电站告警描点列表 2026-07-09 10:08:11 +08:00
tangwei
04b0f8dd3a feat: 鱼类调查装置锚点信息 2026-07-09 09:16:59 +08:00
tangwei
1240ad91af feat: 环保部-过鱼设施描点接口 2026-07-09 08:53:03 +08:00
tangwei
ab084c2f7c feat: 视频站AI设施锚点 2026-07-09 08:35:30 +08:00
tangwei
0c875782d0 feat: 环保部-水生生态调查-地图锚点 2026-07-09 08:20:01 +08:00
tangwei
cf6a85d712 feat: 增殖站地图描点接口(仅查询在建状态的) 2026-07-08 18:32:57 +08:00
tangwei
53aaf3eb2e fix: 优化地图查询数量不一致 2026-07-08 18:11:31 +08:00
tangwei
74e7cf9ac7 fix: 优化用户访问权限 2026-07-08 17:53:49 +08:00
tangwei
673e974e93 fix: 注册等功能增加门户id 2026-07-08 16:07:39 +08:00
tangwei
1090ab6ddb fix: 优化电站权限逻辑 2026-07-08 15:06:13 +08:00
tangwei
5fcc7eca34 fix: 优化swagger&常规水电锚点查询按照当前用户权限查询 2026-07-08 14:24:30 +08:00
tangwei
05a3d23f58 fix: 增加用户流域电站权限逻辑 2026-07-08 11:29:18 +08:00
tangwei
3ea58d0266 fix: 优化地图逻辑 2026-07-08 10:37:38 +08:00
tangwei
db6f87ba71 fix: 优化地图逻辑 2026-07-08 09:03:27 +08:00
王兴凯
948009a314 代码合并 2026-07-08 08:41:03 +08:00
tangwei
1b07991cbf fix: 优化地图逻辑 2026-07-08 08:36:01 +08:00
扈兆增
f55b061bf2 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-08 08:33:39 +08:00
扈兆增
18ab994b24 修改地图逻辑,沿程配置修改 2026-07-08 08:33:08 +08:00
tangwei
a69115baec Merge branch 'main' into dev-tw 2026-07-07 19:03:14 +08:00
王兴凯
ce8ebe552f bug修改与页面完善 2026-07-07 19:00:45 +08:00
王兴凯
e624cf3bb9 bug修改与页面完善 2026-07-07 18:59:55 +08:00
lilin
568f76dafa Merge branch 'main' into dev-lilin
# Conflicts:
#	backend/src/main/resources/application-prod.yml
2026-07-07 18:56:03 +08:00
lilin
ec8ba69d65 沿程配置表代码提交 2026-07-07 18:55:12 +08:00
tangwei
cf0ffeea5f feat: 查询梯级流域图流域 2026-07-07 18:25:01 +08:00