Merge branch 'dev' of ssh://39.96.70.20:2222/A7/aroad into dev

3d3c929d · 张龙发 · dfe159e7 · 4fe80a3a · 3d3c929d · 3d3c929d
--- a/db/emergency/应急物资.sql
+++ b/db/emergency/应急物资.sql
--- a/db/emergency/应急装备.sql
+++ b/db/emergency/应急装备.sql
--- a/db/emergency/应急车辆.sql
+++ b/db/emergency/应急车辆.sql
--- a/db/emergency/应急队伍.sql
+++ b/db/emergency/应急队伍.sql
--- a/db/emergency/应急队伍装备信息.sql
+++ b/db/emergency/应急队伍装备信息.sql
--- a/db/event.sql
+++ b/db/event.sql
--- a/db/info.sql
+++ b/db/info.sql
--- a/db/traffic/交通量视图.sql
+++ b/db/traffic/交通量视图.sql
--- a/db/traffic/观测站点.sql
+++ b/db/traffic/观测站点.sql
--- a/db/traffic/路段交通量.sql
+++ b/db/traffic/路段交通量.sql
--- a/db/traffic/路线交通量.sql
+++ b/db/traffic/路线交通量.sql
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/Basehighwayalldata.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/Basehighwayalldata.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/ReadElasticsearch.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/ReadElasticsearch.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/SaveAttendanceDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/SaveAttendanceDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EmergencyEventController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EmergencyEventController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EvendealController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EvendealController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/EmergencyEvent.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/EmergencyEvent.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/Evendeal.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/Evendeal.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EvendealMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EvendealMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EmergencyEventService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EmergencyEventService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EvendealService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EvendealService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EvendealServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EvendealServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoTemplatesController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoTemplatesController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoTemplatesMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoTemplatesMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoTemplatesService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoTemplatesService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoTemplatesServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoTemplatesServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/controller/DeptController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/controller/DeptController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/entity/Dept.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/entity/Dept.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/mapper/DeptMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/mapper/DeptMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/DeptService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/DeptService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/impl/DeptServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/entity/TrafficRoadsection.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/entity/TrafficRoadsection.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/entity/TrafficRoute.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/entity/TrafficRoute.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/entity/TrafficSpot.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/entity/TrafficSpot.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcPtgsdLwzsController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/controller/ZhjcPtgsdLwzsController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcPtgsdLwzs.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcPtgsdLwzs.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcPtgsdLwzsMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/mapper/ZhjcPtgsdLwzsMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcPtgsdLwzsService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/ZhjcPtgsdLwzsService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcPtgsdLwzsServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/service/impl/ZhjcPtgsdLwzsServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljbxxGltclcController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljbxxGltclcController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljsdjqkController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGljsdjqkController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGllmqkController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGllmqkController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkQlqkController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkQlqkController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkSdqkController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjGlqsqkSdqkController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjZhzsLnsjController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/controller/ZhtjZhzsLnsjController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkQlqk.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkQlqk.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkSdqk.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjGlqsqkSdqk.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjZhzsZtqk.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/entity/ZhtjZhzsZtqk.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljbxxGltclcMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljbxxGltclcMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGllmqkMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGllmqkMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkQlqkMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkQlqkMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkSdqkMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGlqsqkSdqkMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjZhzsLnsjMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjZhzsLnsjMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljbxxGltclcService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljbxxGltclcService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljsdjqkService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGljsdjqkService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGllmqkService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGllmqkService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkQlqkService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkQlqkService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkSdqkService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjGlqsqkSdqkService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjZhzsLnsjService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/ZhtjZhzsLnsjService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljbxxGltclcServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljbxxGltclcServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGllmqkServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGllmqkServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkQlqkServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkQlqkServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkSdqkServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGlqsqkSdqkServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjZhzsLnsjServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjZhzsLnsjServiceImpl.java
--- a/src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml
+++ b/src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml
--- a/src/main/resources/mapper/emergencyevent/EvendealMapper.xml
+++ b/src/main/resources/mapper/emergencyevent/EvendealMapper.xml
--- a/src/main/resources/mapper/info/InfoInformationsMapper.xml
+++ b/src/main/resources/mapper/info/InfoInformationsMapper.xml
--- a/src/main/resources/mapper/info/InfoTemplatesMapper.xml
+++ b/src/main/resources/mapper/info/InfoTemplatesMapper.xml
--- a/src/main/resources/mapper/system/DeptMapper.xml
+++ b/src/main/resources/mapper/system/DeptMapper.xml
--- a/src/main/resources/mapper/traffic/TrafficRoadsectionMapper.xml
+++ b/src/main/resources/mapper/traffic/TrafficRoadsectionMapper.xml
--- a/src/main/resources/mapper/traffic/TrafficRouteMapper.xml
+++ b/src/main/resources/mapper/traffic/TrafficRouteMapper.xml
--- a/src/main/resources/mapper/traffic/TrafficSpotMapper.xml
+++ b/src/main/resources/mapper/traffic/TrafficSpotMapper.xml
--- a/src/main/resources/mapper/zhjc/ZhjcPtgsdLwzsMapper.xml
+++ b/src/main/resources/mapper/zhjc/ZhjcPtgsdLwzsMapper.xml
--- a/src/main/resources/mapper/zhtj/ZhtjGljbxxGltclcMapper.xml
+++ b/src/main/resources/mapper/zhtj/ZhtjGljbxxGltclcMapper.xml
--- a/src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml
+++ b/src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml
--- a/src/main/resources/mapper/zhtj/ZhtjGllmqkMapper.xml
+++ b/src/main/resources/mapper/zhtj/ZhtjGllmqkMapper.xml
--- a/src/main/resources/mapper/zhtj/ZhtjGlqsqkQlqkMapper.xml
+++ b/src/main/resources/mapper/zhtj/ZhtjGlqsqkQlqkMapper.xml
--- a/src/main/resources/mapper/zhtj/ZhtjGlqsqkSdqkMapper.xml
+++ b/src/main/resources/mapper/zhtj/ZhtjGlqsqkSdqkMapper.xml
--- a/src/main/resources/mapper/zhtj/ZhtjZhzsLnsjMapper.xml
+++ b/src/main/resources/mapper/zhtj/ZhtjZhzsLnsjMapper.xml
--- a/src/main/resources/mapper/ZhtjZhzsZtqkMapper.xml
+++ b/src/main/resources/mapper/ZhtjZhzsZtqkMapper.xml