Commits · 7cfab7579c93c42f26de8f52ac3b3556f292a20a · 项目统一框架 / amos-boot-biz

24 Feb, 2022 2 commits
- 消息处理代码整理 · 7cfab757
  maoying authored Feb 24, 2022
  
  7cfab757
- 消息重构 · 2df4f85f
  maoying authored Feb 24, 2022
  
  2df4f85f
23 Feb, 2022 10 commits
- 修改发送数据到画布数据 · e4520eab
  maoying authored Feb 23, 2022
  
  e4520eab
- Merge branch 'dev_bitmap' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap · 37c3e824
  maoying authored Feb 23, 2022
  
  37c3e824
- 设备实时数据推送相关代码优化 · 25ff30a2
  maoying authored Feb 23, 2022
  
  25ff30a2
- Merge branch 'dev_bitmap' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap · 39b15f6e
  KeYong authored Feb 23, 2022
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml
```
  39b15f6e
- 更新点图优化代码 · 7cf66ade
  KeYong authored Feb 23, 2022
  
  7cf66ade
- 解决合并冲突 · c55cc223
  maoying authored Feb 23, 2022
  
  c55cc223
- Merge branch 'dev_bitmap' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap · 3f9a360b
  maoying authored Feb 23, 2022
  
  3f9a360b
- 修改消息发送数据处理接口 · f3c0a0cd
  maoying authored Feb 23, 2022
  
  f3c0a0cd
- Merge branch 'dev_bitmap' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap · d722ef98
  KeYong authored Feb 23, 2022
  
  d722ef98
- 提交点图优化相关代码及脚本 · 580bf9f6
  KeYong authored Feb 23, 2022
  
  580bf9f6
22 Feb, 2022 8 commits
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 9b5dec9c
  maoying authored Feb 22, 2022
  
  9b5dec9c
- 修改数字换流站装备数据同步接口传参 · ca07c0f8
  maoying authored Feb 22, 2022
  
  ca07c0f8
- 1bug 3631 3630信号匹配多调整为%_加之前的字段 · 6767dc47
  suhuiguang authored Feb 22, 2022
  
  6767dc47
- 1.数据同步修改my · 22007216
  suhuiguang authored Feb 22, 2022
  
  22007216
- 历史警情倒序排列 · e7ff47e2
  kongfm authored Feb 22, 2022
  
  e7ff47e2
- 通话记录查询默认排序修改 · 1736772e
  kongfm authored Feb 22, 2022
  
  1736772e
- 删除装备数据同步高斯库 · 20931a82
  maoying authored Feb 22, 2022
  
  20931a82
- 数字换流站设备数据高斯库同步相关修改 · a786db39
  maoying authored Feb 22, 2022
  
  a786db39
21 Feb, 2022 6 commits
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 1ad00a26
  maoying authored Feb 21, 2022
  
  1ad00a26
- 根据id获取设备详情接口添加qrcode返回 · 30caf87d
  maoying authored Feb 21, 2022
  
  30caf87d
- 1.装备定义code字段使用错误 · 50bf53b8
  suhuiguang authored Feb 21, 2022
  
  50bf53b8
- 1.新的告警插入时，设备的所在系统、设备名称、装备定义名称进行更新 · 6dec50ea
  suhuiguang authored Feb 21, 2022
  
  6dec50ea
- 1.消防系统编辑数据同步sql报错 · e26568e8
  suhuiguang authored Feb 21, 2022
  
  e26568e8
- 1.消防字体编辑数据同步报错 · 3b96edd7
  suhuiguang authored Feb 21, 2022
  
  3b96edd7
18 Feb, 2022 8 commits
- 1.修复bug，火爆3小，声光报警器数量统计不正确 · 8532719e
  suhuiguang authored Feb 18, 2022
  
  8532719e
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 060a9a98
  maoying authored Feb 18, 2022
  
  060a9a98
- 修改巡检点添加重点部位检查项列表数据查询问题 · d70de8c1
  maoying authored Feb 18, 2022
  
  d70de8c1
- 1.设备编辑调整所属系统后新增插入的告警日志系统未原来的bug修改 · afc60d68
  suhuiguang authored Feb 18, 2022
  
  afc60d68
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · 02725513
  maoying authored Feb 18, 2022
  
  02725513
- 修改组态图指标内容显示 · 569572b8
  maoying authored Feb 18, 2022
  
  569572b8
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · edc05407
  KeYong authored Feb 18, 2022
  
  edc05407
- 修改CAFS组态页面配置SQL · f9e9d21e
  KeYong authored Feb 18, 2022
  
  f9e9d21e
17 Feb, 2022 6 commits
- BUG 4079 · 27c1efa9
  李腾威 authored Feb 17, 2022
  
  27c1efa9
- 修复特种设备BUG · 6d71e1c0
  kongfm authored Feb 17, 2022
  
  6d71e1c0
- Merge remote-tracking branch 'origin/developer' into developer · e434e9df
  KeYong authored Feb 17, 2022
```
# Conflicts:
#	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
```
  e434e9df
- 更新 · 0e4e056d
  KeYong authored Feb 17, 2022
  
  0e4e056d
- Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer · c5104275
  maoying authored Feb 17, 2022
  
  c5104275
- 优化报警脚本查询语法 · 271af9fd
  maoying authored Feb 17, 2022
  
  271af9fd