Commits · e4af6fbc3550e1ade9589eb10c257b871a9f5dbb · station / YeeAmosFireAutoSysRoot

09 May, 2020 3 commits

Merge branch 'develop' into dev_upgrade · e4af6fbc

authored May 09, 2020

# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipPointServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FmeaServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ITopographyNodeServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/client/invoke/RsDataQueue.java
#	YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-1.0.2.xml

e4af6fbc

Merge branch 'develop' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into develop · 5a275471
suhuiguang authored May 09, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
```
5a275471
1.计算rpn · f6fa54f6
suhuiguang authored May 09, 2020

f6fa54f6

08 May, 2020 2 commits
- 1.新增等级查询接口，2.调试接口 · e28ff62a
  shanqiyun authored May 08, 2020
  
  e28ff62a
- 修改设备点位新增编辑接口 · cfb13e91
  maoying authored May 08, 2020
  
  cfb13e91
06 May, 2020 3 commits
- 调试接口 · 95ff9119
  shanqiyun authored May 06, 2020
  
  95ff9119
- 冲突 · 2cb81c97
  shanqiyun authored May 06, 2020
  
  2cb81c97
- 1.调试接口，2.新增右侧检索查询接口 · 60155ad9
  shanqiyun authored May 06, 2020
  
  60155ad9
30 Apr, 2020 1 commit
- 1.设备推送数据-全景监控 · baec1ff4
  suhuiguang authored Apr 30, 2020
  
  baec1ff4
29 Apr, 2020 5 commits
- 1.修改时区不对 · 122d3f3c
  suhuiguang authored Apr 29, 2020
  
  122d3f3c
- 1. f_safety_index_change_log 新增字段创建日期-全景监控 · 989e3531
  suhuiguang authored Apr 29, 2020
```
2.修改安全指数流水服务-全景监控
```
  989e3531
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · c39590ad
  suhuiguang authored Apr 29, 2020
  
  c39590ad
- 1.新增推送数据刷新-全景监控 · 2ac23d6e
  suhuiguang authored Apr 29, 2020
  
  2ac23d6e
- 调整接口 · b505fa5e
  shanqiyun authored Apr 29, 2020
  
  b505fa5e
27 Apr, 2020 6 commits
- 新增定时任务cron · ae3d96f5
  shanqiyun authored Apr 27, 2020
  
  ae3d96f5
- 新增定时更新数据，推送数据 · 38dbb579
  shanqiyun authored Apr 27, 2020
  
  38dbb579
- 1.修改枚举描述位置-全景监控 · d8726fc5
  suhuiguang authored Apr 27, 2020
  
  d8726fc5
- 1.3d区域-全景监控 · 8f795598
  suhuiguang authored Apr 27, 2020
  
  8f795598
- Merge branch 'develop' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into dev · d37e24df
  maoying authored Apr 27, 2020
  
  d37e24df
- 修改风险预控巡检RPNI值变化 · 231cc85d
  maoying authored Apr 27, 2020
  
  231cc85d
26 Apr, 2020 7 commits
- 冲突 · b3ab5049
  shanqiyun authored Apr 26, 2020
  
  b3ab5049
- 新增接口，调试接口 · 83213b63
  shanqiyun authored Apr 26, 2020
  
  83213b63
- 1.修改统计数据-今日巡检，-全景监控 · ba29bcd8
  suhuiguang authored Apr 26, 2020
  
  ba29bcd8
- 1.修改今天巡检过滤条件->开始小于等于当天,结束大于等于当天-全景监控 · 6ecf6864
  suhuiguang authored Apr 26, 2020
  
  6ecf6864
- 1.增加过滤点的删除状态-全景监控 · 49c626cb
  suhuiguang authored Apr 26, 2020
  
  49c626cb
- 1.增加注释-全景监控 · f57a1dcb
  suhuiguang authored Apr 26, 2020
  
  f57a1dcb
- 1.颗粒模式,重点设备模式-全景监控 · c3af6eac
  suhuiguang authored Apr 26, 2020
  
  c3af6eac
24 Apr, 2020 4 commits
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 0376c9e1
  suhuiguang authored Apr 24, 2020
```
# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IView3dService.java
```
  0376c9e1
- 1.异常区域查询-全景监控 · bc9bdd42
  suhuiguang authored Apr 24, 2020
  
  bc9bdd42
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 6b9ad1c8
  shanqiyun authored Apr 24, 2020
  
  6b9ad1c8
- 新增接口，调试接口 · 5f0cf73e
  shanqiyun authored Apr 24, 2020
  
  5f0cf73e
23 Apr, 2020 9 commits
- 1.提交合并错误代码-全景监控 · f71058be
  suhuiguang authored Apr 23, 2020
  
  f71058be
- . · 7fb3ae1b
  shanqiyun authored Apr 23, 2020
  
  7fb3ae1b
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 750c8576
  shanqiyun authored Apr 23, 2020
  
  750c8576
- 新增一周安全指数统计接口，联调接口 · 7eae0b3f
  shanqiyun authored Apr 23, 2020
  
  7eae0b3f
- 1.查询上线年日接口-全景监控 · 6a7da135
  suhuiguang authored Apr 23, 2020
  
  6a7da135
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · 09e4faa0
  shanqiyun authored Apr 23, 2020
  
  09e4faa0
- 联调接口 · a930110a
  shanqiyun authored Apr 23, 2020
  
  a930110a
- 1.删除测试数据-全景监控 · 65b1a423
  suhuiguang authored Apr 23, 2020
  
  65b1a423
- Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade · b642bb7a
  suhuiguang authored Apr 23, 2020
  
  b642bb7a