 songwenxuan
|
3dc5aac3ac
|
解决隐患台账导出没有图片的问题。
一般隐患台账，隐患汇总和隐患汇总数据的导出。
增加隐患台账 隐患类型 等级 隐患位置 隐患简要情况 整改治理措施 发现隐患日期 整改完成时限 整改责任部门 整改责任人 整改督办人 投入资金（元） 复查时间 复查人 检查人员 的导出。
安全承诺书被承诺部门 选不了测试部门 （由于页面太小被挡住）。
安全承诺签字情况的统计和导出。
消防点位数据和二维码的导出。
修复当前版本App扫描二维码无效的问题。
增加安全环保检查新增功能的数据缓存，并增加手动保存的暂存和清除缓存按钮，优化提示内容。
安全环保检查新增和修改功能，对已创建的隐患进行修改
增加安全生产责任状的签字数据统计和导出功能。
菜单调整，给消防管理挪到 双预防里边和港股企业端一样。
地图数据同步，保持与港务局监管端看到的一致。
在线状态的监控，如果掉线则提示
|
2024-05-10 11:29:56 +08:00 |
zhaoyu
|
5deb7d2b03
|
Merge branch '0206czks' into 0205cmt
# Conflicts:
# pom.xml
# src/main/java/com/zcloud/aspect/DockingAspect.java
# src/main/java/com/zcloud/config/ShiroConfiguration.java
# src/main/java/com/zcloud/config/StartWebsocketServer.java
# src/main/java/com/zcloud/controller/app/AppPromiseController.java
# src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java
# src/main/java/com/zcloud/controller/bus/CorpPromiseController.java
# src/main/java/com/zcloud/controller/bus/HiddenExamineController.java
# src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java
# src/main/java/com/zcloud/controller/bus/RiskPointController.java
# src/main/java/com/zcloud/controller/bus/RiskUnitController.java
# src/main/java/com/zcloud/controller/filemanager/MfolderController.java
# src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java
# src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java
# src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java
# src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java
# src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java
# src/main/java/com/zcloud/controller/map/MapController.java
# src/main/java/com/zcloud/controller/map/MapEightController.java
# src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
# src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
# src/main/java/com/zcloud/controller/system/HeadController.java
# src/main/java/com/zcloud/mapper/datasource/czksbimap/CzksMapEightMapper.java
# src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java
# src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
# src/main/java/com/zcloud/service/bus/impl/RiskUnitServiceImpl.java
# src/main/java/com/zcloud/service/czksbimap/CzksMapEightService.java
# src/main/java/com/zcloud/service/czksbimap/impl/CzksBiMapServiceImpl.java
# src/main/java/com/zcloud/service/czksbimap/impl/CzksMapEightServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateAreaServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
# src/main/java/com/zcloud/service/gatemachine/impl/GateVideoServiceImpl.java
# src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalInspectorServiceImpl.java
# src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java
# src/main/java/com/zcloud/service/map/AbsFireSourcesHandel.java
# src/main/java/com/zcloud/service/map/impl/BiMapServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/BiTongjiServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java
# src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
# src/main/java/com/zcloud/service/system/UsersService.java
# src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
# src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
# src/main/java/com/zcloud/util/Const.java
# src/main/java/com/zcloud/util/HiddenExcelImgToSessionView.java
# src/main/java/com/zcloud/util/HiddenExcelImgView.java
# src/main/java/com/zcloud/util/HttpClientService.java
# src/main/java/com/zcloud/util/HttpRequestUtil.java
# src/main/java/com/zcloud/util/MD5.java
# src/main/java/com/zcloud/util/ReturnMap.java
# src/main/java/com/zcloud/util/Smb.java
# src/main/java/com/zcloud/util/czksBiMapFactory/AbsCzksFireSourcesHandel.java
# src/main/java/com/zcloud/util/hk/HKUtil.java
# src/main/resources/application-dev.properties
# src/main/resources/application.properties
# src/main/resources/config/sysSet.ini
# src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml
# src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml
# src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
# src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml
# src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml
# src/main/resources/mybatis/datasource/bus/PromiseMapper.xml
# src/main/resources/mybatis/datasource/bus/RiskPointMapper.xml
# src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml
# src/main/resources/mybatis/datasource/czksbimap/CzksBiMapMapper.xml
# src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FireCheckListMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml
# src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
# src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
# src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml
# src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
# src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml
# src/main/resources/mybatis/datasource/mq/MqProductionErrorLogMapper.xml
# src/main/resources/mybatis/datasource/mq/MqProductionLogMapper.xml
# src/main/resources/mybatis/datasource/mysql1.sql
# src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
# src/main/resources/mybatis/datasource/system/CorpPathMapper.xml
# src/main/resources/mybatis/datasource/system/DepartmentMapper.xml
# src/main/resources/mybatis/datasource/system/PoliceMapper.xml
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
# src/main/resources/mybatis/datasource/xgf/TrainUsersMapper.xml
# src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
# src/main/resources/mybatis/dsno2/bus/NoticeRegulatoryMapper.xml
# src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/AIWarningMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/PersonnelManagementMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/UnitsMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml
# src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml
# src/main/resources/mybatis/dsno2/map/FireResourcesMapper.xml
# src/main/resources/mybatis/dsno2/map/MeteorologicalMapper.xml
# src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml
# src/main/resources/mybatis/dsno2/map/PlatformelectronicMapper.xml
|
2024-02-06 13:55:09 +08:00 |
|
zhaoyu
|
e6889bacd9
|
初始化沧州矿石
|
2024-02-06 11:05:20 +08:00 |
|
zhaoyu
|
f21c91c821
|
初始化曹煤炭
|
2024-02-06 11:02:25 +08:00 |
|
zhaoyu
|
544f61e3b3
|
测试清空分支
|
2024-02-06 10:58:10 +08:00 |
 liujun
|
1daf485e92
|
八项作业mq功能
|
2023-12-12 18:02:22 +08:00 |
guoyuepeng
|
9e993610b0
|
初始化
|
2023-11-07 09:32:12 +08:00 |